diff options
| author | Andy Polyakov <appro@openssl.org> | 2013-07-12 18:59:17 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2013-07-12 19:01:23 +0200 |
| commit | 82ae22ef4d5227f075e03cddb05cb201a24e1a47 (patch) | |
| tree | 6e7e3cc9f307c10aa5e5d0d1a865c6d3a550b4c7 /crypto/bn | |
| parent | b56bae5126e9ced3e7d1a8fce41dcfb63b7dbe3b (diff) | |
bn/asm/rsaz-avx2.pl: Windows-specific fix.
(cherry picked from commit 5c57c69f9ebcc933161a24d77f87f17011c9977b)
Diffstat (limited to 'crypto/bn')
| -rwxr-xr-x | crypto/bn/asm/rsaz-avx2.pl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/bn/asm/rsaz-avx2.pl b/crypto/bn/asm/rsaz-avx2.pl index e629ab7c67..2d9e239912 100755 --- a/crypto/bn/asm/rsaz-avx2.pl +++ b/crypto/bn/asm/rsaz-avx2.pl @@ -70,7 +70,7 @@ if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/) { - $avx = ($1>=2.09) + ($1>=2.11); + $avx = ($1>=2.09) + ($1>=2.10); } if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && @@ -129,6 +129,8 @@ my $tp1=$r3; $np="%r13"; # reassigned argument $code.=<<___; +.text + .globl rsaz_1024_sqr_avx2 .type rsaz_1024_sqr_avx2,\@function,5 .align 64 @@ -263,7 +265,7 @@ $code.=<<___; xor $tmp, $tmp mov \$4, $i - jmp .Lentry_1024 + jmp .Lsqr_entry_1024 ___ $TEMP0=$Y1; $TEMP2=$Y2; @@ -299,7 +301,7 @@ $code.=<<___; vpmuludq 32*7-128($aap), $B1, $ACC8 vpbroadcastq 32*2-128($ap,$tmp), $B1 vpaddq $TEMP2, $ACC8, $ACC8 -.Lentry_1024: +.Lsqr_entry_1024: vmovdqu $ACC0, 32*0(%rsp,$tmp) # 32*0-192($tp0,$tmp) vmovdqu $ACC1, 32*1(%rsp,$tmp) # 32*1-192($tp0,$tmp) |