Skip to content

Commit 84a838e

Browse files
danbevMylesBorins
danbev
authored and
MylesBorins
committed
deps: update openssl asm and asm_obsolete files
Regenerate asm files with Makefile and CC=gcc and ASM=nasm where gcc version was 5.4.0 and nasm version was 2.11.08. Also asm files in asm_obsolete dir to support old compiler and assembler are regenerated without CC and ASM envs. Fixes: #13161 Backport-PR-URL: #13696 PR-URL: #13233 Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
1 parent df2ee21 commit 84a838e

File tree

23 files changed

+191
-182
lines changed

23 files changed

+191
-182
lines changed

‎deps/openssl/asm/arm-void-gas/aes/bsaes-armv7.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,7 @@ bsaes_cbc_encrypt:
12981298
vmov q4,q15 @ just in case ensure that IV
12991299
vmov q5,q0 @ and input are preserved
13001300
bl AES_decrypt
1301-
vld1.8 {q0}, [r9,:64] @ load result
1301+
vld1.8 {q0}, [r9] @ load result
13021302
veor q0, q0, q4 @ ^= IV
13031303
vmov q15, q5 @ q5 holds input
13041304
vst1.8 {q0}, [r10] @ write output

‎deps/openssl/asm/x64-elf-gas/aes/aesni-sha1-x86_64.s

+1
Original file line numberDiff line numberDiff line change
@@ -2692,6 +2692,7 @@ aesni_cbc_sha1_enc_shaext:
26922692
movl 240(%rcx),%r11d
26932693
subq %rdi,%rsi
26942694
movups (%rcx),%xmm15
2695+
movups (%r8),%xmm2
26952696
movups 16(%rcx),%xmm0
26962697
leaq 112(%rcx),%rcx
26972698

‎deps/openssl/asm/x64-elf-gas/aes/aesni-sha256-x86_64.s

+1
Original file line numberDiff line numberDiff line change
@@ -4012,6 +4012,7 @@ aesni_cbc_sha256_enc_shaext:
40124012
movl 240(%rcx),%r11d
40134013
subq %rdi,%rsi
40144014
movups (%rcx),%xmm15
4015+
movups (%r8),%xmm6
40154016
movups 16(%rcx),%xmm4
40164017
leaq 112(%rcx),%rcx
40174018

‎deps/openssl/asm/x64-elf-gas/x86_64cpuid.s

+9-8
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,6 @@ OPENSSL_ia32_cpuid:
107107
shrl $14,%r10d
108108
andl $0xfff,%r10d
109109

110-
cmpl $7,%r11d
111-
jb .Lnocacheinfo
112-
113-
movl $7,%eax
114-
xorl %ecx,%ecx
115-
cpuid
116-
movl %ebx,8(%rdi)
117-
118110
.Lnocacheinfo:
119111
movl $1,%eax
120112
cpuid
@@ -144,6 +136,15 @@ OPENSSL_ia32_cpuid:
144136
orl %ecx,%r9d
145137

146138
movl %edx,%r10d
139+
140+
cmpl $7,%r11d
141+
jb .Lno_extended_info
142+
movl $7,%eax
143+
xorl %ecx,%ecx
144+
cpuid
145+
movl %ebx,8(%rdi)
146+
.Lno_extended_info:
147+
147148
btl $27,%r9d
148149
jnc .Lclear_avx
149150
xorl %ecx,%ecx

‎deps/openssl/asm/x64-macosx-gas/aes/aesni-sha1-x86_64.s

+1
Original file line numberDiff line numberDiff line change
@@ -2692,6 +2692,7 @@ aesni_cbc_sha1_enc_shaext:
26922692
movl 240(%rcx),%r11d
26932693
subq %rdi,%rsi
26942694
movups (%rcx),%xmm15
2695+
movups (%r8),%xmm2
26952696
movups 16(%rcx),%xmm0
26962697
leaq 112(%rcx),%rcx
26972698

‎deps/openssl/asm/x64-macosx-gas/aes/aesni-sha256-x86_64.s

+1
Original file line numberDiff line numberDiff line change
@@ -4012,6 +4012,7 @@ aesni_cbc_sha256_enc_shaext:
40124012
movl 240(%rcx),%r11d
40134013
subq %rdi,%rsi
40144014
movups (%rcx),%xmm15
4015+
movups (%r8),%xmm6
40154016
movups 16(%rcx),%xmm4
40164017
leaq 112(%rcx),%rcx
40174018

‎deps/openssl/asm/x64-macosx-gas/x86_64cpuid.s

+9-8
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@ L$intel:
108108
shrl $14,%r10d
109109
andl $0xfff,%r10d
110110

111-
cmpl $7,%r11d
112-
jb L$nocacheinfo
113-
114-
movl $7,%eax
115-
xorl %ecx,%ecx
116-
cpuid
117-
movl %ebx,8(%rdi)
118-
119111
L$nocacheinfo:
120112
movl $1,%eax
121113
cpuid
@@ -145,6 +137,15 @@ L$generic:
145137
orl %ecx,%r9d
146138

147139
movl %edx,%r10d
140+
141+
cmpl $7,%r11d
142+
jb L$no_extended_info
143+
movl $7,%eax
144+
xorl %ecx,%ecx
145+
cpuid
146+
movl %ebx,8(%rdi)
147+
L$no_extended_info:
148+
148149
btl $27,%r9d
149150
jnc L$clear_avx
150151
xorl %ecx,%ecx

‎deps/openssl/asm/x64-win32-masm/aes/aesni-sha1-x86_64.asm

+1
Original file line numberDiff line numberDiff line change
@@ -2793,6 +2793,7 @@ $L$prologue_shaext::
27932793
mov r11d,DWORD PTR[240+rcx]
27942794
sub rsi,rdi
27952795
movups xmm15,XMMWORD PTR[rcx]
2796+
movups xmm2,XMMWORD PTR[r8]
27962797
movups xmm0,XMMWORD PTR[16+rcx]
27972798
lea rcx,QWORD PTR[112+rcx]
27982799

‎deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm

+1
Original file line numberDiff line numberDiff line change
@@ -4146,6 +4146,7 @@ $L$prologue_shaext::
41464146
mov r11d,DWORD PTR[240+rcx]
41474147
sub rsi,rdi
41484148
movups xmm15,XMMWORD PTR[rcx]
4149+
movups xmm6,XMMWORD PTR[r8]
41494150
movups xmm4,XMMWORD PTR[16+rcx]
41504151
lea rcx,QWORD PTR[112+rcx]
41514152

‎deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm

+9-8
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,6 @@ $L$intel::
118118
shr r10d,14
119119
and r10d,0fffh
120120

121-
cmp r11d,7
122-
jb $L$nocacheinfo
123-
124-
mov eax,7
125-
xor ecx,ecx
126-
cpuid
127-
mov DWORD PTR[8+rdi],ebx
128-
129121
$L$nocacheinfo::
130122
mov eax,1
131123
cpuid
@@ -155,6 +147,15 @@ $L$generic::
155147
or r9d,ecx
156148

157149
mov r10d,edx
150+
151+
cmp r11d,7
152+
jb $L$no_extended_info
153+
mov eax,7
154+
xor ecx,ecx
155+
cpuid
156+
mov DWORD PTR[8+rdi],ebx
157+
$L$no_extended_info::
158+
158159
bt r9d,27
159160
jnc $L$clear_avx
160161
xor ecx,ecx

‎deps/openssl/asm/x86-elf-gas/x86cpuid.s

+21-22
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ OPENSSL_ia32_cpuid:
2020
popl %eax
2121
xorl %eax,%ecx
2222
xorl %eax,%eax
23-
btl $21,%ecx
24-
jnc .L000nocpuid
2523
movl 20(%esp),%esi
2624
movl %eax,8(%esi)
25+
btl $21,%ecx
26+
jnc .L000nocpuid
2727
.byte 0x0f,0xa2
2828
movl %eax,%edi
2929
xorl %eax,%eax
@@ -74,40 +74,32 @@ OPENSSL_ia32_cpuid:
7474
andl $4026531839,%edx
7575
jmp .L002generic
7676
.L001intel:
77-
cmpl $7,%edi
78-
jb .L003cacheinfo
79-
movl 20(%esp),%esi
80-
movl $7,%eax
81-
xorl %ecx,%ecx
82-
.byte 0x0f,0xa2
83-
movl %ebx,8(%esi)
84-
.L003cacheinfo:
8577
cmpl $4,%edi
86-
movl $-1,%edi
87-
jb .L004nocacheinfo
78+
movl $-1,%esi
79+
jb .L003nocacheinfo
8880
movl $4,%eax
8981
movl $0,%ecx
9082
.byte 0x0f,0xa2
91-
movl %eax,%edi
92-
shrl $14,%edi
93-
andl $4095,%edi
94-
.L004nocacheinfo:
83+
movl %eax,%esi
84+
shrl $14,%esi
85+
andl $4095,%esi
86+
.L003nocacheinfo:
9587
movl $1,%eax
9688
xorl %ecx,%ecx
9789
.byte 0x0f,0xa2
9890
andl $3220176895,%edx
9991
cmpl $0,%ebp
100-
jne .L005notintel
92+
jne .L004notintel
10193
orl $1073741824,%edx
10294
andb $15,%ah
10395
cmpb $15,%ah
104-
jne .L005notintel
96+
jne .L004notintel
10597
orl $1048576,%edx
106-
.L005notintel:
98+
.L004notintel:
10799
btl $28,%edx
108100
jnc .L002generic
109101
andl $4026531839,%edx
110-
cmpl $0,%edi
102+
cmpl $0,%esi
111103
je .L002generic
112104
orl $268435456,%edx
113105
shrl $16,%ebx
@@ -119,7 +111,15 @@ OPENSSL_ia32_cpuid:
119111
andl $4294965247,%ecx
120112
movl %edx,%esi
121113
orl %ecx,%ebp
122-
btl $27,%ecx
114+
cmpl $7,%edi
115+
movl 20(%esp),%edi
116+
jb .L005no_extended_info
117+
movl $7,%eax
118+
xorl %ecx,%ecx
119+
.byte 0x0f,0xa2
120+
movl %ebx,8(%edi)
121+
.L005no_extended_info:
122+
btl $27,%ebp
123123
jnc .L006clear_avx
124124
xorl %ecx,%ecx
125125
.byte 15,1,208
@@ -133,7 +133,6 @@ OPENSSL_ia32_cpuid:
133133
andl $4278190079,%esi
134134
.L006clear_avx:
135135
andl $4026525695,%ebp
136-
movl 20(%esp),%edi
137136
andl $4294967263,8(%edi)
138137
.L007done:
139138
movl %esi,%eax

‎deps/openssl/asm/x86-macosx-gas/x86cpuid.s

+21-22
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ L_OPENSSL_ia32_cpuid_begin:
1919
popl %eax
2020
xorl %eax,%ecx
2121
xorl %eax,%eax
22-
btl $21,%ecx
23-
jnc L000nocpuid
2422
movl 20(%esp),%esi
2523
movl %eax,8(%esi)
24+
btl $21,%ecx
25+
jnc L000nocpuid
2626
.byte 0x0f,0xa2
2727
movl %eax,%edi
2828
xorl %eax,%eax
@@ -73,40 +73,32 @@ L_OPENSSL_ia32_cpuid_begin:
7373
andl $4026531839,%edx
7474
jmp L002generic
7575
L001intel:
76-
cmpl $7,%edi
77-
jb L003cacheinfo
78-
movl 20(%esp),%esi
79-
movl $7,%eax
80-
xorl %ecx,%ecx
81-
.byte 0x0f,0xa2
82-
movl %ebx,8(%esi)
83-
L003cacheinfo:
8476
cmpl $4,%edi
85-
movl $-1,%edi
86-
jb L004nocacheinfo
77+
movl $-1,%esi
78+
jb L003nocacheinfo
8779
movl $4,%eax
8880
movl $0,%ecx
8981
.byte 0x0f,0xa2
90-
movl %eax,%edi
91-
shrl $14,%edi
92-
andl $4095,%edi
93-
L004nocacheinfo:
82+
movl %eax,%esi
83+
shrl $14,%esi
84+
andl $4095,%esi
85+
L003nocacheinfo:
9486
movl $1,%eax
9587
xorl %ecx,%ecx
9688
.byte 0x0f,0xa2
9789
andl $3220176895,%edx
9890
cmpl $0,%ebp
99-
jne L005notintel
91+
jne L004notintel
10092
orl $1073741824,%edx
10193
andb $15,%ah
10294
cmpb $15,%ah
103-
jne L005notintel
95+
jne L004notintel
10496
orl $1048576,%edx
105-
L005notintel:
97+
L004notintel:
10698
btl $28,%edx
10799
jnc L002generic
108100
andl $4026531839,%edx
109-
cmpl $0,%edi
101+
cmpl $0,%esi
110102
je L002generic
111103
orl $268435456,%edx
112104
shrl $16,%ebx
@@ -118,7 +110,15 @@ L002generic:
118110
andl $4294965247,%ecx
119111
movl %edx,%esi
120112
orl %ecx,%ebp
121-
btl $27,%ecx
113+
cmpl $7,%edi
114+
movl 20(%esp),%edi
115+
jb L005no_extended_info
116+
movl $7,%eax
117+
xorl %ecx,%ecx
118+
.byte 0x0f,0xa2
119+
movl %ebx,8(%edi)
120+
L005no_extended_info:
121+
btl $27,%ebp
122122
jnc L006clear_avx
123123
xorl %ecx,%ecx
124124
.byte 15,1,208
@@ -132,7 +132,6 @@ L008clear_xmm:
132132
andl $4278190079,%esi
133133
L006clear_avx:
134134
andl $4026525695,%ebp
135-
movl 20(%esp),%edi
136135
andl $4294967263,8(%edi)
137136
L007done:
138137
movl %esi,%eax

0 commit comments

Comments
 (0)