import 0.9.7b (without idea and rc5)

1 files changed, 13 insertions, 2 deletions

diff --git a/src/lib/libcrypto/perlasm/x86nasm.pl b/src/lib/libcrypto/perlasm/x86nasm.pl
index 519d8a5867..f30b7466d4 100644
--- a/src/lib/libcrypto/perlasm/x86nasm.pl
+++ b/src/lib/libcrypto/perlasm/x86nasm.pl
@@ -98,6 +98,8 @@ sub get_mem
                 $addr="_$addr";
                 }
 
+        if ($addr =~ /^.+\-.+$/) { $addr="($addr)"; }
+
         $reg1="$regs{$reg1}" if defined($regs{$reg1});
         $reg2="$regs{$reg2}" if defined($regs{$reg2});
         if (($addr ne "") && ($addr ne 0))
@@ -117,6 +119,7 @@ sub get_mem
                 {
                 $ret.="$reg1$post]"
                 }
+        $ret =~ s/\+\]/]/; # in case $addr was the only argument
         return($ret);
         }
 
@@ -160,7 +163,7 @@ sub main'push	{ &out1("push",@_); $stack+=4; }
 sub main'pop    { &out1("pop",@_); $stack-=4; }
 sub main'bswap  { &out1("bswap",@_); &using486(); }
 sub main'not    { &out1("not",@_); }
-sub main'call   { &out1("call",'_'.$_[0]); }
+sub main'call   { &out1("call",($_[0]=~/^\$L/?'':'_').$_[0]); }
 sub main'ret    { &out0("ret"); }
 sub main'nop    { &out0("nop"); }
 
@@ -322,7 +325,7 @@ sub main'set_label
         {
         if (!defined($label{$_[0]}))
                 {
-                $label{$_[0]}="${label}${_[0]}";
+                $label{$_[0]}="\$${label}${_[0]}";
                 $label++;
                 }
         push(@out,"$label{$_[0]}:\n");
@@ -340,3 +343,11 @@ sub out1p
 
         push(@out,"\t$name\t ".&conv($p1)."\n");
         }
+
+sub main'picmeup
+        {
+        local($dst,$sym)=@_;
+        &main'lea($dst,&main'DWP($sym));
+        }
+
+sub main'blindpop { &out1("pop",@_); }