x86_64-xlate.pl: Windows fixes.
authorAndy Polyakov <appro@openssl.org>
Sun, 30 Jun 2013 21:07:33 +0000 (23:07 +0200)
committerAndy Polyakov <appro@openssl.org>
Sun, 30 Jun 2013 21:14:19 +0000 (23:14 +0200)
(cherry picked from commit a9d14832fd98cb0c13b53fddea39765fb259358c)

crypto/perlasm/x86_64-xlate.pl

index d44afe1f5c90b484ae261b74cb5ee029ee780955..a2d870bb434e05ce37549dfa38e05aa9e2f63283 100755 (executable)
@@ -271,13 +271,14 @@ my %globals;
            }
        } else {
            %szmap = (  b=>"BYTE$PTR", w=>"WORD$PTR", l=>"DWORD$PTR",
-                       q=>"QWORD$PTR",o=>"OWORD$PTR",x=>"XMMWORD$PTR" );
+                       q=>"QWORD$PTR",o=>"OWORD$PTR",x=>"XMMWORD$PTR",
+                       y=>"" );
 
            $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} || opcode->mnemonic() eq "movq");
-           $sz="l" if (opcode->mnemonic() eq "movd");
+           $sz="q" if ($self->{asterisk} || opcode->mnemonic() =~ /^v?movq$/);
+           $sz="l" if (opcode->mnemonic() =~ /^v?movd$/);
 
            if (defined($self->{index})) {
                sprintf "%s[%s%s*%d%s]",$szmap{$sz},
@@ -881,6 +882,7 @@ while($line=<>) {
                    my $arg = $_->out();
                    # $insn.=$sz compensates for movq, pinsrw, ...
                    if ($arg =~ /^xmm[0-9]+$/) { $insn.=$sz; $sz="x" if(!$sz); last; }
+                   if ($arg =~ /^ymm[0-9]+$/) { $insn.=$sz; $sz="y" if(!$sz); last; }
                    if ($arg =~ /^mm[0-9]+$/)  { $insn.=$sz; $sz="q" if(!$sz); last; }
                }
                @args = reverse(@args);