prepare for next release

[oweals/openssl.git] / crypto / perlasm / x86_64-xlate.pl

diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index 6cca5dc0051049b6c9eb678e9ba052411f20e044..fe348b99ad26387ed101b8ef12bc3846921b29b2 100755 (executable)
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -65,7 +65,10 @@ my $output = shift;
        if ($stddev!=$outdev || $stdino!=$outino);
 }
 
-my $masm=1 if ($output =~ /\.asm/);
+my $masmref=8 + 50727*2**-32;  # 8.00.50727 shipped with VS2005
+my $masm=$masmref if ($output =~ /\.asm/);
+if ($masm && `ml64 2>&1` =~ m/Version ([0-9]+)\.([0-9]+)(\.([0-9]+))?/)
+{   $masm=$1 + $2*2**-16 + $4*2**-32;   }
 
 my $current_segment;
 my $current_function;
@@ -82,12 +85,12 @@ my $current_function;
            $line = substr($line,@+[0]); $line =~ s/^\s+//;
 
            undef $self->{sz};
-           if ($self->{op} =~ /(movz)b.*/) {   # movz is pain...
+           if ($self->{op} =~ /^(movz)b.*/) {  # movz is pain...
                $self->{op} = $1;
                $self->{sz} = "b";
            } elsif ($self->{op} =~ /call/) {
                $self->{sz} = ""
-           } elsif ($self->{op} =~ /([a-z]{3,})([qlwb])\b/) {
+           } elsif ($self->{op} =~ /([a-z]{3,})([qlwb])$/) {
                $self->{op} = $1;
                $self->{sz} = $2;
            }
@@ -113,7 +116,7 @@ my $current_function;
                "$self->{op}$self->{sz}";
            }
        } else {
-           $self->{op} =~ s/movz/movzx/;
+           $self->{op} =~ s/^movz/movzx/;
            if ($self->{op} eq "ret") {
                $self->{op} = "";
                if ($current_function->{abi} eq "svr4") {
@@ -186,8 +189,10 @@ my $current_function;
        if (!$masm) {
            # Solaris /usr/ccs/bin/as can't handle multiplications
            # in $self->{label}
+           use integer;
            $self->{label} =~ s/(?<![0-9a-f])(0[x0-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;
 
            if (defined($self->{index})) {
                sprintf "%s(%%%s,%%%s,%d)",
@@ -356,7 +361,9 @@ my $current_function;
                                    $v="$current_segment\tENDS\n" if ($current_segment);
                                    $current_segment = "_$1\$";
                                    $current_segment =~ tr/[a-z]/[A-Z]/;
-                                   $v.="$current_segment\tSEGMENT ALIGN(64) 'CODE'";
+                                   $v.="$current_segment\tSEGMENT ";
+                                   $v.=$masm>=$masmref ? "ALIGN(64)" : "PAGE";
+                                   $v.=" 'CODE'";
                                    $self->{value} = $v;
                                    last;
                                  };
@@ -385,11 +392,15 @@ my $current_function;
                            && do { my @arr = split(',',$line);
                                    my $sz  = substr($1,0,1);
                                    my $last = pop(@arr);
+                                   my $conv = sub  {   my $var=shift;
+                                                       if ($var=~s/0x([0-9a-f]+)/0$1h/i) { $var; }
+                                                       else { sprintf"0%Xh",$var; }
+                                                   };  
 
                                    $sz =~ tr/bvlq/BWDQ/;
                                    $self->{value} = "\tD$sz\t";
-                                   for (@arr) { $self->{value} .= sprintf"0%Xh,",oct; }
-                                   $self->{value} .= sprintf"0%Xh",oct($last);
+                                   for (@arr) { $self->{value} .= &$conv($_).","; }
+                                   $self->{value} .= &$conv($last);
                                    last;
                                  };
                /\.picmeup/ && do { $self->{value} = sprintf"\tDD\t 0%Xh,090000000h",$opcode{$line};