summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libssl/src/crypto/aes/asm/aes-parisc.pl3
-rw-r--r--lib/libssl/src/crypto/modes/asm/ghash-alpha.pl25
-rw-r--r--lib/libssl/src/crypto/modes/asm/ghash-parisc.pl1
-rw-r--r--lib/libssl/src/crypto/rc4/asm/rc4-parisc.pl3
-rw-r--r--lib/libssl/src/crypto/sha/asm/sha1-parisc.pl3
-rwxr-xr-xlib/libssl/src/crypto/sha/asm/sha512-parisc.pl2
6 files changed, 11 insertions, 26 deletions
diff --git a/lib/libssl/src/crypto/aes/asm/aes-parisc.pl b/lib/libssl/src/crypto/aes/asm/aes-parisc.pl
index 714dcfbbe3b..c36b6a22705 100644
--- a/lib/libssl/src/crypto/aes/asm/aes-parisc.pl
+++ b/lib/libssl/src/crypto/aes/asm/aes-parisc.pl
@@ -1015,8 +1015,7 @@ foreach (split("\n",$code)) {
$SIZE_T==4 ? sprintf("extru%s,%d,8,",$1,31-$2)
: sprintf("extrd,u%s,%d,8,",$1,63-$2)/e;
- s/,\*/,/ if ($SIZE_T==4);
- s/\bbv\b(.*\(%r2\))/bve$1/ if ($SIZE_T==8);
+ s/,\*/,/ if ($SIZE_T==4);
print $_,"\n";
}
close STDOUT;
diff --git a/lib/libssl/src/crypto/modes/asm/ghash-alpha.pl b/lib/libssl/src/crypto/modes/asm/ghash-alpha.pl
index aa360293864..6358b2750fa 100644
--- a/lib/libssl/src/crypto/modes/asm/ghash-alpha.pl
+++ b/lib/libssl/src/crypto/modes/asm/ghash-alpha.pl
@@ -266,8 +266,8 @@ gcm_gmult_4bit:
ldq $Xlo,8($Xi)
ldq $Xhi,0($Xi)
- bsr $t0,picmeup
- nop
+ br $rem_4bit,.Lpic1
+.Lpic1: lda $rem_4bit,rem_4bit-.Lpic1($rem_4bit)
___
&loop();
@@ -341,8 +341,8 @@ gcm_ghash_4bit:
ldq $Xhi,0($Xi)
ldq $Xlo,8($Xi)
- bsr $t0,picmeup
- nop
+ br $rem_4bit,.Lpic2
+.Lpic2: lda $rem_4bit,rem_4bit-.Lpic2($rem_4bit)
.Louter:
extql $inhi,$inp,$inhi
@@ -436,20 +436,11 @@ $code.=<<___;
.end gcm_ghash_4bit
.align 4
-.ent picmeup
-picmeup:
- .frame sp,0,$t0
- .prologue 0
- br $rem_4bit,.Lpic
-.Lpic: lda $rem_4bit,12($rem_4bit)
- ret ($t0)
-.end picmeup
- nop
rem_4bit:
- .long 0,0x0000<<16, 0,0x1C20<<16, 0,0x3840<<16, 0,0x2460<<16
- .long 0,0x7080<<16, 0,0x6CA0<<16, 0,0x48C0<<16, 0,0x54E0<<16
- .long 0,0xE100<<16, 0,0xFD20<<16, 0,0xD940<<16, 0,0xC560<<16
- .long 0,0x9180<<16, 0,0x8DA0<<16, 0,0xA9C0<<16, 0,0xB5E0<<16
+ .quad 0x0000<<48, 0x1C20<<48, 0x3840<<48, 0x2460<<48
+ .quad 0x7080<<48, 0x6CA0<<48, 0x48C0<<48, 0x54E0<<48
+ .quad 0xE100<<48, 0xFD20<<48, 0xD940<<48, 0xC560<<48
+ .quad 0x9180<<48, 0x8DA0<<48, 0xA9C0<<48, 0xB5E0<<48
.ascii "GHASH for Alpha, CRYPTOGAMS by <appro\@openssl.org>"
.align 4
diff --git a/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl b/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl
index d5ad96b4033..8c7454ee934 100644
--- a/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl
+++ b/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl
@@ -724,7 +724,6 @@ foreach (split("\n",$code)) {
s/cmpb,\*/comb,/;
s/,\*/,/;
}
- s/\bbv\b/bve/ if ($SIZE_T==8);
print $_,"\n";
}
diff --git a/lib/libssl/src/crypto/rc4/asm/rc4-parisc.pl b/lib/libssl/src/crypto/rc4/asm/rc4-parisc.pl
index ad7e65651cf..9165067080e 100644
--- a/lib/libssl/src/crypto/rc4/asm/rc4-parisc.pl
+++ b/lib/libssl/src/crypto/rc4/asm/rc4-parisc.pl
@@ -307,8 +307,7 @@ L\$opts
.STRINGZ "RC4 for PA-RISC, CRYPTOGAMS by <appro\@openssl.org>"
___
$code =~ s/\`([^\`]*)\`/eval $1/gem;
-$code =~ s/cmpib,\*/comib,/gm if ($SIZE_T==4);
-$code =~ s/\bbv\b/bve/gm if ($SIZE_T==8);
+$code =~ s/cmpib,\*/comib,/gm if ($SIZE_T==4);
print $code;
close STDOUT;
diff --git a/lib/libssl/src/crypto/sha/asm/sha1-parisc.pl b/lib/libssl/src/crypto/sha/asm/sha1-parisc.pl
index 6e5a328a6f1..6d7bf495b20 100644
--- a/lib/libssl/src/crypto/sha/asm/sha1-parisc.pl
+++ b/lib/libssl/src/crypto/sha/asm/sha1-parisc.pl
@@ -254,7 +254,6 @@ $code.=<<___;
___
$code =~ s/\`([^\`]*)\`/eval $1/gem;
-$code =~ s/,\*/,/gm if ($SIZE_T==4);
-$code =~ s/\bbv\b/bve/gm if ($SIZE_T==8);
+$code =~ s/,\*/,/gm if ($SIZE_T==4);
print $code;
close STDOUT;
diff --git a/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl b/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl
index fc0e15b3c05..e24ee58ae97 100755
--- a/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl
+++ b/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl
@@ -785,8 +785,6 @@ foreach (split("\n",$code)) {
s/cmpb,\*/comb,/ if ($SIZE_T==4);
- s/\bbv\b/bve/ if ($SIZE_T==8);
-
print $_,"\n";
}