Skip to content

Commit a67a04d

Browse files
shigekishigeki
committed
deps: update openssl asm and asm_obsolete files
Regenerate asm files with Makefile and CC=gcc and ASM=gcc where gcc-5.4.0. Also asm files in asm_obsolete dir to support old compiler and assembler are regenerated without CC and ASM envs PR-URL: #11021 Reviewed-By: Ben Noordhuis <[email protected]>
1 parent 2a74481 commit a67a04d

File tree

9 files changed

+27
-39
lines changed

9 files changed

+27
-39
lines changed

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -995,18 +995,17 @@ bn_mulx4x_mont:
995995
mulxq 16(%rsi),%r15,%r13
996996
adoxq -24(%rbx),%r11
997997
adcxq %r15,%r12
998-
adoxq %rbp,%r12
998+
adoxq -16(%rbx),%r12
999999
adcxq %rbp,%r13
1000+
adoxq %rbp,%r13
10001001

10011002
movq %rdi,8(%rsp)
1002-
.byte 0x67
10031003
movq %r8,%r15
10041004
imulq 24(%rsp),%r8
10051005
xorl %ebp,%ebp
10061006

10071007
mulxq 24(%rsi),%rax,%r14
10081008
movq %r8,%rdx
1009-
adoxq -16(%rbx),%r12
10101009
adcxq %rax,%r13
10111010
adoxq -8(%rbx),%r13
10121011
adcxq %rbp,%r14

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

+5-7
Original file line numberDiff line numberDiff line change
@@ -1889,6 +1889,7 @@ __bn_sqr8x_reduction:
18891889

18901890
.align 32
18911891
.L8x_tail_done:
1892+
xorq %rax,%rax
18921893
addq (%rdx),%r8
18931894
adcq $0,%r9
18941895
adcq $0,%r10
@@ -1897,9 +1898,7 @@ __bn_sqr8x_reduction:
18971898
adcq $0,%r13
18981899
adcq $0,%r14
18991900
adcq $0,%r15
1900-
1901-
1902-
xorq %rax,%rax
1901+
adcq $0,%rax
19031902

19041903
negq %rsi
19051904
.L8x_no_tail:
@@ -3344,6 +3343,7 @@ __bn_sqrx8x_reduction:
33443343

33453344
.align 32
33463345
.Lsqrx8x_tail_done:
3346+
xorq %rax,%rax
33473347
addq 24+8(%rsp),%r8
33483348
adcq $0,%r9
33493349
adcq $0,%r10
@@ -3352,9 +3352,7 @@ __bn_sqrx8x_reduction:
33523352
adcq $0,%r13
33533353
adcq $0,%r14
33543354
adcq $0,%r15
3355-
3356-
3357-
movq %rsi,%rax
3355+
adcq $0,%rax
33583356

33593357
subq 16+8(%rsp),%rsi
33603358
.Lsqrx8x_no_tail:
@@ -3369,7 +3367,7 @@ __bn_sqrx8x_reduction:
33693367
adcq 40(%rdi),%r13
33703368
adcq 48(%rdi),%r14
33713369
adcq 56(%rdi),%r15
3372-
adcq %rax,%rax
3370+
adcq $0,%rax
33733371

33743372
movq 32+8(%rsp),%rbx
33753373
movq 64(%rdi,%rcx,1),%rdx

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -995,18 +995,17 @@ L$mulx4x_outer:
995995
mulxq 16(%rsi),%r15,%r13
996996
adoxq -24(%rbx),%r11
997997
adcxq %r15,%r12
998-
adoxq %rbp,%r12
998+
adoxq -16(%rbx),%r12
999999
adcxq %rbp,%r13
1000+
adoxq %rbp,%r13
10001001

10011002
movq %rdi,8(%rsp)
1002-
.byte 0x67
10031003
movq %r8,%r15
10041004
imulq 24(%rsp),%r8
10051005
xorl %ebp,%ebp
10061006

10071007
mulxq 24(%rsi),%rax,%r14
10081008
movq %r8,%rdx
1009-
adoxq -16(%rbx),%r12
10101009
adcxq %rax,%r13
10111010
adoxq -8(%rbx),%r13
10121011
adcxq %rbp,%r14

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

+5-7
Original file line numberDiff line numberDiff line change
@@ -1889,6 +1889,7 @@ L$8x_tail:
18891889

18901890
.p2align 5
18911891
L$8x_tail_done:
1892+
xorq %rax,%rax
18921893
addq (%rdx),%r8
18931894
adcq $0,%r9
18941895
adcq $0,%r10
@@ -1897,9 +1898,7 @@ L$8x_tail_done:
18971898
adcq $0,%r13
18981899
adcq $0,%r14
18991900
adcq $0,%r15
1900-
1901-
1902-
xorq %rax,%rax
1901+
adcq $0,%rax
19031902

19041903
negq %rsi
19051904
L$8x_no_tail:
@@ -3344,6 +3343,7 @@ L$sqrx8x_tail:
33443343

33453344
.p2align 5
33463345
L$sqrx8x_tail_done:
3346+
xorq %rax,%rax
33473347
addq 24+8(%rsp),%r8
33483348
adcq $0,%r9
33493349
adcq $0,%r10
@@ -3352,9 +3352,7 @@ L$sqrx8x_tail_done:
33523352
adcq $0,%r13
33533353
adcq $0,%r14
33543354
adcq $0,%r15
3355-
3356-
3357-
movq %rsi,%rax
3355+
adcq $0,%rax
33583356

33593357
subq 16+8(%rsp),%rsi
33603358
L$sqrx8x_no_tail:
@@ -3369,7 +3367,7 @@ L$sqrx8x_no_tail:
33693367
adcq 40(%rdi),%r13
33703368
adcq 48(%rdi),%r14
33713369
adcq 56(%rdi),%r15
3372-
adcq %rax,%rax
3370+
adcq $0,%rax
33733371

33743372
movq 32+8(%rsp),%rbx
33753373
movq 64(%rdi,%rcx,1),%rdx

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1053,18 +1053,17 @@ $L$mulx4x_outer::
10531053
mulx r13,r15,QWORD PTR[16+rsi]
10541054
adox r11,QWORD PTR[((-24))+rbx]
10551055
adcx r12,r15
1056-
adox r12,rbp
1056+
adox r12,QWORD PTR[((-16))+rbx]
10571057
adcx r13,rbp
1058+
adox r13,rbp
10581059

10591060
mov QWORD PTR[8+rsp],rdi
1060-
DB 067h
10611061
mov r15,r8
10621062
imul r8,QWORD PTR[24+rsp]
10631063
xor ebp,ebp
10641064

10651065
mulx r14,rax,QWORD PTR[24+rsi]
10661066
mov rdx,r8
1067-
adox r12,QWORD PTR[((-16))+rbx]
10681067
adcx r13,rax
10691068
adox r13,QWORD PTR[((-8))+rbx]
10701069
adcx r14,rbp

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

+5-7
Original file line numberDiff line numberDiff line change
@@ -1935,6 +1935,7 @@ $L$8x_tail::
19351935

19361936
ALIGN 32
19371937
$L$8x_tail_done::
1938+
xor rax,rax
19381939
add r8,QWORD PTR[rdx]
19391940
adc r9,0
19401941
adc r10,0
@@ -1943,9 +1944,7 @@ $L$8x_tail_done::
19431944
adc r13,0
19441945
adc r14,0
19451946
adc r15,0
1946-
1947-
1948-
xor rax,rax
1947+
adc rax,0
19491948

19501949
neg rsi
19511950
$L$8x_no_tail::
@@ -3435,6 +3434,7 @@ DB 0c4h,062h,0fbh,0f6h,0a5h,020h,000h,000h,000h
34353434

34363435
ALIGN 32
34373436
$L$sqrx8x_tail_done::
3437+
xor rax,rax
34383438
add r8,QWORD PTR[((24+8))+rsp]
34393439
adc r9,0
34403440
adc r10,0
@@ -3443,9 +3443,7 @@ $L$sqrx8x_tail_done::
34433443
adc r13,0
34443444
adc r14,0
34453445
adc r15,0
3446-
3447-
3448-
mov rax,rsi
3446+
adc rax,0
34493447

34503448
sub rsi,QWORD PTR[((16+8))+rsp]
34513449
$L$sqrx8x_no_tail::
@@ -3460,7 +3458,7 @@ DB 102,72,15,126,213
34603458
adc r13,QWORD PTR[40+rdi]
34613459
adc r14,QWORD PTR[48+rdi]
34623460
adc r15,QWORD PTR[56+rdi]
3463-
adc rax,rax
3461+
adc rax,0
34643462

34653463
mov rbx,QWORD PTR[((32+8))+rsp]
34663464
mov rdx,QWORD PTR[64+rcx*1+rdi]

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1881,6 +1881,7 @@ __bn_sqr8x_reduction:
18811881

18821882
.align 32
18831883
.L8x_tail_done:
1884+
xorq %rax,%rax
18841885
addq (%rdx),%r8
18851886
adcq $0,%r9
18861887
adcq $0,%r10
@@ -1889,9 +1890,7 @@ __bn_sqr8x_reduction:
18891890
adcq $0,%r13
18901891
adcq $0,%r14
18911892
adcq $0,%r15
1892-
1893-
1894-
xorq %rax,%rax
1893+
adcq $0,%rax
18951894

18961895
negq %rsi
18971896
.L8x_no_tail:

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1881,6 +1881,7 @@ L$8x_tail:
18811881

18821882
.p2align 5
18831883
L$8x_tail_done:
1884+
xorq %rax,%rax
18841885
addq (%rdx),%r8
18851886
adcq $0,%r9
18861887
adcq $0,%r10
@@ -1889,9 +1890,7 @@ L$8x_tail_done:
18891890
adcq $0,%r13
18901891
adcq $0,%r14
18911892
adcq $0,%r15
1892-
1893-
1894-
xorq %rax,%rax
1893+
adcq $0,%rax
18951894

18961895
negq %rsi
18971896
L$8x_no_tail:

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1927,6 +1927,7 @@ $L$8x_tail::
19271927

19281928
ALIGN 32
19291929
$L$8x_tail_done::
1930+
xor rax,rax
19301931
add r8,QWORD PTR[rdx]
19311932
adc r9,0
19321933
adc r10,0
@@ -1935,9 +1936,7 @@ $L$8x_tail_done::
19351936
adc r13,0
19361937
adc r14,0
19371938
adc r15,0
1938-
1939-
1940-
xor rax,rax
1939+
adc rax,0
19411940

19421941
neg rsi
19431942
$L$8x_no_tail::

0 commit comments

Comments
 (0)