x86_64-xlate.pl: support for binary constants, such as 0b1010101.
authorAndy Polyakov <appro@openssl.org>
Sat, 27 Dec 2008 14:00:37 +0000 (14:00 +0000)
committerAndy Polyakov <appro@openssl.org>
Sat, 27 Dec 2008 14:00:37 +0000 (14:00 +0000)
crypto/perlasm/x86_64-xlate.pl

index f94bbef..131109d 100755 (executable)
@@ -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"