minor modification to the previous change

[openssl.git] / crypto / perlasm / x86unix.pl

diff --git a/crypto/perlasm/x86unix.pl b/crypto/perlasm/x86unix.pl
index bc9e42e4e7eb2316580b8b11e70409e607286fd2..f89d473b7e2fd891db17e734df0a59a8355e7e83 100644 (file)
--- a/crypto/perlasm/x86unix.pl
+++ b/crypto/perlasm/x86unix.pl
@@ -3,6 +3,7 @@
 package x86unix;
 
 $label="L000";
+$const="";
 
 $align=($main'aout)?"4":"16";
 $under=($main'aout)?"_":"";
@@ -100,6 +101,16 @@ sub main'BP
        return(&main'DWP(@_));
        }
 
+sub main'BC
+       {
+       return @_;
+       }
+
+sub main'DWC
+       {
+       return @_;
+       }
+
 #sub main'BP
 #      {
 #      local($addr,$reg1,$reg2,$idx)=@_;
@@ -282,6 +293,8 @@ EOF
        push(@out,$tmp);
        if ($main'cpp)
                { $tmp=push(@out,"\tTYPE($func,\@function)\n"); }
+       elsif ($main'gaswin)
+               { $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
        else    { $tmp=push(@out,"\t.type\t$func,\@function\n"); }
        push(@out,"$func:\n");
        $tmp=<<"EOF";
@@ -310,6 +323,8 @@ EOF
        push(@out,$tmp);
        if ($main'cpp)
                { push(@out,"\tTYPE($func,\@function)\n"); }
+       elsif ($main'gaswin)
+               { $tmp=push(@out,"\t.def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
        else    { push(@out,"\t.type    $func,\@function\n"); }
        push(@out,"$func:\n");
        $stack=4;
@@ -327,11 +342,16 @@ sub main'function_end
        popl    %ebx
        popl    %ebp
        ret
+$const
 .${func}_end:
 EOF
        push(@out,$tmp);
+       $const="";
+
        if ($main'cpp)
                { push(@out,"\tSIZE($func,.${func}_end-$func)\n"); }
+       elsif ($main'gaswin)
+                { $tmp=push(@out,"\t.align 4\n"); }
        else    { push(@out,"\t.size\t$func,.${func}_end-$func\n"); }
        push(@out,".ident       \"$func\"\n");
        $stack=0;
@@ -358,10 +378,12 @@ sub main'function_end_B
 
        $func=$under.$func;
 
-       push(@out,".${func}_end:\n");
+       push(@out,".L_${func}_end:\n");
        if ($main'cpp)
-               { push(@out,"\tSIZE($func,.${func}_end-$func)\n"); }
-       else    { push(@out,"\t.size\t$func,.${func}_end-$func\n"); }
+               { push(@out,"\tSIZE($func,.L_${func}_end-$func)\n"); }
+        elsif ($main'gaswin)
+                { push(@out,"\t.align 4\n"); }
+       else    { push(@out,"\t.size\t$func,.L_${func}_end-$func\n"); }
        push(@out,".ident       \"desasm.pl\"\n");
        $stack=0;
        %label=();
@@ -441,3 +463,24 @@ sub main'data_word
        {
        push(@out,"\t.long $_[0]\n");
        }
+
+sub main'puts
+       {
+           $constl++;
+           &main'push('$Lstring' . $constl);
+           &main'call('puts');
+           &main'add("esp",4);
+
+           $const .= "Lstring$constl:\n\t.string \"@_[0]\"\n";
+       }
+
+sub main'putx
+       {
+           $constl++;
+           &main'push($_[0]);
+           &main'push('$Lstring' . $constl);
+           &main'call('printf');
+           &main'add("esp",8);
+
+           $const .= "Lstring$constl:\n\t.string \"\%X\"\n";
+       }