summaryrefslogtreecommitdiffstats
path: root/crypto/perlasm
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2008-12-27 14:00:37 +0000
committerAndy Polyakov <appro@openssl.org>2008-12-27 14:00:37 +0000
commite81695205edc4f5391f6a6d82e17f0062c1c4cea (patch)
treef0fb034ca7f5a1c7e5f668a8ff1d38b846556635 /crypto/perlasm
parentfe150ac25df9d15d149c796cc8a8435fa291dc5b (diff)
x86_64-xlate.pl: support for binary constants, such as 0b1010101.
Diffstat (limited to 'crypto/perlasm')
-rwxr-xr-xcrypto/perlasm/x86_64-xlate.pl5
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index f94bbefb26..131109d849 100755
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -195,7 +195,8 @@ my %globals;
$self->{value} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
sprintf "\$%s",$self->{value};
} else {
- $self->{value} =~ s/0x([0-9a-f]+)/0$1h/ig;
+ $self->{value} =~ s/(0b[0-1]+)/oct($1)/eig;
+ $self->{value} =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm);
sprintf "%s",$self->{value};
}
}
@@ -574,6 +575,7 @@ my %globals;
my @arr = split(',',$line);
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);
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; }
@@ -587,6 +589,7 @@ my %globals;
last;
};
/\.byte/ && do { my @str=split(",",$line);
+ map(s/(0b[0-1]+)/oct($1)/eig,@str);
map(s/0x([0-9a-f]+)/0$1h/ig,@str) if ($masm);
while ($#str>15) {
$self->{value}.="DB\t"