From eafebfdd3adba0417a72d6cc8a75f367fc2fbbdb Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Fri, 11 Sep 2015 12:17:57 +0000
Subject: Fixup inter-bank movq/movd operations, emit bytes for pclmulqdq
 again.

Fixes builds gcc + Apple's assembler, working on reenabling builds with older
OpenBSD releases.

based on OpenSSL commit:
 https://git.openssl.org/?p=openssl.git;a=commitdiff;h=902b30df193afc3417a96ba72a81ed390bd50de3

ok miod@
---
 src/lib/libcrypto/perlasm/x86_64-xlate.pl | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/perlasm')

diff --git a/src/lib/libcrypto/perlasm/x86_64-xlate.pl b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
index ed1f3ed6ab..82992f41e5 100755
--- a/src/lib/libcrypto/perlasm/x86_64-xlate.pl
+++ b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
@@ -121,7 +121,7 @@ my %globals;
 		$self->{sz} = "";
 	    } elsif ($self->{op} =~ /^v/) { # VEX
 		$self->{sz} = "";
-	    } elsif ($self->{op} =~ /movq/ && $line =~ /%xmm/) {
+	    } elsif ($self->{op} =~ /mov[dq]/ && $line =~ /%xmm/) {
 		$self->{sz} = "";
 	    } elsif ($self->{op} =~ /([a-z]{3,})([qlwb])$/) {
 		$self->{op} = $1;
@@ -698,6 +698,20 @@ my $pinsrd = sub {
     }
 };
 
+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
-- 
cgit v1.2.3-55-g6feb