AESNI perlasm update.

diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index 131109d84950ebf74f04de9c46b76e16e62d84e1..6776bf3ccdfcaa493e3e78fcba17698427b00f84 100755 (executable)
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -662,6 +662,7 @@ while($line=<>) {
                $insn = $opcode->out($#args>=1?$args[$#args]->size():$sz);
            } else {
                $insn = $opcode->out();
+               $insn .= $sz if (map($_->out() =~ /xmm|mmx/,@args));
                @args = reverse(@args);
                undef $sz if ($nasm && $opcode->mnemonic() eq "lea");
            }

diff --git a/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl
index 28080caaa60efbc07741573ca884a394873530f7..34244c1ce0d05bb63cdee5ac22b73c35fbbc0553 100644 (file)
--- a/crypto/perlasm/x86asm.pl
+++ b/crypto/perlasm/x86asm.pl
@@ -80,6 +80,23 @@ sub ::movq
     {  &::generic("movq",@_);                  }
 }
 
+# AESNI extenstion
+sub ::aeskeygenassist
+{ my($dst,$src,$imm)=@_;
+    if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
+    {  &data_byte(0x66,0x0f,0x3a,0xdf,0xc0|($1<<3)|$2,$imm);   }
+}
+sub ::aescommon
+{ my($opcodelet,$dst,$src)=@_;
+    if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
+    {  &data_byte(0x66,0x0f,0x38,$opcodelet,0xc0|($1<<3)|$2);  }
+}
+sub ::aesimc           { ::aescommon(0xdb,@_); }
+sub ::aesenc           { ::aescommon(0xdc,@_); }
+sub ::aesenclast       { ::aescommon(0xdd,@_); }
+sub ::aesdec           { ::aescommon(0xde,@_); }
+sub ::aesdeclast       { ::aescommon(0xdf,@_); }
+
 # label management
 $lbdecor="L";          # local label decoration, set by package
 $label="000";

diff --git a/crypto/perlasm/x86masm.pl b/crypto/perlasm/x86masm.pl
index 3365114cd08f635ceebe8896d54284a8812614a6..2e2b3152c3c56405a9a1401554bbe540c8de6bc5 100644 (file)
--- a/crypto/perlasm/x86masm.pl
+++ b/crypto/perlasm/x86masm.pl
@@ -16,9 +16,11 @@ sub ::generic
     # fix hexadecimal constants
     for (@arg) { s/0x([0-9a-f]+)/0$1h/oi; }
 
-    # fix xmm references
-    $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i);
-    $arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
+    if ($opcode !~ /movq/)
+    {  # fix xmm references
+       $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i);
+       $arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
+    }
 
     &::emit($opcode,@arg);
   1;