Fix eckey_priv_encode()

[openssl.git] / crypto / pariscid.pl

diff --git a/crypto/pariscid.pl b/crypto/pariscid.pl
index bf470ac510acbd451ab297e43960506d14f27b17..bfc56fdc7fc04be2f8f92f64a5d7e8645e18a9ce 100644 (file)
--- a/crypto/pariscid.pl
+++ b/crypto/pariscid.pl
@@ -87,8 +87,8 @@ OPENSSL_wipe_cpu
        .PROCEND
 ___
 {
-$inp="%r26";
-$len="%r25";
+my $inp="%r26";
+my $len="%r25";
 
 $code.=<<___;
        .EXPORT OPENSSL_cleanse,ENTRY,ARGW0=GR,ARGW1=GR
@@ -97,40 +97,129 @@ OPENSSL_cleanse
        .PROC
        .CALLINFO       NO_CALLS
        .ENTRY
-       cmpib,*>>       15,$len,Little
+       cmpib,*=        0,$len,L\$done
+       nop
+       cmpib,*>>=      15,$len,L\$ittle
        ldi             $SIZE_T-1,%r1
 
-Lalign
+L\$align
        and,*<>         $inp,%r1,%r28
-       b,n             Laligned
+       b,n             L\$aligned
        stb             %r0,0($inp)
        ldo             -1($len),$len
-       b               Lalign
+       b               L\$align
        ldo             1($inp),$inp
 
-Laligned
+L\$aligned
        andcm           $len,%r1,%r28
-Loop
+L\$ot
        $ST             %r0,0($inp)
-       addib,*vnz      -$SIZE_T,%r28,Loop
+       addib,*<>       -$SIZE_T,%r28,L\$ot
        ldo             $SIZE_T($inp),$inp
 
        and,*<>         $len,%r1,$len
-       b,n             Ldone
-Little
+       b,n             L\$done
+L\$ittle
        stb             %r0,0($inp)
-       addib,*vnz      -1,$len,Little
+       addib,*<>       -1,$len,L\$ittle
        ldo             1($inp),$inp
-Ldone
+L\$done
        bv              ($rp)
        .EXIT
        nop
        .PROCEND
 ___
 }
+{
+my ($out,$cnt,$max)=("%r26","%r25","%r24");
+my ($tick,$lasttick)=("%r23","%r22");
+my ($diff,$lastdiff)=("%r21","%r20");
+
+$code.=<<___;
+       .EXPORT OPENSSL_instrument_bus,ENTRY,ARGW0=GR,ARGW1=GR
+       .ALIGN  8
+OPENSSL_instrument_bus
+       .PROC
+       .CALLINFO       NO_CALLS
+       .ENTRY
+       copy            $cnt,$rv
+       mfctl           %cr16,$tick
+       copy            $tick,$lasttick
+       ldi             0,$diff
 
-$code =~ s/cmpib,\*/comib,/gm if ($SIZE_T==4);
-$code =~ s/,\*/,/gm if ($SIZE_T==4);
+       fdc             0($out)
+       ldw             0($out),$tick
+       add             $diff,$tick,$tick
+       stw             $tick,0($out)
+L\$oop
+       mfctl           %cr16,$tick
+       sub             $tick,$lasttick,$diff
+       copy            $tick,$lasttick
+
+       fdc             0($out)
+       ldw             0($out),$tick
+       add             $diff,$tick,$tick
+       stw             $tick,0($out)
+
+       addib,<>        -1,$cnt,L\$oop
+       addi            4,$out,$out
+
+       bv              ($rp)
+       .EXIT
+       sub             $rv,$cnt,$rv
+       .PROCEND
+
+       .EXPORT OPENSSL_instrument_bus2,ENTRY,ARGW0=GR,ARGW1=GR
+       .ALIGN  8
+OPENSSL_instrument_bus2
+       .PROC
+       .CALLINFO       NO_CALLS
+       .ENTRY
+       copy            $cnt,$rv
+       sub             %r0,$cnt,$cnt
+
+       mfctl           %cr16,$tick
+       copy            $tick,$lasttick
+       ldi             0,$diff
+
+       fdc             0($out)
+       ldw             0($out),$tick
+       add             $diff,$tick,$tick
+       stw             $tick,0($out)
+
+       mfctl           %cr16,$tick
+       sub             $tick,$lasttick,$diff
+       copy            $tick,$lasttick
+L\$oop2
+       copy            $diff,$lastdiff
+       fdc             0($out)
+       ldw             0($out),$tick
+       add             $diff,$tick,$tick
+       stw             $tick,0($out)
+
+       addib,=         -1,$max,L\$done2
+       nop
+
+       mfctl           %cr16,$tick
+       sub             $tick,$lasttick,$diff
+       copy            $tick,$lasttick
+       cmpclr,<>       $lastdiff,$diff,$tick
+       ldi             1,$tick
+
+       ldi             1,%r1
+       xor             %r1,$tick,$tick
+       addb,<>         $tick,$cnt,L\$oop2
+       shladd,l        $tick,2,$out,$out
+L\$done2
+       bv              ($rp)
+       .EXIT
+       add             $rv,$cnt,$rv
+       .PROCEND
+___
+}
+$code =~ s/cmpib,\*/comib,/gm  if ($SIZE_T==4);
+$code =~ s/,\*/,/gm            if ($SIZE_T==4);
+$code =~ s/\bbv\b/bve/gm       if ($SIZE_T==8);
 print $code;
 close STDOUT;