Commit 371feee8 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

x86_64 assembly pack: improve masm support. 

(cherry picked from commit 1b0fe79f)
parent f50f0c6a

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

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && 


if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&

	   `ml64 2>&1` =~ /Version ([0-9]+)\./) {

	$avx = ($1>=10) + ($1>=11);

	$avx = ($1>=10) + ($1>=12);

}



if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {

crypto/bn/asm/rsaz-x86_64.pl

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ if (!$addx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && 


if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&

	    `ml64 2>&1` =~ /Version ([0-9]+)\./) {

	$addx = ($1>=11);

	$addx = ($1>=12);

}



if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {

crypto/bn/asm/x86_64-mont.pl

+4 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ if (!$addx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && 


if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&

	    `ml64 2>&1` =~ /Version ([0-9]+)\./) {

	$addx = ($1>=11);

	$addx = ($1>=12);

}



# int bn_mul_mont(
@@ -742,9 +742,11 @@ my @A0=("%r10","%r11"); 
my @A1=("%r12","%r13");

my ($a0,$a1,$ai)=("%r14","%r15","%rbx");



$code.=<<___	if ($addx);

.extern	bn_sqrx8x_internal		# see x86_64-mont5 module

___

$code.=<<___;

.extern	bn_sqr8x_internal		# see x86_64-mont5 module

.extern	bn_sqrx8x_internal		# see x86_64-mont5 module



.type	bn_sqr8x_mont,\@function,6

.align	32

crypto/bn/asm/x86_64-mont5.pl

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ if (!$addx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && 


if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&

	    `ml64 2>&1` =~ /Version ([0-9]+)\./) {

	$addx = ($1>=11);

	$addx = ($1>=12);

}



# int bn_mul_mont_gather5(

crypto/modes/asm/aesni-gcm-x86_64.pl

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ _aesni_ctr32_ghash_6x: 


.align	32

.Loop6x:

	add		\$6<<24,$counter

	add		\$`6<<24`,$counter

	jc		.Lhandle_ctr32		# discard $inout[1-5]?

	vmovdqu		0x00-0x20($Xip),$Hkey	# $Hkey^1

	  vpaddb	$T2,$inout5,$T1		# next counter value
@@ -520,7 +520,7 @@ _aesni_ctr32_6x: 
	vmovups		0x10-0x80($key),$rndkey

	lea		0x20-0x80($key),%r12

	vpxor		$Z0,$T1,$inout0

	add		\$6<<24,$counter

	add		\$`6<<24`,$counter

	jc		.Lhandle_ctr32_2

	vpaddb		$T2,$T1,$inout1

	vpaddb		$T2,$inout1,$inout2