Remove the logic responsible for outputting most AES-NI instructions as

raw byte sequences. The toolchains have had some time to update and assemble
the instructions correctly (except for p{ins,ext}rd which are not supported
yet by as(1) under OpenBSD, but will be fixed shortly).

Inspired by a discussion between tedu@ and John-Mark Gurney.
Verified to still work on Mac OS X and average Linux distros by bcook@

6 files changed, 0 insertions, 214 deletions

diff --git a/src/lib/libcrypto/aes/asm/aesni-sha1-x86_64.pl b/src/lib/libcrypto/aes/asm/aesni-sha1-x86_64.pl
index 3c8f6c19e7..39b504cbe5 100644
--- a/src/lib/libcrypto/aes/asm/aesni-sha1-x86_64.pl
+++ b/src/lib/libcrypto/aes/asm/aesni-sha1-x86_64.pl
@@ -1226,25 +1226,7 @@ sub rex {
     push @opcode,$rex|0x40      if($rex);
 }
 
-sub aesni {
-  my $line=shift;
-  my @opcode=(0x66);
-
-    if ($line=~/(aes[a-z]+)\s+%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-        my %opcodelet = (
-                "aesenc" => 0xdc,       "aesenclast" => 0xdd
-        );
-        return undef if (!defined($opcodelet{$1}));
-        rex(\@opcode,$3,$2);
-        push @opcode,0x0f,0x38,$opcodelet{$1};
-        push @opcode,0xc0|($2&7)|(($3&7)<<3);   # ModR/M
-        return ".byte\t".join(',',@opcode);
-    }
-    return $line;
-}
-
 $code =~ s/\`([^\`]*)\`/eval($1)/gem;
-$code =~ s/\b(aes.*%xmm[0-9]+).*$/aesni($1)/gem;
 
 print $code;
 close STDOUT;
diff --git a/src/lib/libcrypto/aes/asm/aesni-x86_64.pl b/src/lib/libcrypto/aes/asm/aesni-x86_64.pl
index a53204af6c..c073667fcb 100644
--- a/src/lib/libcrypto/aes/asm/aesni-x86_64.pl
+++ b/src/lib/libcrypto/aes/asm/aesni-x86_64.pl
@@ -3034,35 +3034,7 @@ sub rex {
     push @opcode,$rex|0x40      if($rex);
 }
 
-sub aesni {
-  my $line=shift;
-  my @opcode=(0x66);
-
-    if ($line=~/(aeskeygenassist)\s+\$([x0-9a-f]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-        rex(\@opcode,$4,$3);
-        push @opcode,0x0f,0x3a,0xdf;
-        push @opcode,0xc0|($3&7)|(($4&7)<<3);   # ModR/M
-        my $c=$2;
-        push @opcode,$c=~/^0/?oct($c):$c;
-        return ".byte\t".join(',',@opcode);
-    }
-    elsif ($line=~/(aes[a-z]+)\s+%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-        my %opcodelet = (
-                "aesimc" => 0xdb,
-                "aesenc" => 0xdc,       "aesenclast" => 0xdd,
-                "aesdec" => 0xde,       "aesdeclast" => 0xdf
-        );
-        return undef if (!defined($opcodelet{$1}));
-        rex(\@opcode,$3,$2);
-        push @opcode,0x0f,0x38,$opcodelet{$1};
-        push @opcode,0xc0|($2&7)|(($3&7)<<3);   # ModR/M
-        return ".byte\t".join(',',@opcode);
-    }
-    return $line;
-}
-
 $code =~ s/\`([^\`]*)\`/eval($1)/gem;
-$code =~ s/\b(aes.*%xmm[0-9]+).*$/aesni($1)/gem;
 
 print $code;
 
diff --git a/src/lib/libcrypto/perlasm/x86_64-xlate.pl b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
index 2ad032c4ba..ed1f3ed6ab 100755
--- a/src/lib/libcrypto/perlasm/x86_64-xlate.pl
+++ b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
@@ -662,28 +662,6 @@ sub rex {
 my %regrm = (   "%eax"=>0, "%ecx"=>1, "%edx"=>2, "%ebx"=>3,
                 "%esp"=>4, "%ebp"=>5, "%esi"=>6, "%edi"=>7      );
 
-my $movq = sub {        # elderly gas can't handle inter-register movq
-  my $arg = shift;
-  my @opcode=(0x66);
-    if ($arg =~ /%xmm([0-9]+),\s*%r(\w+)/) {
-        my ($src,$dst)=($1,$2);
-        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
-        rex(\@opcode,$src,$dst,0x8);
-        push @opcode,0x0f,0x7e;
-        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
-        @opcode;
-    } elsif ($arg =~ /%r(\w+),\s*%xmm([0-9]+)/) {
-        my ($src,$dst)=($2,$1);
-        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
-        rex(\@opcode,$src,$dst,0x8);
-        push @opcode,0x0f,0x6e;
-        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
-        @opcode;
-    } else {
-        ();
-    }
-};
-
 my $pextrd = sub {
     if (shift =~ /\$([0-9]+),\s*%xmm([0-9]+),\s*(%\w+)/) {
       my @opcode=(0x66);
@@ -720,45 +698,6 @@ my $pinsrd = sub {
     }
 };
 
-my $pshufb = sub {
-    if (shift =~ /%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-      my @opcode=(0x66);
-        rex(\@opcode,$2,$1);
-        push @opcode,0x0f,0x38,0x00;
-        push @opcode,0xc0|($1&7)|(($2&7)<<3);           # ModR/M
-        @opcode;
-    } else {
-        ();
-    }
-};
-
-my $palignr = sub {
-    if (shift =~ /\$([0-9]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-      my @opcode=(0x66);
-        rex(\@opcode,$3,$2);
-        push @opcode,0x0f,0x3a,0x0f;
-        push @opcode,0xc0|($2&7)|(($3&7)<<3);           # ModR/M
-        push @opcode,$1;
-        @opcode;
-    } else {
-        ();
-    }
-};
-
-my $pclmulqdq = sub {
-    if (shift =~ /\$([x0-9a-f]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-      my @opcode=(0x66);
-        rex(\@opcode,$3,$2);
-        push @opcode,0x0f,0x3a,0x44;
-        push @opcode,0xc0|($2&7)|(($3&7)<<3);           # ModR/M
-        my $c=$1;
-        push @opcode,$c=~/^0/?oct($c):$c;
-        @opcode;
-    } else {
-        ();
-    }
-};
-
 if ($nasm) {
     print <<___;
 default rel
diff --git a/src/lib/libssl/src/crypto/aes/asm/aesni-sha1-x86_64.pl b/src/lib/libssl/src/crypto/aes/asm/aesni-sha1-x86_64.pl
index 3c8f6c19e7..39b504cbe5 100644
--- a/src/lib/libssl/src/crypto/aes/asm/aesni-sha1-x86_64.pl
+++ b/src/lib/libssl/src/crypto/aes/asm/aesni-sha1-x86_64.pl
@@ -1226,25 +1226,7 @@ sub rex {
     push @opcode,$rex|0x40      if($rex);
 }
 
-sub aesni {
-  my $line=shift;
-  my @opcode=(0x66);
-
-    if ($line=~/(aes[a-z]+)\s+%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-        my %opcodelet = (
-                "aesenc" => 0xdc,       "aesenclast" => 0xdd
-        );
-        return undef if (!defined($opcodelet{$1}));
-        rex(\@opcode,$3,$2);
-        push @opcode,0x0f,0x38,$opcodelet{$1};
-        push @opcode,0xc0|($2&7)|(($3&7)<<3);   # ModR/M
-        return ".byte\t".join(',',@opcode);
-    }
-    return $line;
-}
-
 $code =~ s/\`([^\`]*)\`/eval($1)/gem;
-$code =~ s/\b(aes.*%xmm[0-9]+).*$/aesni($1)/gem;
 
 print $code;
 close STDOUT;
diff --git a/src/lib/libssl/src/crypto/aes/asm/aesni-x86_64.pl b/src/lib/libssl/src/crypto/aes/asm/aesni-x86_64.pl
index a53204af6c..c073667fcb 100644
--- a/src/lib/libssl/src/crypto/aes/asm/aesni-x86_64.pl
+++ b/src/lib/libssl/src/crypto/aes/asm/aesni-x86_64.pl
@@ -3034,35 +3034,7 @@ sub rex {
     push @opcode,$rex|0x40      if($rex);
 }
 
-sub aesni {
-  my $line=shift;
-  my @opcode=(0x66);
-
-    if ($line=~/(aeskeygenassist)\s+\$([x0-9a-f]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-        rex(\@opcode,$4,$3);
-        push @opcode,0x0f,0x3a,0xdf;
-        push @opcode,0xc0|($3&7)|(($4&7)<<3);   # ModR/M
-        my $c=$2;
-        push @opcode,$c=~/^0/?oct($c):$c;
-        return ".byte\t".join(',',@opcode);
-    }
-    elsif ($line=~/(aes[a-z]+)\s+%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-        my %opcodelet = (
-                "aesimc" => 0xdb,
-                "aesenc" => 0xdc,       "aesenclast" => 0xdd,
-                "aesdec" => 0xde,       "aesdeclast" => 0xdf
-        );
-        return undef if (!defined($opcodelet{$1}));
-        rex(\@opcode,$3,$2);
-        push @opcode,0x0f,0x38,$opcodelet{$1};
-        push @opcode,0xc0|($2&7)|(($3&7)<<3);   # ModR/M
-        return ".byte\t".join(',',@opcode);
-    }
-    return $line;
-}
-
 $code =~ s/\`([^\`]*)\`/eval($1)/gem;
-$code =~ s/\b(aes.*%xmm[0-9]+).*$/aesni($1)/gem;
 
 print $code;
 
diff --git a/src/lib/libssl/src/crypto/perlasm/x86_64-xlate.pl b/src/lib/libssl/src/crypto/perlasm/x86_64-xlate.pl
index 2ad032c4ba..ed1f3ed6ab 100755
--- a/src/lib/libssl/src/crypto/perlasm/x86_64-xlate.pl
+++ b/src/lib/libssl/src/crypto/perlasm/x86_64-xlate.pl
@@ -662,28 +662,6 @@ sub rex {
 my %regrm = (   "%eax"=>0, "%ecx"=>1, "%edx"=>2, "%ebx"=>3,
                 "%esp"=>4, "%ebp"=>5, "%esi"=>6, "%edi"=>7      );
 
-my $movq = sub {        # elderly gas can't handle inter-register movq
-  my $arg = shift;
-  my @opcode=(0x66);
-    if ($arg =~ /%xmm([0-9]+),\s*%r(\w+)/) {
-        my ($src,$dst)=($1,$2);
-        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
-        rex(\@opcode,$src,$dst,0x8);
-        push @opcode,0x0f,0x7e;
-        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
-        @opcode;
-    } elsif ($arg =~ /%r(\w+),\s*%xmm([0-9]+)/) {
-        my ($src,$dst)=($2,$1);
-        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
-        rex(\@opcode,$src,$dst,0x8);
-        push @opcode,0x0f,0x6e;
-        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
-        @opcode;
-    } else {
-        ();
-    }
-};
-
 my $pextrd = sub {
     if (shift =~ /\$([0-9]+),\s*%xmm([0-9]+),\s*(%\w+)/) {
       my @opcode=(0x66);
@@ -720,45 +698,6 @@ my $pinsrd = sub {
     }
 };
 
-my $pshufb = sub {
-    if (shift =~ /%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-      my @opcode=(0x66);
-        rex(\@opcode,$2,$1);
-        push @opcode,0x0f,0x38,0x00;
-        push @opcode,0xc0|($1&7)|(($2&7)<<3);           # ModR/M
-        @opcode;
-    } else {
-        ();
-    }
-};
-
-my $palignr = sub {
-    if (shift =~ /\$([0-9]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-      my @opcode=(0x66);
-        rex(\@opcode,$3,$2);
-        push @opcode,0x0f,0x3a,0x0f;
-        push @opcode,0xc0|($2&7)|(($3&7)<<3);           # ModR/M
-        push @opcode,$1;
-        @opcode;
-    } else {
-        ();
-    }
-};
-
-my $pclmulqdq = sub {
-    if (shift =~ /\$([x0-9a-f]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {
-      my @opcode=(0x66);
-        rex(\@opcode,$3,$2);
-        push @opcode,0x0f,0x3a,0x44;
-        push @opcode,0xc0|($2&7)|(($3&7)<<3);           # ModR/M
-        my $c=$1;
-        push @opcode,$c=~/^0/?oct($c):$c;
-        @opcode;
-    } else {
-        ();
-    }
-};
-
 if ($nasm) {
     print <<___;
 default rel