Skip to content

Commit f21705d

Browse files
author
Shigeki Ohtsu
committed
deps: update openssl asm files
Regenerate asm files with Makefile without CC and ASM envs. Fixes: #6458 PR-URL: #6553 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent f5a961a commit f21705d

File tree

9 files changed

+294
-87
lines changed

9 files changed

+294
-87
lines changed

deps/openssl/asm/x64-elf-gas/bn/x86_64-mont.s

+40-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,21 @@ bn_mul_mont:
3131

3232
movq %r11,8(%rsp,%r9,8)
3333
.Lmul_body:
34+
35+
36+
37+
38+
39+
40+
subq %rsp,%r11
41+
andq $-4096,%r11
42+
.Lmul_page_walk:
43+
movq (%rsp,%r11,1),%r10
44+
subq $4096,%r11
45+
.byte 0x66,0x2e
46+
47+
jnc .Lmul_page_walk
48+
3449
movq %rdx,%r12
3550
movq (%r8),%r8
3651
movq (%r12),%rbx
@@ -228,6 +243,15 @@ bn_mul4x_mont:
228243

229244
movq %r11,8(%rsp,%r9,8)
230245
.Lmul4x_body:
246+
subq %rsp,%r11
247+
andq $-4096,%r11
248+
.Lmul4x_page_walk:
249+
movq (%rsp,%r11,1),%r10
250+
subq $4096,%r11
251+
.byte 0x2e
252+
253+
jnc .Lmul4x_page_walk
254+
231255
movq %rdi,16(%rsp,%r9,8)
232256
movq %rdx,%r12
233257
movq (%r8),%r8
@@ -610,6 +634,7 @@ bn_mul4x_mont:
610634
.align 16
611635
bn_sqr4x_mont:
612636
.Lsqr4x_enter:
637+
movq %rsp,%rax
613638
pushq %rbx
614639
pushq %rbp
615640
pushq %r12
@@ -618,13 +643,25 @@ bn_sqr4x_mont:
618643
pushq %r15
619644

620645
shll $3,%r9d
621-
xorq %r10,%r10
622646
movq %rsp,%r11
623-
subq %r9,%r10
647+
negq %r9
624648
movq (%r8),%r8
625-
leaq -72(%rsp,%r10,2),%rsp
649+
leaq -72(%rsp,%r9,2),%rsp
626650
andq $-1024,%rsp
627651

652+
subq %rsp,%r11
653+
andq $-4096,%r11
654+
.Lsqr4x_page_walk:
655+
movq (%rsp,%r11,1),%r10
656+
subq $4096,%r11
657+
.byte 0x2e
658+
659+
jnc .Lsqr4x_page_walk
660+
661+
movq %r9,%r10
662+
negq %r9
663+
leaq -48(%rax),%r11
664+
628665

629666

630667

deps/openssl/asm/x64-elf-gas/bn/x86_64-mont5.s

+24
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,21 @@ bn_mul_mont_gather5:
3232

3333
movq %rax,8(%rsp,%r9,8)
3434
.Lmul_body:
35+
36+
37+
38+
39+
40+
41+
subq %rsp,%rax
42+
andq $-4096,%rax
43+
.Lmul_page_walk:
44+
movq (%rsp,%rax,1),%r11
45+
subq $4096,%rax
46+
.byte 0x2e
47+
48+
jnc .Lmul_page_walk
49+
3550
leaq 128(%rdx),%r12
3651
movdqa 0(%r10),%xmm0
3752
movdqa 16(%r10),%xmm1
@@ -420,6 +435,15 @@ bn_mul4x_mont_gather5:
420435

421436
movq %rax,8(%rsp,%r9,8)
422437
.Lmul4x_body:
438+
subq %rsp,%rax
439+
andq $-4096,%rax
440+
.Lmul4x_page_walk:
441+
movq (%rsp,%rax,1),%r11
442+
subq $4096,%rax
443+
.byte 0x2e
444+
445+
jnc .Lmul4x_page_walk
446+
423447
movq %rdi,16(%rsp,%r9,8)
424448
leaq 128(%rdx),%r12
425449
movdqa 0(%r10),%xmm0

deps/openssl/asm/x64-macosx-gas/bn/x86_64-mont.s

+40-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,21 @@ L$mul_enter:
3131

3232
movq %r11,8(%rsp,%r9,8)
3333
L$mul_body:
34+
35+
36+
37+
38+
39+
40+
subq %rsp,%r11
41+
andq $-4096,%r11
42+
L$mul_page_walk:
43+
movq (%rsp,%r11,1),%r10
44+
subq $4096,%r11
45+
.byte 0x66,0x2e
46+
47+
jnc L$mul_page_walk
48+
3449
movq %rdx,%r12
3550
movq (%r8),%r8
3651
movq (%r12),%rbx
@@ -228,6 +243,15 @@ L$mul4x_enter:
228243

229244
movq %r11,8(%rsp,%r9,8)
230245
L$mul4x_body:
246+
subq %rsp,%r11
247+
andq $-4096,%r11
248+
L$mul4x_page_walk:
249+
movq (%rsp,%r11,1),%r10
250+
subq $4096,%r11
251+
.byte 0x2e
252+
253+
jnc L$mul4x_page_walk
254+
231255
movq %rdi,16(%rsp,%r9,8)
232256
movq %rdx,%r12
233257
movq (%r8),%r8
@@ -610,6 +634,7 @@ L$mul4x_epilogue:
610634
.p2align 4
611635
bn_sqr4x_mont:
612636
L$sqr4x_enter:
637+
movq %rsp,%rax
613638
pushq %rbx
614639
pushq %rbp
615640
pushq %r12
@@ -618,13 +643,25 @@ L$sqr4x_enter:
618643
pushq %r15
619644

620645
shll $3,%r9d
621-
xorq %r10,%r10
622646
movq %rsp,%r11
623-
subq %r9,%r10
647+
negq %r9
624648
movq (%r8),%r8
625-
leaq -72(%rsp,%r10,2),%rsp
649+
leaq -72(%rsp,%r9,2),%rsp
626650
andq $-1024,%rsp
627651

652+
subq %rsp,%r11
653+
andq $-4096,%r11
654+
L$sqr4x_page_walk:
655+
movq (%rsp,%r11,1),%r10
656+
subq $4096,%r11
657+
.byte 0x2e
658+
659+
jnc L$sqr4x_page_walk
660+
661+
movq %r9,%r10
662+
negq %r9
663+
leaq -48(%rax),%r11
664+
628665

629666

630667

deps/openssl/asm/x64-macosx-gas/bn/x86_64-mont5.s

+24
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,21 @@ L$mul_alloca:
3232

3333
movq %rax,8(%rsp,%r9,8)
3434
L$mul_body:
35+
36+
37+
38+
39+
40+
41+
subq %rsp,%rax
42+
andq $-4096,%rax
43+
L$mul_page_walk:
44+
movq (%rsp,%rax,1),%r11
45+
subq $4096,%rax
46+
.byte 0x2e
47+
48+
jnc L$mul_page_walk
49+
3550
leaq 128(%rdx),%r12
3651
movdqa 0(%r10),%xmm0
3752
movdqa 16(%r10),%xmm1
@@ -420,6 +435,15 @@ L$mul4x_alloca:
420435

421436
movq %rax,8(%rsp,%r9,8)
422437
L$mul4x_body:
438+
subq %rsp,%rax
439+
andq $-4096,%rax
440+
L$mul4x_page_walk:
441+
movq (%rsp,%rax,1),%r11
442+
subq $4096,%rax
443+
.byte 0x2e
444+
445+
jnc L$mul4x_page_walk
446+
423447
movq %rdi,16(%rsp,%r9,8)
424448
leaq 128(%rdx),%r12
425449
movdqa 0(%r10),%xmm0

deps/openssl/asm/x64-win32-masm/bn/x86_64-mont.asm

+40-3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,21 @@ $L$mul_enter::
4343

4444
mov QWORD PTR[8+r9*8+rsp],r11
4545
$L$mul_body::
46+
47+
48+
49+
50+
51+
52+
sub r11,rsp
53+
and r11,-4096
54+
$L$mul_page_walk::
55+
mov r10,QWORD PTR[r11*1+rsp]
56+
sub r11,4096
57+
DB 066h,02eh
58+
59+
jnc $L$mul_page_walk
60+
4661
mov r12,rdx
4762
mov r8,QWORD PTR[r8]
4863
mov rbx,QWORD PTR[r12]
@@ -255,6 +270,15 @@ $L$mul4x_enter::
255270

256271
mov QWORD PTR[8+r9*8+rsp],r11
257272
$L$mul4x_body::
273+
sub r11,rsp
274+
and r11,-4096
275+
$L$mul4x_page_walk::
276+
mov r10,QWORD PTR[r11*1+rsp]
277+
sub r11,4096
278+
DB 02eh
279+
280+
jnc $L$mul4x_page_walk
281+
258282
mov QWORD PTR[16+r9*8+rsp],rdi
259283
mov r12,rdx
260284
mov r8,QWORD PTR[r8]
@@ -652,6 +676,7 @@ $L$SEH_begin_bn_sqr4x_mont::
652676

653677

654678
$L$sqr4x_enter::
679+
mov rax,rsp
655680
push rbx
656681
push rbp
657682
push r12
@@ -660,13 +685,25 @@ $L$sqr4x_enter::
660685
push r15
661686

662687
shl r9d,3
663-
xor r10,r10
664688
mov r11,rsp
665-
sub r10,r9
689+
neg r9
666690
mov r8,QWORD PTR[r8]
667-
lea rsp,QWORD PTR[((-72))+r10*2+rsp]
691+
lea rsp,QWORD PTR[((-72))+r9*2+rsp]
668692
and rsp,-1024
669693

694+
sub r11,rsp
695+
and r11,-4096
696+
$L$sqr4x_page_walk::
697+
mov r10,QWORD PTR[r11*1+rsp]
698+
sub r11,4096
699+
DB 02eh
700+
701+
jnc $L$sqr4x_page_walk
702+
703+
mov r10,r9
704+
neg r9
705+
lea r11,QWORD PTR[((-48))+rax]
706+
670707

671708

672709

deps/openssl/asm/x64-win32-masm/bn/x86_64-mont5.asm

+24
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,21 @@ $L$mul_alloca::
4444

4545
mov QWORD PTR[8+r9*8+rsp],rax
4646
$L$mul_body::
47+
48+
49+
50+
51+
52+
53+
sub rax,rsp
54+
and rax,-4096
55+
$L$mul_page_walk::
56+
mov r11,QWORD PTR[rax*1+rsp]
57+
sub rax,4096
58+
DB 02eh
59+
60+
jnc $L$mul_page_walk
61+
4762
lea r12,QWORD PTR[128+rdx]
4863
movdqa xmm0,XMMWORD PTR[r10]
4964
movdqa xmm1,XMMWORD PTR[16+r10]
@@ -447,6 +462,15 @@ $L$mul4x_alloca::
447462

448463
mov QWORD PTR[8+r9*8+rsp],rax
449464
$L$mul4x_body::
465+
sub rax,rsp
466+
and rax,-4096
467+
$L$mul4x_page_walk::
468+
mov r11,QWORD PTR[rax*1+rsp]
469+
sub rax,4096
470+
DB 02eh
471+
472+
jnc $L$mul4x_page_walk
473+
450474
mov QWORD PTR[16+r9*8+rsp],rdi
451475
lea r12,QWORD PTR[128+rdx]
452476
movdqa xmm0,XMMWORD PTR[r10]

0 commit comments

Comments
 (0)