Commit 8c6364e1 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 98c2e937

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/camellia/asm/cmll-x86_64.pl

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,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;



sub hi() { my $r=shift; $r =~ s/%[er]([a-d])x/%\1h/;    $r; }

sub lo() { my $r=shift; $r =~ s/%[er]([a-d])x/%\1l/;

crypto/md5/asm/md5-x86_64.pl

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; my $dir=$1; my $xlate; 
die "can't locate x86_64-xlate.pl";



no warnings qw(uninitialized);

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

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

*STDOUT=*OUT;



$code .= <<EOF;

.text

crypto/rc4/asm/rc4-x86_64.pl

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,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;



$dat="%rdi";	    # arg1

$len="%rsi";	    # arg2

crypto/sha/asm/sha1-x86_64.pl

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,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;



$ctx="%rdi";	# 1st arg

$inp="%rsi";	# 2nd arg