ppc-xlate.pl update.

[openssl.git] / crypto / perlasm / ppc-xlate.pl

diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
index a51147a3a7aa2377fb4e497ef387ac173a2821b1..c2a4621f868a24c72f36d00248cb35ceed356543 100755 (executable)
--- a/crypto/perlasm/ppc-xlate.pl
+++ b/crypto/perlasm/ppc-xlate.pl
@@ -7,7 +7,7 @@ open STDOUT,">$output" || die "can't open $output: $!";
 
 my $flavour = $output;
 my %GLOBALS;
-my $dotinlocallabels=0;
+my $dotinlocallabels=($flavour=~/linux/)?1:0;
 
 ################################################################
 # directives which need special treatment on different platforms
@@ -29,7 +29,6 @@ my $globl = sub {
                              };
        /linux.*32/     && do { $ret .= ".globl $name\n";
                                $ret .= ".type  $name,\@function";
-                               $dotinlocallabels = 1;
                                last;
                              };
        /linux.*64/     && do { $ret .= ".globl .$name\n";
@@ -43,7 +42,6 @@ my $globl = sub {
                                $ret .= ".previous\n";
 
                                $name = ".$name";
-                               $dotinlocallabels = 1;
                                last;
                              };
     }
@@ -58,9 +56,20 @@ my $text = sub {
 my $machine = sub {
     my $junk = shift;
     my $arch = shift;
-    $arch = "ppc970" if ($arch eq "any" and $flavour =~ /osx/);
+    if ($flavour =~ /osx/)
+    {  $arch =~ s/\"//g;
+       $arch = ($flavour=~/64/) ? "ppc970-64" : "ppc970" if ($arch eq "any");
+    }
     ".machine  $arch";
 };
+my $asciz = sub {
+    shift;
+    my $line = join(",",@_);
+    if ($line =~ /^"(.*)"$/)
+    {  ".byte  " . join(",",unpack("C*",$1),0);        }
+    else
+    {  "";     }
+};
 
 ################################################################
 # simplified mnemonics not handled by at least one assembler
@@ -68,12 +77,10 @@ my $machine = sub {
 my $cmplw = sub {
     my $f = shift;
     my $cr = 0; $cr = shift if ($#_>1);
-    "  cmpl$f  ".join(',',$cr,0,@_);
-};
-my $cmpld = sub {
-    my $f = shift;
-    my $cr = 0; $cr = shift if ($#_>1);
-    "  cmpl$f  ".join(',',$cr,1,@_);
+    # Some out-of-date 32-bit GNU assembler just can't handle cmplw...
+    ($flavour =~ /linux.*32/) ?
+       "       .long   ".sprintf "0x%x",31<<26|$cr<<23|$_[0]<<16|$_[1]<<11|64 :
+       "       cmplw   ".join(',',$cr,@_);
 };
 my $bdnz = sub {
     my $f = shift;
@@ -105,7 +112,7 @@ while($line=<>) {
        my $mnemonic = $2;
        my $f = $3;
        my $opcode = eval("\$$mnemonic");
-       $line =~ s|\br([0-9]+)\b|$1|g if ($c ne "." and $flavour !~ /osx/);
+       $line =~ s|\bc?r([0-9]+)\b|$1|g if ($c ne "." and $flavour !~ /osx/);
        if (ref($opcode) eq 'CODE') { $line = &$opcode($f,split(',',$line)); }
        elsif ($mnemonic)           { $line = $c.$mnemonic.$f."\t".$line; }
     }