diff options
author | miod <> | 2014-05-02 22:22:27 +0000 |
---|---|---|
committer | miod <> | 2014-05-02 22:22:27 +0000 |
commit | ec780dc5e858603059fbc963f159f8e074a9d3d4 (patch) | |
tree | 1864d8403612e9e9c214260ea65ebb27461a9d3c /src | |
parent | 34596499ee6306d6f5b9daf8aaa2d0f382e2e88b (diff) | |
download | openbsd-ec780dc5e858603059fbc963f159f8e074a9d3d4.tar.gz openbsd-ec780dc5e858603059fbc963f159f8e074a9d3d4.tar.bz2 openbsd-ec780dc5e858603059fbc963f159f8e074a9d3d4.zip |
More use of 64-bit registers which needs to be disabled under OpenBSD.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/bn/asm/parisc-mont.pl | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/modes/asm/ghash-parisc.pl | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/bn/asm/parisc-mont.pl | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/libcrypto/bn/asm/parisc-mont.pl b/src/lib/libcrypto/bn/asm/parisc-mont.pl index baa19675ac..fcfdee1f1f 100644 --- a/src/lib/libcrypto/bn/asm/parisc-mont.pl +++ b/src/lib/libcrypto/bn/asm/parisc-mont.pl | |||
@@ -214,6 +214,7 @@ $code.=<<___; | |||
214 | flddx $idx($np),${fni} ; np[2,3] | 214 | flddx $idx($np),${fni} ; np[2,3] |
215 | ___ | 215 | ___ |
216 | $code.=<<___ if ($BN_SZ==4); | 216 | $code.=<<___ if ($BN_SZ==4); |
217 | #ifndef __OpenBSD__ | ||
217 | mtctl $hi0,%cr11 ; $hi0 still holds 31 | 218 | mtctl $hi0,%cr11 ; $hi0 still holds 31 |
218 | extrd,u,*= $hi0,%sar,1,$hi0 ; executes on PA-RISC 1.0 | 219 | extrd,u,*= $hi0,%sar,1,$hi0 ; executes on PA-RISC 1.0 |
219 | b L\$parisc11 | 220 | b L\$parisc11 |
@@ -550,6 +551,7 @@ $code.=<<___; | |||
550 | 551 | ||
551 | .ALIGN 8 | 552 | .ALIGN 8 |
552 | L\$parisc11 | 553 | L\$parisc11 |
554 | #endif | ||
553 | xmpyu ${fai}L,${fbi},${fab0} ; ap[j]*bp[0] | 555 | xmpyu ${fai}L,${fbi},${fab0} ; ap[j]*bp[0] |
554 | xmpyu ${fni}L,${fm0}R,${fnm0} ; np[j]*m | 556 | xmpyu ${fni}L,${fm0}R,${fnm0} ; np[j]*m |
555 | ldw -12($xfer),$ablo | 557 | ldw -12($xfer),$ablo |
diff --git a/src/lib/libcrypto/modes/asm/ghash-parisc.pl b/src/lib/libcrypto/modes/asm/ghash-parisc.pl index 38c5e00a98..b17ee8858c 100644 --- a/src/lib/libcrypto/modes/asm/ghash-parisc.pl +++ b/src/lib/libcrypto/modes/asm/ghash-parisc.pl | |||
@@ -117,6 +117,7 @@ L\$pic_gmult | |||
117 | ldi 0xf0,$mask0xf0 | 117 | ldi 0xf0,$mask0xf0 |
118 | ___ | 118 | ___ |
119 | $code.=<<___ if ($SIZE_T==4); | 119 | $code.=<<___ if ($SIZE_T==4); |
120 | #ifndef __OpenBSD__ | ||
120 | ldi 31,$rem | 121 | ldi 31,$rem |
121 | mtctl $rem,%cr11 | 122 | mtctl $rem,%cr11 |
122 | extrd,u,*= $rem,%sar,1,$rem ; executes on PA-RISC 1.0 | 123 | extrd,u,*= $rem,%sar,1,$rem ; executes on PA-RISC 1.0 |
@@ -215,6 +216,7 @@ $code.=<<___ if ($SIZE_T==4); | |||
215 | nop | 216 | nop |
216 | 217 | ||
217 | L\$parisc1_gmult | 218 | L\$parisc1_gmult |
219 | #endif | ||
218 | ldb 15($Xi),$nlo | 220 | ldb 15($Xi),$nlo |
219 | ldo 12($Htbl),$Hll | 221 | ldo 12($Htbl),$Hll |
220 | ldo 8($Htbl),$Hlh | 222 | ldo 8($Htbl),$Hlh |
diff --git a/src/lib/libssl/src/crypto/bn/asm/parisc-mont.pl b/src/lib/libssl/src/crypto/bn/asm/parisc-mont.pl index baa19675ac..fcfdee1f1f 100644 --- a/src/lib/libssl/src/crypto/bn/asm/parisc-mont.pl +++ b/src/lib/libssl/src/crypto/bn/asm/parisc-mont.pl | |||
@@ -214,6 +214,7 @@ $code.=<<___; | |||
214 | flddx $idx($np),${fni} ; np[2,3] | 214 | flddx $idx($np),${fni} ; np[2,3] |
215 | ___ | 215 | ___ |
216 | $code.=<<___ if ($BN_SZ==4); | 216 | $code.=<<___ if ($BN_SZ==4); |
217 | #ifndef __OpenBSD__ | ||
217 | mtctl $hi0,%cr11 ; $hi0 still holds 31 | 218 | mtctl $hi0,%cr11 ; $hi0 still holds 31 |
218 | extrd,u,*= $hi0,%sar,1,$hi0 ; executes on PA-RISC 1.0 | 219 | extrd,u,*= $hi0,%sar,1,$hi0 ; executes on PA-RISC 1.0 |
219 | b L\$parisc11 | 220 | b L\$parisc11 |
@@ -550,6 +551,7 @@ $code.=<<___; | |||
550 | 551 | ||
551 | .ALIGN 8 | 552 | .ALIGN 8 |
552 | L\$parisc11 | 553 | L\$parisc11 |
554 | #endif | ||
553 | xmpyu ${fai}L,${fbi},${fab0} ; ap[j]*bp[0] | 555 | xmpyu ${fai}L,${fbi},${fab0} ; ap[j]*bp[0] |
554 | xmpyu ${fni}L,${fm0}R,${fnm0} ; np[j]*m | 556 | xmpyu ${fni}L,${fm0}R,${fnm0} ; np[j]*m |
555 | ldw -12($xfer),$ablo | 557 | ldw -12($xfer),$ablo |
diff --git a/src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl b/src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl index 38c5e00a98..b17ee8858c 100644 --- a/src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl +++ b/src/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl | |||
@@ -117,6 +117,7 @@ L\$pic_gmult | |||
117 | ldi 0xf0,$mask0xf0 | 117 | ldi 0xf0,$mask0xf0 |
118 | ___ | 118 | ___ |
119 | $code.=<<___ if ($SIZE_T==4); | 119 | $code.=<<___ if ($SIZE_T==4); |
120 | #ifndef __OpenBSD__ | ||
120 | ldi 31,$rem | 121 | ldi 31,$rem |
121 | mtctl $rem,%cr11 | 122 | mtctl $rem,%cr11 |
122 | extrd,u,*= $rem,%sar,1,$rem ; executes on PA-RISC 1.0 | 123 | extrd,u,*= $rem,%sar,1,$rem ; executes on PA-RISC 1.0 |
@@ -215,6 +216,7 @@ $code.=<<___ if ($SIZE_T==4); | |||
215 | nop | 216 | nop |
216 | 217 | ||
217 | L\$parisc1_gmult | 218 | L\$parisc1_gmult |
219 | #endif | ||
218 | ldb 15($Xi),$nlo | 220 | ldb 15($Xi),$nlo |
219 | ldo 12($Htbl),$Hll | 221 | ldo 12($Htbl),$Hll |
220 | ldo 8($Htbl),$Hlh | 222 | ldo 8($Htbl),$Hlh |