Temporary fix for sha256 IA64 assembler.

[openssl.git] / crypto / sha / asm / sha512-ia64.pl

diff --git a/crypto/sha/asm/sha512-ia64.pl b/crypto/sha/asm/sha512-ia64.pl
index 0aea02399a9b0be4cdc280f1f83d28d52491bb24..d43a5960aeea7e972db0d48c71816a044a9a4ef5 100755 (executable)
--- a/crypto/sha/asm/sha512-ia64.pl
+++ b/crypto/sha/asm/sha512-ia64.pl
@@ -71,7 +71,7 @@ if ($output =~ /512.*\.[s|asm]/) {
        $ADD="add";
        $SHRU="shr.u";
        $TABLE="K512";
-       $func="sha512_block";
+       $func="sha512_block_data_order";
        @Sigma0=(28,34,39);
        @Sigma1=(14,18,41);
        @sigma0=(1,  8, 7);
@@ -85,7 +85,7 @@ if ($output =~ /512.*\.[s|asm]/) {
        $ADD="padd4";
        $SHRU="pshr4.u";
        $TABLE="K256";
-       $func="sha256_block";
+       $func="sha256_block_data_order";
        @Sigma0=( 2,13,22);
        @Sigma1=( 6,11,25);
        @sigma0=( 7,18, 3);
@@ -110,6 +110,8 @@ $code=<<___;
 .explicit
 .text
 
+pfssave=r2;
+lcsave=r3;
 prsave=r14;
 K=r15;
 A=r16; B=r17;  C=r18;  D=r19;
@@ -128,21 +130,17 @@ sgm0=r50; sgm1=r51;       // small constants
 .align 32
 $func:
        .prologue
-       .fframe 0
-       .save   ar.pfs,r2
-       .save   ar.lc,r3
-       .save   pr,prsave
-{ .mmi;        alloc   r2=ar.pfs,3,17,0,16
+       .save   ar.pfs,pfssave
+{ .mmi;        alloc   pfssave=ar.pfs,3,17,0,16
        $ADDP   ctx=0,r32               // 1st arg
-       mov     r3=ar.lc        }
+       .save   ar.lc,lcsave
+       mov     lcsave=ar.lc    }
 { .mmi;        $ADDP   input=0,r33             // 2nd arg
-       addl    Ktbl=\@ltoff($TABLE#),gp
+       mov     num=r34                 // 3rd arg
+       .save   pr,prsave
        mov     prsave=pr       };;
 
        .body
-{ .mii;        ld8     Ktbl=[Ktbl]
-       mov     num=r34         };;     // 3rd arg
-
 { .mib;        add     r8=0*$SZ,ctx
        add     r9=1*$SZ,ctx
        brp.loop.imp    .L_first16,.L_first16_ctop
@@ -152,20 +150,23 @@ $func:
        brp.loop.imp    .L_rest,.L_rest_ctop
                                };;
 // load A-H
+.Lpic_point:
 { .mmi;        $LDW    A=[r8],4*$SZ
        $LDW    B=[r9],4*$SZ
-       mov     sgm0=$sigma0[2] }
+       mov     Ktbl=ip         }
 { .mmi;        $LDW    C=[r10],4*$SZ
        $LDW    D=[r11],4*$SZ
-       mov     sgm1=$sigma1[2] };;
+       mov     sgm0=$sigma0[2] };;
 { .mmi;        $LDW    E=[r8]
-       $LDW    F=[r9]          }
+       $LDW    F=[r9]
+       add     Ktbl=($TABLE#-.Lpic_point),Ktbl         }
 { .mmi;        $LDW    G=[r10]
        $LDW    H=[r11]
-       cmp.ne  p15,p14=0,r35   };;     // used in sha256_block
+       cmp.ne  p15,p14=0,r0    };;     // used in sha256_block
 
 .L_outer:
-{ .mii;        mov     ar.lc=15
+{ .mii;        mov     sgm1=$sigma1[2]
+       mov     ar.lc=15
        mov     ar.ec=1         };;
 .align 32
 .L_first16:
@@ -330,7 +331,7 @@ $code.=<<___;
 (p6)   add     Ktbl=-$SZ*$rounds,Ktbl  }
 { .mmi;        $LDW    r38=[r10],-4*$SZ
        $LDW    r39=[r11],-4*$SZ
-(p7)   mov     ar.lc=r3                };;
+(p7)   mov     ar.lc=lcsave            };;
 { .mmi;        add     A=A,r32
        add     B=B,r33
        add     C=C,r34                 }