diff options
| author | jkim <jkim@FreeBSD.org> | 2012-06-27 18:44:36 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-06-27 18:44:36 +0000 |
| commit | 299ab12592ee76c1d23012fb680eb3de3047a332 (patch) | |
| tree | eec54a5ed50326dd4ab254bab7df3b566651ac6d /crypto/openssl/crypto/bn/asm | |
| parent | a461bd15071993dd2121ed8ddfaee9fef880cd56 (diff) | |
| download | FreeBSD-src-299ab12592ee76c1d23012fb680eb3de3047a332.zip FreeBSD-src-299ab12592ee76c1d23012fb680eb3de3047a332.tar.gz | |
Merge OpenSSL 0.9.8x.
Reviewed by: stas
Approved by: benl (maintainer)
MFC after: 3 days
Diffstat (limited to 'crypto/openssl/crypto/bn/asm')
| -rwxr-xr-x | crypto/openssl/crypto/bn/asm/mo-586.pl | 4 | ||||
| -rw-r--r-- | crypto/openssl/crypto/bn/asm/ppc.pl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crypto/openssl/crypto/bn/asm/mo-586.pl b/crypto/openssl/crypto/bn/asm/mo-586.pl index 0982293..061127e 100755 --- a/crypto/openssl/crypto/bn/asm/mo-586.pl +++ b/crypto/openssl/crypto/bn/asm/mo-586.pl @@ -539,8 +539,10 @@ $sbit=$num; &jle (&label("sqradd")); &mov ($carry,"edx"); - &lea ("edx",&DWP(0,$sbit,"edx",2)); + &add ("edx","edx"); &shr ($carry,31); + &add ("edx",$sbit); + &adc ($carry,0); &set_label("sqrlast"); &mov ($word,$_n0); &mov ($inp,$_np); diff --git a/crypto/openssl/crypto/bn/asm/ppc.pl b/crypto/openssl/crypto/bn/asm/ppc.pl index 806e53a..8444883 100644 --- a/crypto/openssl/crypto/bn/asm/ppc.pl +++ b/crypto/openssl/crypto/bn/asm/ppc.pl @@ -1039,7 +1039,7 @@ sub data { addze r11,r0 #mul_add_c(a[3],b[2],c3,c1,c2); $LD r6,`3*$BNSZ`(r4) - $LD r7,`2*$BNSZ`(r4) + $LD r7,`2*$BNSZ`(r5) $UMULL r8,r6,r7 $UMULH r9,r6,r7 addc r12,r8,r12 |
