Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to openssl 101t for v0.12 #6553

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 40 additions & 3 deletions deps/openssl/asm/x64-elf-gas/bn/x86_64-mont.s
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,21 @@ bn_mul_mont:

movq %r11,8(%rsp,%r9,8)
.Lmul_body:






subq %rsp,%r11
andq $-4096,%r11
.Lmul_page_walk:
movq (%rsp,%r11,1),%r10
subq $4096,%r11
.byte 0x66,0x2e

jnc .Lmul_page_walk

movq %rdx,%r12
movq (%r8),%r8
movq (%r12),%rbx
Expand Down Expand Up @@ -228,6 +243,15 @@ bn_mul4x_mont:

movq %r11,8(%rsp,%r9,8)
.Lmul4x_body:
subq %rsp,%r11
andq $-4096,%r11
.Lmul4x_page_walk:
movq (%rsp,%r11,1),%r10
subq $4096,%r11
.byte 0x2e

jnc .Lmul4x_page_walk

movq %rdi,16(%rsp,%r9,8)
movq %rdx,%r12
movq (%r8),%r8
Expand Down Expand Up @@ -610,6 +634,7 @@ bn_mul4x_mont:
.align 16
bn_sqr4x_mont:
.Lsqr4x_enter:
movq %rsp,%rax
pushq %rbx
pushq %rbp
pushq %r12
Expand All @@ -618,13 +643,25 @@ bn_sqr4x_mont:
pushq %r15

shll $3,%r9d
xorq %r10,%r10
movq %rsp,%r11
subq %r9,%r10
negq %r9
movq (%r8),%r8
leaq -72(%rsp,%r10,2),%rsp
leaq -72(%rsp,%r9,2),%rsp
andq $-1024,%rsp

subq %rsp,%r11
andq $-4096,%r11
.Lsqr4x_page_walk:
movq (%rsp,%r11,1),%r10
subq $4096,%r11
.byte 0x2e

jnc .Lsqr4x_page_walk

movq %r9,%r10
negq %r9
leaq -48(%rax),%r11




Expand Down
24 changes: 24 additions & 0 deletions deps/openssl/asm/x64-elf-gas/bn/x86_64-mont5.s
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,21 @@ bn_mul_mont_gather5:

movq %rax,8(%rsp,%r9,8)
.Lmul_body:






subq %rsp,%rax
andq $-4096,%rax
.Lmul_page_walk:
movq (%rsp,%rax,1),%r11
subq $4096,%rax
.byte 0x2e

jnc .Lmul_page_walk

leaq 128(%rdx),%r12
movdqa 0(%r10),%xmm0
movdqa 16(%r10),%xmm1
Expand Down Expand Up @@ -420,6 +435,15 @@ bn_mul4x_mont_gather5:

movq %rax,8(%rsp,%r9,8)
.Lmul4x_body:
subq %rsp,%rax
andq $-4096,%rax
.Lmul4x_page_walk:
movq (%rsp,%rax,1),%r11
subq $4096,%rax
.byte 0x2e

jnc .Lmul4x_page_walk

movq %rdi,16(%rsp,%r9,8)
leaq 128(%rdx),%r12
movdqa 0(%r10),%xmm0
Expand Down
43 changes: 40 additions & 3 deletions deps/openssl/asm/x64-macosx-gas/bn/x86_64-mont.s
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,21 @@ L$mul_enter:

movq %r11,8(%rsp,%r9,8)
L$mul_body:






subq %rsp,%r11
andq $-4096,%r11
L$mul_page_walk:
movq (%rsp,%r11,1),%r10
subq $4096,%r11
.byte 0x66,0x2e

jnc L$mul_page_walk

movq %rdx,%r12
movq (%r8),%r8
movq (%r12),%rbx
Expand Down Expand Up @@ -228,6 +243,15 @@ L$mul4x_enter:

movq %r11,8(%rsp,%r9,8)
L$mul4x_body:
subq %rsp,%r11
andq $-4096,%r11
L$mul4x_page_walk:
movq (%rsp,%r11,1),%r10
subq $4096,%r11
.byte 0x2e

jnc L$mul4x_page_walk

movq %rdi,16(%rsp,%r9,8)
movq %rdx,%r12
movq (%r8),%r8
Expand Down Expand Up @@ -610,6 +634,7 @@ L$mul4x_epilogue:
.p2align 4
bn_sqr4x_mont:
L$sqr4x_enter:
movq %rsp,%rax
pushq %rbx
pushq %rbp
pushq %r12
Expand All @@ -618,13 +643,25 @@ L$sqr4x_enter:
pushq %r15

shll $3,%r9d
xorq %r10,%r10
movq %rsp,%r11
subq %r9,%r10
negq %r9
movq (%r8),%r8
leaq -72(%rsp,%r10,2),%rsp
leaq -72(%rsp,%r9,2),%rsp
andq $-1024,%rsp

subq %rsp,%r11
andq $-4096,%r11
L$sqr4x_page_walk:
movq (%rsp,%r11,1),%r10
subq $4096,%r11
.byte 0x2e

jnc L$sqr4x_page_walk

movq %r9,%r10
negq %r9
leaq -48(%rax),%r11




Expand Down
24 changes: 24 additions & 0 deletions deps/openssl/asm/x64-macosx-gas/bn/x86_64-mont5.s
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,21 @@ L$mul_alloca:

movq %rax,8(%rsp,%r9,8)
L$mul_body:






subq %rsp,%rax
andq $-4096,%rax
L$mul_page_walk:
movq (%rsp,%rax,1),%r11
subq $4096,%rax
.byte 0x2e

jnc L$mul_page_walk

leaq 128(%rdx),%r12
movdqa 0(%r10),%xmm0
movdqa 16(%r10),%xmm1
Expand Down Expand Up @@ -420,6 +435,15 @@ L$mul4x_alloca:

movq %rax,8(%rsp,%r9,8)
L$mul4x_body:
subq %rsp,%rax
andq $-4096,%rax
L$mul4x_page_walk:
movq (%rsp,%rax,1),%r11
subq $4096,%rax
.byte 0x2e

jnc L$mul4x_page_walk

movq %rdi,16(%rsp,%r9,8)
leaq 128(%rdx),%r12
movdqa 0(%r10),%xmm0
Expand Down
43 changes: 40 additions & 3 deletions deps/openssl/asm/x64-win32-masm/bn/x86_64-mont.asm
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,21 @@ $L$mul_enter::

mov QWORD PTR[8+r9*8+rsp],r11
$L$mul_body::






sub r11,rsp
and r11,-4096
$L$mul_page_walk::
mov r10,QWORD PTR[r11*1+rsp]
sub r11,4096
DB 066h,02eh

jnc $L$mul_page_walk

mov r12,rdx
mov r8,QWORD PTR[r8]
mov rbx,QWORD PTR[r12]
Expand Down Expand Up @@ -255,6 +270,15 @@ $L$mul4x_enter::

mov QWORD PTR[8+r9*8+rsp],r11
$L$mul4x_body::
sub r11,rsp
and r11,-4096
$L$mul4x_page_walk::
mov r10,QWORD PTR[r11*1+rsp]
sub r11,4096
DB 02eh

jnc $L$mul4x_page_walk

mov QWORD PTR[16+r9*8+rsp],rdi
mov r12,rdx
mov r8,QWORD PTR[r8]
Expand Down Expand Up @@ -652,6 +676,7 @@ $L$SEH_begin_bn_sqr4x_mont::


$L$sqr4x_enter::
mov rax,rsp
push rbx
push rbp
push r12
Expand All @@ -660,13 +685,25 @@ $L$sqr4x_enter::
push r15

shl r9d,3
xor r10,r10
mov r11,rsp
sub r10,r9
neg r9
mov r8,QWORD PTR[r8]
lea rsp,QWORD PTR[((-72))+r10*2+rsp]
lea rsp,QWORD PTR[((-72))+r9*2+rsp]
and rsp,-1024

sub r11,rsp
and r11,-4096
$L$sqr4x_page_walk::
mov r10,QWORD PTR[r11*1+rsp]
sub r11,4096
DB 02eh

jnc $L$sqr4x_page_walk

mov r10,r9
neg r9
lea r11,QWORD PTR[((-48))+rax]




Expand Down
24 changes: 24 additions & 0 deletions deps/openssl/asm/x64-win32-masm/bn/x86_64-mont5.asm
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,21 @@ $L$mul_alloca::

mov QWORD PTR[8+r9*8+rsp],rax
$L$mul_body::






sub rax,rsp
and rax,-4096
$L$mul_page_walk::
mov r11,QWORD PTR[rax*1+rsp]
sub rax,4096
DB 02eh

jnc $L$mul_page_walk

lea r12,QWORD PTR[128+rdx]
movdqa xmm0,XMMWORD PTR[r10]
movdqa xmm1,XMMWORD PTR[16+r10]
Expand Down Expand Up @@ -447,6 +462,15 @@ $L$mul4x_alloca::

mov QWORD PTR[8+r9*8+rsp],rax
$L$mul4x_body::
sub rax,rsp
and rax,-4096
$L$mul4x_page_walk::
mov r11,QWORD PTR[rax*1+rsp]
sub rax,4096
DB 02eh

jnc $L$mul4x_page_walk

mov QWORD PTR[16+r9*8+rsp],rdi
lea r12,QWORD PTR[128+rdx]
movdqa xmm0,XMMWORD PTR[r10]
Expand Down
Loading