generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sha1-x86_64.pl: fix win64-specific typos and add masm support.

Browse Source
This commit is contained in:
Andy Polyakov 2011-07-01 21:23:13 +00:00
parent 94c64f9a1c
commit da5e9871e9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/sha/asm/sha1-x86_64.pl
View File

@ -75,9 +75,12 @@ die "can't locate x86_64-xlate.pl";
$avx=1 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` $avx=1 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
=~ /GNU assembler version ([2-9]\.[0-9]+)/ && =~ /GNU assembler version ([2-9]\.[0-9]+)/ &&
$1>=2.19); $1>=2.19);
$avx=1 if (!$avx && $flavour =~ /nasm/ && $avx=1 if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
`nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ && `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ &&
$1>=2.03); $1>=2.03);
$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 STDOUT,"| $^X $xlate $flavour $output";
@ -697,7 +700,7 @@ $code.=<<___ if ($win64);
movaps 64+64(%rsp),%xmm10 movaps 64+64(%rsp),%xmm10
___ ___
$code.=<<___; $code.=<<___;
lea `64+($win64?6*16:0)`(%rsp),%rsi lea `64+($win64?5*16:0)`(%rsp),%rsi
mov 0(%rsi),%r12 mov 0(%rsi),%r12
mov 8(%rsi),%rbp mov 8(%rsi),%rbp
mov 16(%rsi),%rbx mov 16(%rsi),%rbx
@ -1055,7 +1058,7 @@ $code.=<<___ if ($win64);
movaps 64+64(%rsp),%xmm10 movaps 64+64(%rsp),%xmm10
___ ___
$code.=<<___; $code.=<<___;
lea `64+($win64?6*16:0)`(%rsp),%rsi lea `64+($win64?5*16:0)`(%rsp),%rsi
mov 0(%rsi),%r12 mov 0(%rsi),%r12
mov 8(%rsi),%rbp mov 8(%rsi),%rbp
mov 16(%rsi),%rbx mov 16(%rsi),%rbx
@ -1168,12 +1171,14 @@ ssse3_handler:
lea 512($context),%rdi # &context.Xmm6 lea 512($context),%rdi # &context.Xmm6
mov \$10,%ecx mov \$10,%ecx
.long 0xa548f3fc # cld; rep movsq .long 0xa548f3fc # cld; rep movsq
lea 24+5*16(%rax),%rax # adjust stack pointer lea `24+64+5*16`(%rax),%rax # adjust stack pointer
mov -8(%rax),%rbx mov -8(%rax),%rbx
mov -16(%rax),%rbp mov -16(%rax),%rbp
mov -24(%rax),%r12
mov %rbx,144($context) # restore context->Rbx mov %rbx,144($context) # restore context->Rbx
mov %rbp,160($context) # restore context->Rbp mov %rbp,160($context) # restore context->Rbp
mov %r12,216($context) # restore cotnext->R12
.Lcommon_seh_tail: .Lcommon_seh_tail:
mov 8(%rax),%rdi mov 8(%rax),%rdi