x86_64-xlate.pl: make vpaes-x86_64.pl and rc4-md5-x86_64 work with ml64,

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

diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index a6b718b5e883ba9488c8450f0d398e7336490dad..97310d898db732d4df39cf39665a12c9b6cd9c32 100755 (executable)
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -116,13 +116,15 @@ my %globals;
            $line = substr($line,@+[0]); $line =~ s/^\s+//;
 
            undef $self->{sz};
            $line = substr($line,@+[0]); $line =~ s/^\s+//;
 
            undef $self->{sz};

-           if ($self->{op} =~ /^(movz)b.*/) {  # movz is pain...
+           if ($self->{op} =~ /^(movz)x?([bw]).*/) {   # movz is pain...

                $self->{op} = $1;
                $self->{op} = $1;

-               $self->{sz} = "b";
+               $self->{sz} = $2;

            } elsif ($self->{op} =~ /call|jmp/) {
                $self->{sz} = "";
            } elsif ($self->{op} =~ /^p/ && $' !~ /^(ush|op|insrw)/) { # SSEn
                $self->{sz} = "";
            } elsif ($self->{op} =~ /call|jmp/) {
                $self->{sz} = "";
            } elsif ($self->{op} =~ /^p/ && $' !~ /^(ush|op|insrw)/) { # SSEn
                $self->{sz} = "";

+           } elsif ($self->{op} =~ /^v/) { # VEX
+               $self->{sz} = "";

            } elsif ($self->{op} =~ /movq/ && $line =~ /%xmm/) {
                $self->{sz} = "";
            } elsif ($self->{op} =~ /([a-z]{3,})([qlwb])$/) {
            } elsif ($self->{op} =~ /movq/ && $line =~ /%xmm/) {
                $self->{sz} = "";
            } elsif ($self->{op} =~ /([a-z]{3,})([qlwb])$/) {


@@ -248,13 +250,14 @@ my %globals;
        $self->{index} =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
        $self->{base}  =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
 
        $self->{index} =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
        $self->{base}  =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
 

+       # Solaris /usr/ccs/bin/as can't handle multiplications
+       # in $self->{label}, new gas requires sign extension...
+       use integer;
+       $self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
+       $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
+       $self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;
+

        if ($gas) {
        if ($gas) {

-           # Solaris /usr/ccs/bin/as can't handle multiplications
-           # in $self->{label}, new gas requires sign extension...
-           use integer;
-           $self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
-           $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
-           $self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;

            $self->{label} =~ s/^___imp_/__imp__/   if ($flavour eq "mingw64");
 
            if (defined($self->{index})) {
            $self->{label} =~ s/^___imp_/__imp__/   if ($flavour eq "mingw64");
 
            if (defined($self->{index})) {


@@ -272,7 +275,8 @@ my %globals;
            $self->{label} =~ s/\./\$/g;
            $self->{label} =~ s/(?<![\w\$\.])0x([0-9a-f]+)/0$1h/ig;
            $self->{label} = "($self->{label})" if ($self->{label} =~ /[\*\+\-\/]/);
            $self->{label} =~ s/\./\$/g;
            $self->{label} =~ s/(?<![\w\$\.])0x([0-9a-f]+)/0$1h/ig;
            $self->{label} = "($self->{label})" if ($self->{label} =~ /[\*\+\-\/]/);

-           $sz="q" if ($self->{asterisk});
+           $sz="q" if ($self->{asterisk} || opcode->mnemonic() eq "movq");
+           $sz="l" if (opcode->mnemonic() eq "movd");

 
            if (defined($self->{index})) {
                sprintf "%s[%s%s*%d%s]",$szmap{$sz},
 
            if (defined($self->{index})) {
                sprintf "%s[%s%s*%d%s]",$szmap{$sz},


@@ -564,7 +568,7 @@ my %globals;
                                            $v.=" READONLY";
                                            $v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref);
                                        } elsif ($line=~/\.CRT\$/i) {
                                            $v.=" READONLY";
                                            $v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref);
                                        } elsif ($line=~/\.CRT\$/i) {

-                                           $v.=" READONLY DWORD";
+                                           $v.=" READONLY ALIGN(8)";

                                        }
                                    }
                                    $current_segment = $line;
                                        }
                                    }
                                    $current_segment = $line;


@@ -586,7 +590,7 @@ my %globals;
                                            $self->{value}="${decor}SEH_end_$current_function->{name}:";
                                            $self->{value}.=":\n" if($masm);
                                        }
                                            $self->{value}="${decor}SEH_end_$current_function->{name}:";
                                            $self->{value}.=":\n" if($masm);
                                        }

-                                       $self->{value}.="$current_function->{name}\tENDP" if($masm);
+                                       $self->{value}.="$current_function->{name}\tENDP" if($masm && $current_function->{name});

                                        undef $current_function;
                                    }
                                    last;
                                        undef $current_function;
                                    }
                                    last;


@@ -628,7 +632,7 @@ my %globals;
                                        $v.="common     $prefix@str[0] @str[1]";
                                    } else {
                                        $v="$current_segment\tENDS\n" if ($current_segment);
                                        $v.="common     $prefix@str[0] @str[1]";
                                    } else {
                                        $v="$current_segment\tENDS\n" if ($current_segment);

-                                       $current_segment = ".data";
+                                       $current_segment = "_DATA";

                                        $v.="$current_segment\tSEGMENT\n";
                                        $v.="COMM       @str[0]:DWORD:".@str[1]/4;
                                    }
                                        $v.="$current_segment\tSEGMENT\n";
                                        $v.="COMM       @str[0]:DWORD:".@str[1]/4;
                                    }


@@ -663,14 +667,14 @@ my %regrm = (     "%eax"=>0, "%ecx"=>1, "%edx"=>2, "%ebx"=>3,
 my $movq = sub {       # elderly gas can't handle inter-register movq
   my $arg = shift;
   my @opcode=(0x66);
 my $movq = sub {       # elderly gas can't handle inter-register movq
   my $arg = shift;
   my @opcode=(0x66);

-    if ($arg =~ /%xmm([0-9]+),%r(\w+)/) {
+    if ($arg =~ /%xmm([0-9]+),\s*%r(\w+)/) {

        my ($src,$dst)=($1,$2);
        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
        rex(\@opcode,$src,$dst,0x8);
        push @opcode,0x0f,0x7e;
        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
        @opcode;
        my ($src,$dst)=($1,$2);
        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
        rex(\@opcode,$src,$dst,0x8);
        push @opcode,0x0f,0x7e;
        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
        @opcode;

-    } elsif ($arg =~ /%r(\w+),%xmm([0-9]+)/) {
+    } elsif ($arg =~ /%r(\w+),\s*%xmm([0-9]+)/) {

        my ($src,$dst)=($2,$1);
        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
        rex(\@opcode,$src,$dst,0x8);
        my ($src,$dst)=($2,$1);
        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
        rex(\@opcode,$src,$dst,0x8);


@@ -683,7 +687,7 @@ my $movq = sub {    # elderly gas can't handle inter-register movq
 };
 
 my $pextrd = sub {
 };
 
 my $pextrd = sub {

-    if (shift =~ /\$([0-9]+),%xmm([0-9]+),(%\w+)/) {
+    if (shift =~ /\$([0-9]+),\s*%xmm([0-9]+),\s*(%\w+)/) {

       my @opcode=(0x66);
        $imm=$1;
        $src=$2;
       my @opcode=(0x66);
        $imm=$1;
        $src=$2;


@@ -701,7 +705,7 @@ my $pextrd = sub {
 };
 
 my $pinsrd = sub {
 };
 
 my $pinsrd = sub {

-    if (shift =~ /\$([0-9]+),(%\w+),%xmm([0-9]+)/) {
+    if (shift =~ /\$([0-9]+),\s*(%\w+),\s*%xmm([0-9]+)/) {

       my @opcode=(0x66);
        $imm=$1;
        $src=$2;
       my @opcode=(0x66);
        $imm=$1;
        $src=$2;


@@ -719,7 +723,7 @@ my $pinsrd = sub {
 };
 
 my $pshufb = sub {
 };
 
 my $pshufb = sub {

-    if (shift =~ /%xmm([0-9]+),%xmm([0-9]+)/) {
+    if (shift =~ /%xmm([0-9]+),\s*%xmm([0-9]+)/) {

       my @opcode=(0x66);
        rex(\@opcode,$2,$1);
        push @opcode,0x0f,0x38,0x00;
       my @opcode=(0x66);
        rex(\@opcode,$2,$1);
        push @opcode,0x0f,0x38,0x00;


@@ -731,7 +735,7 @@ my $pshufb = sub {
 };
 
 my $palignr = sub {
 };
 
 my $palignr = sub {

-    if (shift =~ /\$([0-9]+),%xmm([0-9]+),%xmm([0-9]+)/) {
+    if (shift =~ /\$([0-9]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {

       my @opcode=(0x66);
        rex(\@opcode,$3,$2);
        push @opcode,0x0f,0x3a,0x0f;
       my @opcode=(0x66);
        rex(\@opcode,$3,$2);
        push @opcode,0x0f,0x3a,0x0f;