From: Dr. Stephen Henson Date: Wed, 3 Feb 2010 18:19:22 +0000 (+0000) Subject: don't assume 0x is at start of string X-Git-Tag: OpenSSL-fips-2_0-rc1~1285 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=c95bf51167f7d7b5d21d84bef02832bb896888de don't assume 0x is at start of string --- diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl index e4fc17bdbd..d89765d7ee 100755 --- a/crypto/perlasm/x86_64-xlate.pl +++ b/crypto/perlasm/x86_64-xlate.pl @@ -578,7 +578,7 @@ my %globals; my $last = pop(@arr); my $conv = sub { my $var=shift; $var=~s/^(0b[0-1]+)/oct($1)/eig; - $var=~s/^0x([0-9a-f]+)/0$1h/ig if ($masm); + $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;