PA-RISC assembler: missing symbol and typos.

diff --git a/crypto/bn/asm/parisc-mont.pl b/crypto/bn/asm/parisc-mont.pl
index bb0e43e32dfe1f750dbd02f11102d36452b3a91d..c421fd8a374b02003da699db21a64e5413eba6bb 100644 (file)
--- 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 c411b7175dc3327d2ea51eb3f23fbb1b46b570d0..bf470ac510acbd451ab297e43960506d14f27b17 100644 (file)
--- 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 9ccbdaaf82bc5f2cef71e06cf4a8c77354547db1..e24ee58ae97f2a5c2bb78a93e1496462e1caaa28 100755 (executable)
--- 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;
     }