rc4-x86_64 portability fix.

[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 19d372556f0fe67a6f223b916e0db7fa639cdfa0..14b6e35b85f6913865587d6b3d039c425617127c 100755 (executable)
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -82,12 +82,12 @@ my $current_function;
            $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)b.*/) {  # movz is pain...

                $self->{op} = $1;
                $self->{sz} = "b";
            } elsif ($self->{op} =~ /call/) {
                $self->{sz} = ""
                $self->{op} = $1;
                $self->{sz} = "b";
            } elsif ($self->{op} =~ /call/) {
                $self->{sz} = ""

-           } elsif ($self->{op} =~ /([a-z]{3,})([qlwb])/) {
+           } elsif ($self->{op} =~ /([a-z]{3,})([qlwb])$/) {

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


@@ -113,7 +113,7 @@ my $current_function;
                "$self->{op}$self->{sz}";
            }
        } else {
                "$self->{op}$self->{sz}";
            }
        } else {

-           $self->{op} =~ s/movz/movzx/;
+           $self->{op} =~ s/^movz/movzx/;

            if ($self->{op} eq "ret") {
                $self->{op} = "";
                if ($current_function->{abi} eq "svr4") {
            if ($self->{op} eq "ret") {
                $self->{op} = "";
                if ($current_function->{abi} eq "svr4") {