diff options
| author | Andy Polyakov <appro@openssl.org> | 2009-12-28 16:13:35 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2009-12-28 16:13:35 +0000 |
| commit | 3fc2efd241bdded36dbc099d5d8016ed39311753 (patch) | |
| tree | ced71e24155da594144d050792026d93c7a2ad9b | |
| parent | 76774c5ea1a7abeef79a9b0fc2bbb39acff96aae (diff) | |
| download | openssl-3fc2efd241bdded36dbc099d5d8016ed39311753.tar.gz | |
PA-RISC assembler: missing symbol and typos.
| -rw-r--r-- | crypto/bn/asm/parisc-mont.pl | 4 | ||||
| -rw-r--r-- | crypto/pariscid.pl | 11 | ||||
| -rwxr-xr-x | crypto/sha/asm/sha512-parisc.pl | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/crypto/bn/asm/parisc-mont.pl b/crypto/bn/asm/parisc-mont.pl index bb0e43e32d..c421fd8a37 100644 --- a/crypto/bn/asm/parisc-mont.pl +++ b/crypto/bn/asm/parisc-mont.pl @@ -894,7 +894,7 @@ my $ldd = sub { { my $opcode=(0x03<<26)|($2<<21)|($1<<16)|(3<<6)|$3; sprintf "\t.WORD\t0x%08x\t; %s",$opcode,$orig; } - elsif ($args =~ /([\-0-9]+)\(%r([0-9]+)\),%r([0-9]+)/) # format 5 + elsif ($args =~ /(\-?[0-9]+)\(%r([0-9]+)\),%r([0-9]+)/) # format 5 { my $opcode=(0x03<<26)|($2<<21)|(1<<12)|(3<<6)|$3; $opcode|=(($1&0xF)<<17)|(($1&0x10)<<12); # encode offset $opcode|=(1<<5) if ($mod =~ /^,m/); @@ -908,7 +908,7 @@ my $std = sub { my ($mod,$args) = @_; my $orig = "std$mod\t$args"; - if ($args =~ /%r([0-9]+),([\-0-9]+)\(%r([0-9]+)\)/) # format 6 + if ($args =~ /%r([0-9]+),(\-?[0-9]+)\(%r([0-9]+)\)/) # format 6 { my $opcode=(0x03<<26)|($3<<21)|($1<<16)|(1<<12)|(0xB<<6); $opcode|=(($2&0xF)<<1)|(($2&0x10)>>4); # encode offset $opcode|=(1<<5) if ($mod =~ /^,m/); diff --git a/crypto/pariscid.pl b/crypto/pariscid.pl index c411b7175d..bf470ac510 100644 --- a/crypto/pariscid.pl +++ b/crypto/pariscid.pl @@ -23,6 +23,17 @@ $code=<<___; .SPACE \$TEXT\$ .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY + .EXPORT OPENSSL_cpuid_setup,ENTRY + .ALIGN 8 +OPENSSL_cpuid_setup + .PROC + .CALLINFO NO_CALLS + .ENTRY + bv ($rp) + .EXIT + nop + .PROCEND + .EXPORT OPENSSL_rdtsc,ENTRY .ALIGN 8 OPENSSL_rdtsc diff --git a/crypto/sha/asm/sha512-parisc.pl b/crypto/sha/asm/sha512-parisc.pl index 9ccbdaaf82..e24ee58ae9 100755 --- a/crypto/sha/asm/sha512-parisc.pl +++ b/crypto/sha/asm/sha512-parisc.pl @@ -694,7 +694,7 @@ my $ldd = sub { my ($mod,$args) = @_; my $orig = "ldd$mod\t$args"; - if ($args =~ /(\-[0-9]+)\(%r([0-9]+)\),%r([0-9]+)/) # format 3 suffices + if ($args =~ /(\-?[0-9]+)\(%r([0-9]+)\),%r([0-9]+)/) # format 3 suffices { my $opcode=(0x14<<26)|($2<<21)|($3<<16)|(($1&0x1FF8)<<1)|(($1>>13)&1); $opcode|=(1<<3) if ($mod =~ /^,m/); $opcode|=(1<<2) if ($mod =~ /^,mb/); @@ -707,7 +707,7 @@ my $std = sub { my ($mod,$args) = @_; my $orig = "std$mod\t$args"; - if ($args =~ /%r([0-9]+),(\-[0-9]+)\(%r([0-9]+)\)/) # format 3 suffices + if ($args =~ /%r([0-9]+),(\-?[0-9]+)\(%r([0-9]+)\)/) # format 3 suffices { my $opcode=(0x1c<<26)|($3<<21)|($1<<16)|(($2&0x1FF8)<<1)|(($2>>13)&1); sprintf "\t.WORD\t0x%08x\t; %s",$opcode,$orig; } |