perlasm/x86[ms|nasm] update to accomodate updated RC4 assembler module.

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

diff --git a/crypto/perlasm/x86ms.pl b/crypto/perlasm/x86ms.pl
index fbb4afb9bda48c7110318cdaedd99efc628bdb67..4f4a6fea9d5dc526a63d58df19cb76a0571e2ff4 100644 (file)
--- a/crypto/perlasm/x86ms.pl
+++ b/crypto/perlasm/x86ms.pl
@@ -51,6 +51,11 @@ sub main'DWP
        &get_mem("DWORD",@_);
        }
 
+sub main'QWP
+       {
+       &get_mem("QWORD",@_);
+       }
+
 sub main'BC
        {
        return @_;
@@ -128,6 +133,7 @@ sub main'xorb       { &out2("xor",@_); }
 sub main'add   { &out2("add",@_); }
 sub main'adc   { &out2("adc",@_); }
 sub main'sub   { &out2("sub",@_); }
+sub main'sbb   { &out2("sbb",@_); }
 sub main'rotl  { &out2("rol",@_); }
 sub main'rotr  { &out2("ror",@_); }
 sub main'exch  { &out2("xchg",@_); }
@@ -155,11 +161,36 @@ sub main'jne      { &out1("jne",@_); }
 sub main'jno   { &out1("jno",@_); }
 sub main'push  { &out1("push",@_); $stack+=4; }
 sub main'pop   { &out1("pop",@_); $stack-=4; }
+sub main'pushf { &out0("pushfd"); $stack+=4; }
+sub main'popf  { &out0("popfd"); $stack-=4; }
 sub main'bswap { &out1("bswap",@_); &using486(); }
 sub main'not   { &out1("not",@_); }
 sub main'call  { &out1("call",($_[0]=~/^\$L/?'':'_').$_[0]); }
 sub main'ret   { &out0("ret"); }
 sub main'nop   { &out0("nop"); }
+sub main'test  { &out2("test",@_); }
+sub main'bt    { &out2("bt",@_); }
+sub main'leave { &out0("leave"); }
+sub main'cpuid  { &out0("DW\t0A20Fh"); }
+sub main'rdtsc  { &out0("DW\t0310Fh"); }
+sub main'halt  { &out0("hlt"); }
+sub main'movz  { &out2("movzx",@_); }
+
+# SSE2
+sub main'emms  { &out0("emms"); }
+sub main'movd  { &out2("movd",@_); }
+sub main'movq  { &out2("movq",@_); }
+sub main'movdqu        { &out2("movdqu",@_); }
+sub main'movdqa        { &out2("movdqa",@_); }
+sub main'movdq2q{ &out2("movdq2q",@_); }
+sub main'movq2dq{ &out2("movq2dq",@_); }
+sub main'paddq { &out2("paddq",@_); }
+sub main'pmuludq{ &out2("pmuludq",@_); }
+sub main'psrlq { &out2("psrlq",@_); }
+sub main'psllq { &out2("psllq",@_); }
+sub main'pxor  { &out2("pxor",@_); }
+sub main'por   { &out2("por",@_); }
+sub main'pand  { &out2("pand",@_); }
 
 sub out2
        {
@@ -225,7 +256,7 @@ sub main'function_begin
        push(@labels,$func);
 
        local($tmp)=<<"EOF";
-_TEXT  SEGMENT
+_TEXT\$        SEGMENT PARA
 PUBLIC _$func
 $extra
 _$func PROC NEAR
@@ -243,7 +274,7 @@ sub main'function_begin_B
        local($func,$extra)=@_;
 
        local($tmp)=<<"EOF";
-_TEXT  SEGMENT
+_TEXT\$        SEGMENT PARA
 PUBLIC _$func
 $extra
 _$func PROC NEAR
@@ -263,7 +294,7 @@ sub main'function_end
        pop     ebp
        ret
 _$func ENDP
-_TEXT  ENDS
+_TEXT\$        ENDS
 EOF
        push(@out,$tmp);
        $stack=0;
@@ -276,7 +307,7 @@ sub main'function_end_B
 
        local($tmp)=<<"EOF";
 _$func ENDP
-_TEXT  ENDS
+_TEXT\$        ENDS
 EOF
        push(@out,$tmp);
        $stack=0;
@@ -299,6 +330,13 @@ EOF
 
 sub main'file_end
        {
+       # try to detect if SSE2 or MMX extensions were used...
+       if (grep {/xmm[0-7]\s*,/i} @out) {
+               grep {s/\.[3-7]86/\.686\n\t\.XMM/} @out;
+               }
+       elsif (grep {/mm[0-7]\s*,/i} @out) {
+               grep {s/\.[3-7]86/\.686\n\t\.MMX/} @out;
+               }
        push(@out,"END\n");
        }
 
@@ -359,7 +397,12 @@ sub main'set_label
 
 sub main'data_word
        {
-       push(@out,"\tDD\t$_[0]\n");
+       push(@out,"\tDD\t".join(',',@_)."\n");
+       }
+
+sub main'align
+       {
+       push(@out,"\tALIGN\t$_[0]\n");
        }
 
 sub out1p
@@ -377,3 +420,18 @@ sub main'picmeup
        }
 
 sub main'blindpop { &out1("pop",@_); }
+
+sub main'initseg 
+       {
+       local($f)=@_;
+       local($tmp)=<<___;
+OPTION DOTNAME
+.CRT\$XIU      SEGMENT DWORD PUBLIC 'DATA'
+EXTRN  _$f:NEAR
+DD     _$f
+.CRT\$XIU      ENDS
+___
+       push(@out,$tmp);
+       }
+
+1;