Commit b286a968 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

x86_64 assembly pack: make Windows build more robust [from master]. 

PR: 2963 and a number of others
parent 2a2df2e9

crypto/aes/asm/aes-x86_64.pl

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; 
( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or

die "can't locate x86_64-xlate.pl";



open STDOUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" $xlate $flavour $output";

*STDOUT=*OUT;



$verticalspin=1;	# unlike 32-bit version $verticalspin performs

			# ~15% better on both AMD and Intel cores

crypto/aes/asm/aesni-sha1-x86_64.pl

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ $avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && 
	   `ml64 2>&1` =~ /Version ([0-9]+)\./ &&

	   $1>=10);



open STDOUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" $xlate $flavour $output";

*STDOUT=*OUT;



# void aesni_cbc_sha1_enc(const void *inp,

#			void *out,

crypto/aes/asm/aesni-x86_64.pl

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; 
( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or

die "can't locate x86_64-xlate.pl";



open STDOUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" $xlate $flavour $output";

*STDOUT=*OUT;



$movkey = $PREFIX eq "aesni" ? "movups" : "movups";

@_4args=$win64?	("%rcx","%rdx","%r8", "%r9") :	# Win64 order

crypto/aes/asm/bsaes-x86_64.pl

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; 
( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or

die "can't locate x86_64-xlate.pl";



open STDOUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" $xlate $flavour $output";

*STDOUT=*OUT;



my ($inp,$out,$len,$key,$ivp)=("%rdi","%rsi","%rdx","%rcx");

my @XMM=map("%xmm$_",(15,0..14));	# best on Atom, +10% over (0..15)

crypto/aes/asm/vpaes-x86_64.pl

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; 
( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or

die "can't locate x86_64-xlate.pl";



open STDOUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" $xlate $flavour $output";

*STDOUT=*OUT;



$PREFIX="vpaes";