diff options
| author | Andy Polyakov <appro@openssl.org> | 2010-05-13 15:26:46 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2010-05-13 15:26:46 +0000 |
| commit | 046ea3086490475108c789e9557d86e54042e25f (patch) | |
| tree | 9c3d1705d545c6daf6437ce8157f9c003d60980b /crypto/perlasm | |
| parent | 3efe51a4071d864400888e91b66c34ac3e17e01d (diff) | |
x86_64-xlate.pl: refine some regexp's and add support for OWORD/QWORD PTR.
Diffstat (limited to 'crypto/perlasm')
| -rwxr-xr-x | crypto/perlasm/x86_64-xlate.pl | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl index c83be3f95c..af9453aeae 100755 --- a/crypto/perlasm/x86_64-xlate.pl +++ b/crypto/perlasm/x86_64-xlate.pl @@ -193,7 +193,7 @@ my %globals; if ($gas) { # Solaris /usr/ccs/bin/as can't handle multiplications # in $self->{value} - $self->{value} =~ s/(?<![0-9a-f])(0[x0-9a-f]+)/oct($1)/egi; + $self->{value} =~ s/(?<=[\b\+\-\/\*\%])(0[x0-9a-f]+)/oct($1)/egi; $self->{value} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg; sprintf "\$%s",$self->{value}; } else { @@ -245,7 +245,7 @@ my %globals; # Solaris /usr/ccs/bin/as can't handle multiplications # in $self->{label}, new gas requires sign extension... use integer; - $self->{label} =~ s/(?<![0-9a-f])(0[x0-9a-f]+)/oct($1)/egi; + $self->{label} =~ s/(?<=[\b\+\-\/\*\%])(0[xb]*[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"); @@ -258,10 +258,11 @@ my %globals; sprintf "%s%s(%%%s)", $self->{asterisk},$self->{label},$self->{base}; } } else { - %szmap = ( b=>"BYTE$PTR", w=>"WORD$PTR", l=>"DWORD$PTR", q=>"QWORD$PTR" ); + %szmap = ( b=>"BYTE$PTR", w=>"WORD$PTR", l=>"DWORD$PTR", + q=>"QWORD$PTR",o=>"OWORD$PTR" ); $self->{label} =~ s/\./\$/g; - $self->{label} =~ s/0x([0-9a-f]+)/0$1h/ig; + $self->{label} =~ s/(?<=[\b\+\-\/\*\%])0x([0-9a-f]+)/0$1h/ig; $self->{label} = "($self->{label})" if ($self->{label} =~ /[\*\+\-\/]/); $sz="q" if ($self->{asterisk}); @@ -735,7 +736,11 @@ while($line=<>) { else { printf "\t%s\t%s",$insn,join(",",@args); } } else { $insn = $opcode->out(); - $insn .= $sz if (map($_->out() =~ /xmm|mmx/,@args)); + foreach (@args) { + my $arg = $_->out(); + if ($arg =~ /xmm/) { $insn.=$sz; $sz="o"; last; } + if ($arg =~ /mm/) { $insn.=$sz; $sz="q"; last; } + } @args = reverse(@args); undef $sz if ($nasm && $opcode->mnemonic() eq "lea"); printf "\t%s\t%s",$insn,join(",",map($_->out($sz),@args)); |