diff options
| author | Andy Polyakov <appro@openssl.org> | 2008-12-19 11:14:38 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2008-12-19 11:14:38 +0000 |
| commit | bf785c984907f74d0a869ed1e6b5855888b1df96 (patch) | |
| tree | 4aa9873132a0bf3040f67374d6f97f9d72333bc3 /crypto/perlasm | |
| parent | 4db4882402a79345a075c62a87f2fb7cfe89e283 (diff) | |
x86_64-xlate.pl: fix masm hexadecimal constants.
Diffstat (limited to 'crypto/perlasm')
| -rwxr-xr-x | crypto/perlasm/x86_64-xlate.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl index 3ed7fcd494..f94bbefb26 100755 --- a/crypto/perlasm/x86_64-xlate.pl +++ b/crypto/perlasm/x86_64-xlate.pl @@ -574,7 +574,7 @@ my %globals; my @arr = split(',',$line); my $last = pop(@arr); my $conv = sub { my $var=shift; - $var=~s/0x([0-9a-f]+)/0$1h/ig; + $var=~s/0x([0-9a-f]+)/0$1h/ig if ($masm); if ($sz eq "D" && ($current_segment=~/.[px]data/ || $dir eq ".rva")) { $var=~s/([_a-z\$\@][_a-z0-9\$\@]*)/$nasm?"$1 wrt ..imagebase":"imagerel $1"/egi; } $var; @@ -587,6 +587,7 @@ my %globals; last; }; /\.byte/ && do { my @str=split(",",$line); + map(s/0x([0-9a-f]+)/0$1h/ig,@str) if ($masm); while ($#str>15) { $self->{value}.="DB\t" .join(",",@str[0..15])."\n"; @@ -661,8 +662,7 @@ while($line=<>) { @args = reverse(@args); undef $sz if ($nasm && $opcode->mnemonic() eq "lea"); } - for (@args) { $_ = $_->out($sz); } - printf "\t%s\t%s", $insn, join(",",@args); + printf "\t%s\t%s",$insn,join(",",map($_->out($sz),@args)); } else { printf "\t%s",$opcode->out(); } |