Skip to content

Commit c0954f4

Browse files
shigekievanlucas
shigeki
authored and
evanlucas
committedDec 7, 2017
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. PR-URL: #17526 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
1 parent dfd7cd3 commit c0954f4

File tree

9 files changed

+32
-29
lines changed

9 files changed

+32
-29
lines changed
 

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ AES_encrypt:
164164
#if __ARM_ARCH__<7
165165
sub r3,pc,#8 @ AES_encrypt
166166
#else
167-
adr r3,AES_encrypt
167+
adr r3,.
168168
#endif
169169
stmdb sp!,{r1,r4-r12,lr}
170170
mov r12,r0 @ inp
@@ -410,7 +410,7 @@ _armv4_AES_set_encrypt_key:
410410
#if __ARM_ARCH__<7
411411
sub r3,pc,#8 @ AES_set_encrypt_key
412412
#else
413-
adr r3,private_AES_set_encrypt_key
413+
adr r3,.
414414
#endif
415415
teq r0,#0
416416
#if __ARM_ARCH__>=7
@@ -927,7 +927,7 @@ AES_decrypt:
927927
#if __ARM_ARCH__<7
928928
sub r3,pc,#8 @ AES_decrypt
929929
#else
930-
adr r3,AES_decrypt
930+
adr r3,.
931931
#endif
932932
stmdb sp!,{r1,r4-r12,lr}
933933
mov r12,r0 @ inp

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
.type _bsaes_decrypt8,%function
8282
.align 4
8383
_bsaes_decrypt8:
84-
adr r6,_bsaes_decrypt8
84+
adr r6,.
8585
vldmia r4!, {q9} @ round 0 key
8686
add r6,r6,#.LM0ISR-_bsaes_decrypt8
8787

@@ -567,7 +567,7 @@ _bsaes_const:
567567
.type _bsaes_encrypt8,%function
568568
.align 4
569569
_bsaes_encrypt8:
570-
adr r6,_bsaes_encrypt8
570+
adr r6,.
571571
vldmia r4!, {q9} @ round 0 key
572572
sub r6,r6,#_bsaes_encrypt8-.LM0SR
573573

@@ -998,7 +998,7 @@ _bsaes_encrypt8_bitslice:
998998
.type _bsaes_key_convert,%function
999999
.align 4
10001000
_bsaes_key_convert:
1001-
adr r6,_bsaes_key_convert
1001+
adr r6,.
10021002
vld1.8 {q7}, [r4]! @ load round 0 key
10031003
sub r6,r6,#_bsaes_key_convert-.LM0
10041004
vld1.8 {q15}, [r4]! @ load round 1 key

‎deps/openssl/asm/arm-void-gas/sha/sha256-armv4.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ sha256_block_data_order:
8888
#if __ARM_ARCH__<7
8989
sub r3,pc,#8 @ sha256_block_data_order
9090
#else
91-
adr r3,sha256_block_data_order
91+
adr r3,.
9292
#endif
9393
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
9494
ldr r12,.LOPENSSL_armcap

‎deps/openssl/asm/x64-elf-gas/bn/rsaz-avx2.s

+6-5
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ rsaz_1024_sqr_avx2:
6666
vmovdqu 256-128(%rsi),%ymm8
6767

6868
leaq 192(%rsp),%rbx
69-
vpbroadcastq .Land_mask(%rip),%ymm15
69+
vmovdqu .Land_mask(%rip),%ymm15
7070
jmp .LOOP_GRANDE_SQR_1024
7171

7272
.align 32
@@ -799,10 +799,10 @@ rsaz_1024_mul_avx2:
799799
vpmuludq 192-128(%rcx),%ymm11,%ymm12
800800
vpaddq %ymm12,%ymm6,%ymm6
801801
vpmuludq 224-128(%rcx),%ymm11,%ymm13
802-
vpblendd $3,%ymm14,%ymm9,%ymm9
802+
vpblendd $3,%ymm14,%ymm9,%ymm12
803803
vpaddq %ymm13,%ymm7,%ymm7
804804
vpmuludq 256-128(%rcx),%ymm11,%ymm0
805-
vpaddq %ymm9,%ymm3,%ymm3
805+
vpaddq %ymm12,%ymm3,%ymm3
806806
vpaddq %ymm0,%ymm8,%ymm8
807807

808808
movq %rbx,%rax
@@ -815,7 +815,9 @@ rsaz_1024_mul_avx2:
815815
vmovdqu -8+64-128(%rsi),%ymm13
816816

817817
movq %r10,%rax
818+
vpblendd $0xfc,%ymm14,%ymm9,%ymm9
818819
imull %r8d,%eax
820+
vpaddq %ymm9,%ymm4,%ymm4
819821
andl $0x1fffffff,%eax
820822

821823
imulq 16-128(%rsi),%rbx
@@ -1044,7 +1046,6 @@ rsaz_1024_mul_avx2:
10441046

10451047
decl %r14d
10461048
jnz .Loop_mul_1024
1047-
vpermq $0,%ymm15,%ymm15
10481049
vpaddq (%rsp),%ymm12,%ymm0
10491050

10501051
vpsrlq $29,%ymm0,%ymm12
@@ -1684,7 +1685,7 @@ rsaz_avx2_eligible:
16841685

16851686
.align 64
16861687
.Land_mask:
1687-
.quad 0x1fffffff,0x1fffffff,0x1fffffff,-1
1688+
.quad 0x1fffffff,0x1fffffff,0x1fffffff,0x1fffffff
16881689
.Lscatter_permd:
16891690
.long 0,2,4,6,7,7,7,7
16901691
.Lgather_permd:

‎deps/openssl/asm/x64-macosx-gas/bn/rsaz-avx2.s

+6-5
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ L$sqr_1024_no_n_copy:
6666
vmovdqu 256-128(%rsi),%ymm8
6767

6868
leaq 192(%rsp),%rbx
69-
vpbroadcastq L$and_mask(%rip),%ymm15
69+
vmovdqu L$and_mask(%rip),%ymm15
7070
jmp L$OOP_GRANDE_SQR_1024
7171

7272
.p2align 5
@@ -799,10 +799,10 @@ L$oop_mul_1024:
799799
vpmuludq 192-128(%rcx),%ymm11,%ymm12
800800
vpaddq %ymm12,%ymm6,%ymm6
801801
vpmuludq 224-128(%rcx),%ymm11,%ymm13
802-
vpblendd $3,%ymm14,%ymm9,%ymm9
802+
vpblendd $3,%ymm14,%ymm9,%ymm12
803803
vpaddq %ymm13,%ymm7,%ymm7
804804
vpmuludq 256-128(%rcx),%ymm11,%ymm0
805-
vpaddq %ymm9,%ymm3,%ymm3
805+
vpaddq %ymm12,%ymm3,%ymm3
806806
vpaddq %ymm0,%ymm8,%ymm8
807807

808808
movq %rbx,%rax
@@ -815,7 +815,9 @@ L$oop_mul_1024:
815815
vmovdqu -8+64-128(%rsi),%ymm13
816816

817817
movq %r10,%rax
818+
vpblendd $0xfc,%ymm14,%ymm9,%ymm9
818819
imull %r8d,%eax
820+
vpaddq %ymm9,%ymm4,%ymm4
819821
andl $0x1fffffff,%eax
820822

821823
imulq 16-128(%rsi),%rbx
@@ -1044,7 +1046,6 @@ L$oop_mul_1024:
10441046

10451047
decl %r14d
10461048
jnz L$oop_mul_1024
1047-
vpermq $0,%ymm15,%ymm15
10481049
vpaddq (%rsp),%ymm12,%ymm0
10491050

10501051
vpsrlq $29,%ymm0,%ymm12
@@ -1684,7 +1685,7 @@ _rsaz_avx2_eligible:
16841685

16851686
.p2align 6
16861687
L$and_mask:
1687-
.quad 0x1fffffff,0x1fffffff,0x1fffffff,-1
1688+
.quad 0x1fffffff,0x1fffffff,0x1fffffff,0x1fffffff
16881689
L$scatter_permd:
16891690
.long 0,2,4,6,7,7,7,7
16901691
L$gather_permd:

‎deps/openssl/asm/x64-win32-masm/bn/rsaz-avx2.asm

+6-5
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ $L$sqr_1024_no_n_copy::
9090
vmovdqu ymm8,YMMWORD PTR[((256-128))+rsi]
9191

9292
lea rbx,QWORD PTR[192+rsp]
93-
vpbroadcastq ymm15,QWORD PTR[$L$and_mask]
93+
vmovdqu ymm15,YMMWORD PTR[$L$and_mask]
9494
jmp $L$OOP_GRANDE_SQR_1024
9595

9696
ALIGN 32
@@ -860,10 +860,10 @@ $L$oop_mul_1024::
860860
vpmuludq ymm12,ymm11,YMMWORD PTR[((192-128))+rcx]
861861
vpaddq ymm6,ymm6,ymm12
862862
vpmuludq ymm13,ymm11,YMMWORD PTR[((224-128))+rcx]
863-
vpblendd ymm9,ymm9,ymm14,3
863+
vpblendd ymm12,ymm9,ymm14,3
864864
vpaddq ymm7,ymm7,ymm13
865865
vpmuludq ymm0,ymm11,YMMWORD PTR[((256-128))+rcx]
866-
vpaddq ymm3,ymm3,ymm9
866+
vpaddq ymm3,ymm3,ymm12
867867
vpaddq ymm8,ymm8,ymm0
868868

869869
mov rax,rbx
@@ -876,7 +876,9 @@ $L$oop_mul_1024::
876876
vmovdqu ymm13,YMMWORD PTR[((-8+64-128))+rsi]
877877

878878
mov rax,r10
879+
vpblendd ymm9,ymm9,ymm14,0fch
879880
imul eax,r8d
881+
vpaddq ymm4,ymm4,ymm9
880882
and eax,01fffffffh
881883

882884
imul rbx,QWORD PTR[((16-128))+rsi]
@@ -1105,7 +1107,6 @@ $L$oop_mul_1024::
11051107

11061108
dec r14d
11071109
jnz $L$oop_mul_1024
1108-
vpermq ymm15,ymm15,0
11091110
vpaddq ymm0,ymm12,YMMWORD PTR[rsp]
11101111

11111112
vpsrlq ymm12,ymm0,29
@@ -1783,7 +1784,7 @@ rsaz_avx2_eligible ENDP
17831784

17841785
ALIGN 64
17851786
$L$and_mask::
1786-
DQ 01fffffffh,01fffffffh,01fffffffh,-1
1787+
DQ 01fffffffh,01fffffffh,01fffffffh,01fffffffh
17871788
$L$scatter_permd::
17881789
DD 0,2,4,6,7,7,7,7
17891790
$L$gather_permd::

‎deps/openssl/asm_obsolete/arm-void-gas/aes/aes-armv4.S

+3-3
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ AES_encrypt:
164164
#if __ARM_ARCH__<7
165165
sub r3,pc,#8 @ AES_encrypt
166166
#else
167-
adr r3,AES_encrypt
167+
adr r3,.
168168
#endif
169169
stmdb sp!,{r1,r4-r12,lr}
170170
mov r12,r0 @ inp
@@ -410,7 +410,7 @@ _armv4_AES_set_encrypt_key:
410410
#if __ARM_ARCH__<7
411411
sub r3,pc,#8 @ AES_set_encrypt_key
412412
#else
413-
adr r3,private_AES_set_encrypt_key
413+
adr r3,.
414414
#endif
415415
teq r0,#0
416416
#if __ARM_ARCH__>=7
@@ -927,7 +927,7 @@ AES_decrypt:
927927
#if __ARM_ARCH__<7
928928
sub r3,pc,#8 @ AES_decrypt
929929
#else
930-
adr r3,AES_decrypt
930+
adr r3,.
931931
#endif
932932
stmdb sp!,{r1,r4-r12,lr}
933933
mov r12,r0 @ inp

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
.type _bsaes_decrypt8,%function
8282
.align 4
8383
_bsaes_decrypt8:
84-
adr r6,_bsaes_decrypt8
84+
adr r6,.
8585
vldmia r4!, {q9} @ round 0 key
8686
add r6,r6,#.LM0ISR-_bsaes_decrypt8
8787

@@ -567,7 +567,7 @@ _bsaes_const:
567567
.type _bsaes_encrypt8,%function
568568
.align 4
569569
_bsaes_encrypt8:
570-
adr r6,_bsaes_encrypt8
570+
adr r6,.
571571
vldmia r4!, {q9} @ round 0 key
572572
sub r6,r6,#_bsaes_encrypt8-.LM0SR
573573

@@ -998,7 +998,7 @@ _bsaes_encrypt8_bitslice:
998998
.type _bsaes_key_convert,%function
999999
.align 4
10001000
_bsaes_key_convert:
1001-
adr r6,_bsaes_key_convert
1001+
adr r6,.
10021002
vld1.8 {q7}, [r4]! @ load round 0 key
10031003
sub r6,r6,#_bsaes_key_convert-.LM0
10041004
vld1.8 {q15}, [r4]! @ load round 1 key

‎deps/openssl/asm_obsolete/arm-void-gas/sha/sha256-armv4.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ sha256_block_data_order:
8888
#if __ARM_ARCH__<7
8989
sub r3,pc,#8 @ sha256_block_data_order
9090
#else
91-
adr r3,sha256_block_data_order
91+
adr r3,.
9292
#endif
9393
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
9494
ldr r12,.LOPENSSL_armcap

0 commit comments

Comments
 (0)
Please sign in to comment.