Skip to content

Commit 5c2c459

Browse files
dgarskedgarske
authored
Merge pull request #9537 from SparkiDev/aarch64_darwin_addr_calc_fix
ARM64 ASM: Darwin specific address calc fix
2 parents cf9016b + 6e94381 commit 5c2c459

7 files changed

Lines changed: 85 additions & 85 deletions

File tree

‎wolfcrypt/src/port/arm/armv8-aes-asm.S‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -43294,14 +43294,14 @@ _AES_set_encrypt_key_NEON:
4329443294
add x4, x4, :lo12:L_AES_ARM64_NEON_rcon
4329543295
#else
4329643296
adrp x4, L_AES_ARM64_NEON_rcon@PAGE
43297-
add x4, x4, :lo12:L_AES_ARM64_NEON_rcon@PAGEOFF
43297+
add x4, x4, L_AES_ARM64_NEON_rcon@PAGEOFF
4329843298
#endif /* __APPLE__ */
4329943299
#ifndef __APPLE__
4330043300
adrp x5, L_AES_ARM64_NEON_te
4330143301
add x5, x5, :lo12:L_AES_ARM64_NEON_te
4330243302
#else
4330343303
adrp x5, L_AES_ARM64_NEON_te@PAGE
43304-
add x5, x5, :lo12:L_AES_ARM64_NEON_te@PAGEOFF
43304+
add x5, x5, L_AES_ARM64_NEON_te@PAGEOFF
4330543305
#endif /* __APPLE__ */
4330643306
ld1 {v6.16b, v7.16b, v8.16b, v9.16b}, [x5], #0x40
4330743307
ld1 {v10.16b, v11.16b, v12.16b, v13.16b}, [x5], #0x40
@@ -43543,14 +43543,14 @@ _AES_ECB_encrypt_NEON:
4354343543
add x5, x5, :lo12:L_AES_ARM64_NEON_te
4354443544
#else
4354543545
adrp x5, L_AES_ARM64_NEON_te@PAGE
43546-
add x5, x5, :lo12:L_AES_ARM64_NEON_te@PAGEOFF
43546+
add x5, x5, L_AES_ARM64_NEON_te@PAGEOFF
4354743547
#endif /* __APPLE__ */
4354843548
#ifndef __APPLE__
4354943549
adrp x6, L_AES_ARM64_NEON_shift_rows_shuffle
4355043550
add x6, x6, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle
4355143551
#else
4355243552
adrp x6, L_AES_ARM64_NEON_shift_rows_shuffle@PAGE
43553-
add x6, x6, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
43553+
add x6, x6, L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
4355443554
#endif /* __APPLE__ */
4355543555
ld1 {v16.16b, v17.16b, v18.16b, v19.16b}, [x5], #0x40
4355643556
ld1 {v20.16b, v21.16b, v22.16b, v23.16b}, [x5], #0x40
@@ -44324,14 +44324,14 @@ _AES_CBC_encrypt_NEON:
4432444324
add x6, x6, :lo12:L_AES_ARM64_NEON_te
4432544325
#else
4432644326
adrp x6, L_AES_ARM64_NEON_te@PAGE
44327-
add x6, x6, :lo12:L_AES_ARM64_NEON_te@PAGEOFF
44327+
add x6, x6, L_AES_ARM64_NEON_te@PAGEOFF
4432844328
#endif /* __APPLE__ */
4432944329
#ifndef __APPLE__
4433044330
adrp x7, L_AES_ARM64_NEON_shift_rows_shuffle
4433144331
add x7, x7, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle
4433244332
#else
4433344333
adrp x7, L_AES_ARM64_NEON_shift_rows_shuffle@PAGE
44334-
add x7, x7, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
44334+
add x7, x7, L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
4433544335
#endif /* __APPLE__ */
4433644336
ld1 {v10.16b, v11.16b, v12.16b, v13.16b}, [x6], #0x40
4433744337
ld1 {v14.16b, v15.16b, v16.16b, v17.16b}, [x6], #0x40
@@ -44489,14 +44489,14 @@ _AES_CTR_encrypt_NEON:
4448944489
add x6, x6, :lo12:L_AES_ARM64_NEON_te
4449044490
#else
4449144491
adrp x6, L_AES_ARM64_NEON_te@PAGE
44492-
add x6, x6, :lo12:L_AES_ARM64_NEON_te@PAGEOFF
44492+
add x6, x6, L_AES_ARM64_NEON_te@PAGEOFF
4449344493
#endif /* __APPLE__ */
4449444494
#ifndef __APPLE__
4449544495
adrp x7, L_AES_ARM64_NEON_shift_rows_shuffle
4449644496
add x7, x7, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle
4449744497
#else
4449844498
adrp x7, L_AES_ARM64_NEON_shift_rows_shuffle@PAGE
44499-
add x7, x7, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
44499+
add x7, x7, L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
4450044500
#endif /* __APPLE__ */
4450144501
ld1 {v16.16b, v17.16b, v18.16b, v19.16b}, [x6], #0x40
4450244502
ld1 {v20.16b, v21.16b, v22.16b, v23.16b}, [x6], #0x40
@@ -45391,14 +45391,14 @@ _AES_ECB_decrypt_NEON:
4539145391
add x5, x5, :lo12:L_AES_ARM64_NEON_td
4539245392
#else
4539345393
adrp x5, L_AES_ARM64_NEON_td@PAGE
45394-
add x5, x5, :lo12:L_AES_ARM64_NEON_td@PAGEOFF
45394+
add x5, x5, L_AES_ARM64_NEON_td@PAGEOFF
4539545395
#endif /* __APPLE__ */
4539645396
#ifndef __APPLE__
4539745397
adrp x6, L_AES_ARM64_NEON_shift_rows_invshuffle
4539845398
add x6, x6, :lo12:L_AES_ARM64_NEON_shift_rows_invshuffle
4539945399
#else
4540045400
adrp x6, L_AES_ARM64_NEON_shift_rows_invshuffle@PAGE
45401-
add x6, x6, :lo12:L_AES_ARM64_NEON_shift_rows_invshuffle@PAGEOFF
45401+
add x6, x6, L_AES_ARM64_NEON_shift_rows_invshuffle@PAGEOFF
4540245402
#endif /* __APPLE__ */
4540345403
ld1 {v16.16b, v17.16b, v18.16b, v19.16b}, [x5], #0x40
4540445404
ld1 {v20.16b, v21.16b, v22.16b, v23.16b}, [x5], #0x40
@@ -46441,14 +46441,14 @@ _AES_CBC_decrypt_NEON:
4644146441
add x6, x6, :lo12:L_AES_ARM64_NEON_td
4644246442
#else
4644346443
adrp x6, L_AES_ARM64_NEON_td@PAGE
46444-
add x6, x6, :lo12:L_AES_ARM64_NEON_td@PAGEOFF
46444+
add x6, x6, L_AES_ARM64_NEON_td@PAGEOFF
4644546445
#endif /* __APPLE__ */
4644646446
#ifndef __APPLE__
4644746447
adrp x7, L_AES_ARM64_NEON_shift_rows_invshuffle
4644846448
add x7, x7, :lo12:L_AES_ARM64_NEON_shift_rows_invshuffle
4644946449
#else
4645046450
adrp x7, L_AES_ARM64_NEON_shift_rows_invshuffle@PAGE
46451-
add x7, x7, :lo12:L_AES_ARM64_NEON_shift_rows_invshuffle@PAGEOFF
46451+
add x7, x7, L_AES_ARM64_NEON_shift_rows_invshuffle@PAGEOFF
4645246452
#endif /* __APPLE__ */
4645346453
ld1 {v16.16b, v17.16b, v18.16b, v19.16b}, [x6], #0x40
4645446454
ld1 {v20.16b, v21.16b, v22.16b, v23.16b}, [x6], #0x40
@@ -47857,14 +47857,14 @@ _AES_GCM_encrypt_NEON:
4785747857
add x9, x9, :lo12:L_AES_ARM64_NEON_te
4785847858
#else
4785947859
adrp x9, L_AES_ARM64_NEON_te@PAGE
47860-
add x9, x9, :lo12:L_AES_ARM64_NEON_te@PAGEOFF
47860+
add x9, x9, L_AES_ARM64_NEON_te@PAGEOFF
4786147861
#endif /* __APPLE__ */
4786247862
#ifndef __APPLE__
4786347863
adrp x10, L_AES_ARM64_NEON_shift_rows_shuffle
4786447864
add x10, x10, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle
4786547865
#else
4786647866
adrp x10, L_AES_ARM64_NEON_shift_rows_shuffle@PAGE
47867-
add x10, x10, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
47867+
add x10, x10, L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
4786847868
#endif /* __APPLE__ */
4786947869
ld1 {v16.16b, v17.16b, v18.16b, v19.16b}, [x9], #0x40
4787047870
ld1 {v20.16b, v21.16b, v22.16b, v23.16b}, [x9], #0x40
@@ -48666,14 +48666,14 @@ _AES_XTS_encrypt_NEON:
4866648666
add x19, x19, :lo12:L_AES_ARM64_NEON_te
4866748667
#else
4866848668
adrp x19, L_AES_ARM64_NEON_te@PAGE
48669-
add x19, x19, :lo12:L_AES_ARM64_NEON_te@PAGEOFF
48669+
add x19, x19, L_AES_ARM64_NEON_te@PAGEOFF
4867048670
#endif /* __APPLE__ */
4867148671
#ifndef __APPLE__
4867248672
adrp x20, L_AES_ARM64_NEON_shift_rows_shuffle
4867348673
add x20, x20, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle
4867448674
#else
4867548675
adrp x20, L_AES_ARM64_NEON_shift_rows_shuffle@PAGE
48676-
add x20, x20, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
48676+
add x20, x20, L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
4867748677
#endif /* __APPLE__ */
4867848678
ld1 {v16.16b, v17.16b, v18.16b, v19.16b}, [x19], #0x40
4867948679
ld1 {v20.16b, v21.16b, v22.16b, v23.16b}, [x19], #0x40
@@ -49749,28 +49749,28 @@ _AES_XTS_decrypt_NEON:
4974949749
add x20, x20, :lo12:L_AES_ARM64_NEON_te
4975049750
#else
4975149751
adrp x20, L_AES_ARM64_NEON_te@PAGE
49752-
add x20, x20, :lo12:L_AES_ARM64_NEON_te@PAGEOFF
49752+
add x20, x20, L_AES_ARM64_NEON_te@PAGEOFF
4975349753
#endif /* __APPLE__ */
4975449754
#ifndef __APPLE__
4975549755
adrp x21, L_AES_ARM64_NEON_td
4975649756
add x21, x21, :lo12:L_AES_ARM64_NEON_td
4975749757
#else
4975849758
adrp x21, L_AES_ARM64_NEON_td@PAGE
49759-
add x21, x21, :lo12:L_AES_ARM64_NEON_td@PAGEOFF
49759+
add x21, x21, L_AES_ARM64_NEON_td@PAGEOFF
4976049760
#endif /* __APPLE__ */
4976149761
#ifndef __APPLE__
4976249762
adrp x22, L_AES_ARM64_NEON_shift_rows_shuffle
4976349763
add x22, x22, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle
4976449764
#else
4976549765
adrp x22, L_AES_ARM64_NEON_shift_rows_shuffle@PAGE
49766-
add x22, x22, :lo12:L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
49766+
add x22, x22, L_AES_ARM64_NEON_shift_rows_shuffle@PAGEOFF
4976749767
#endif /* __APPLE__ */
4976849768
#ifndef __APPLE__
4976949769
adrp x23, L_AES_ARM64_NEON_shift_rows_invshuffle
4977049770
add x23, x23, :lo12:L_AES_ARM64_NEON_shift_rows_invshuffle
4977149771
#else
4977249772
adrp x23, L_AES_ARM64_NEON_shift_rows_invshuffle@PAGE
49773-
add x23, x23, :lo12:L_AES_ARM64_NEON_shift_rows_invshuffle@PAGEOFF
49773+
add x23, x23, L_AES_ARM64_NEON_shift_rows_invshuffle@PAGEOFF
4977449774
#endif /* __APPLE__ */
4977549775
ld1 {v16.16b, v17.16b, v18.16b, v19.16b}, [x20], #0x40
4977649776
ld1 {v20.16b, v21.16b, v22.16b, v23.16b}, [x20], #0x40
@@ -51851,14 +51851,14 @@ _AES_invert_key:
5185151851
add x2, x2, :lo12:L_AES_ARM64_te
5185251852
#else
5185351853
adrp x2, L_AES_ARM64_te@PAGE
51854-
add x2, x2, :lo12:L_AES_ARM64_te@PAGEOFF
51854+
add x2, x2, L_AES_ARM64_te@PAGEOFF
5185551855
#endif /* __APPLE__ */
5185651856
#ifndef __APPLE__
5185751857
adrp x3, L_AES_ARM64_td
5185851858
add x3, x3, :lo12:L_AES_ARM64_td
5185951859
#else
5186051860
adrp x3, L_AES_ARM64_td@PAGE
51861-
add x3, x3, :lo12:L_AES_ARM64_td@PAGEOFF
51861+
add x3, x3, L_AES_ARM64_td@PAGEOFF
5186251862
#endif /* __APPLE__ */
5186351863
add x12, x0, x1, lsl 4
5186451864
mov w13, w1
@@ -52008,14 +52008,14 @@ _AES_set_encrypt_key:
5200852008
add x5, x5, :lo12:L_AES_ARM64_rcon
5200952009
#else
5201052010
adrp x5, L_AES_ARM64_rcon@PAGE
52011-
add x5, x5, :lo12:L_AES_ARM64_rcon@PAGEOFF
52011+
add x5, x5, L_AES_ARM64_rcon@PAGEOFF
5201252012
#endif /* __APPLE__ */
5201352013
#ifndef __APPLE__
5201452014
adrp x12, L_AES_ARM64_te
5201552015
add x12, x12, :lo12:L_AES_ARM64_te
5201652016
#else
5201752017
adrp x12, L_AES_ARM64_te@PAGE
52018-
add x12, x12, :lo12:L_AES_ARM64_te@PAGEOFF
52018+
add x12, x12, L_AES_ARM64_te@PAGEOFF
5201952019
#endif /* __APPLE__ */
5202052020
cmp x1, #0x80
5202152021
beq L_AES_set_encrypt_key_start_128
@@ -52271,7 +52271,7 @@ _AES_ECB_encrypt:
5227152271
add x5, x5, :lo12:L_AES_ARM64_te
5227252272
#else
5227352273
adrp x5, L_AES_ARM64_te@PAGE
52274-
add x5, x5, :lo12:L_AES_ARM64_te@PAGEOFF
52274+
add x5, x5, L_AES_ARM64_te@PAGEOFF
5227552275
#endif /* __APPLE__ */
5227652276
L_AES_ECB_encrypt_loop_block_128:
5227752277
mov x17, x3
@@ -52604,7 +52604,7 @@ _AES_CBC_encrypt:
5260452604
add x6, x6, :lo12:L_AES_ARM64_te
5260552605
#else
5260652606
adrp x6, L_AES_ARM64_te@PAGE
52607-
add x6, x6, :lo12:L_AES_ARM64_te@PAGEOFF
52607+
add x6, x6, L_AES_ARM64_te@PAGEOFF
5260852608
#endif /* __APPLE__ */
5260952609
ldp x7, x8, [x5]
5261052610
L_AES_CBC_encrypt_loop_block:
@@ -52941,7 +52941,7 @@ _AES_CTR_encrypt:
5294152941
add x6, x6, :lo12:L_AES_ARM64_te
5294252942
#else
5294352943
adrp x6, L_AES_ARM64_te@PAGE
52944-
add x6, x6, :lo12:L_AES_ARM64_te@PAGEOFF
52944+
add x6, x6, L_AES_ARM64_te@PAGEOFF
5294552945
#endif /* __APPLE__ */
5294652946
ldp x15, x16, [x5]
5294752947
rev32 x15, x15
@@ -53335,14 +53335,14 @@ _AES_ECB_decrypt:
5333553335
add x5, x5, :lo12:L_AES_ARM64_td
5333653336
#else
5333753337
adrp x5, L_AES_ARM64_td@PAGE
53338-
add x5, x5, :lo12:L_AES_ARM64_td@PAGEOFF
53338+
add x5, x5, L_AES_ARM64_td@PAGEOFF
5333953339
#endif /* __APPLE__ */
5334053340
#ifndef __APPLE__
5334153341
adrp x6, L_AES_ARM64_td4
5334253342
add x6, x6, :lo12:L_AES_ARM64_td4
5334353343
#else
5334453344
adrp x6, L_AES_ARM64_td4@PAGE
53345-
add x6, x6, :lo12:L_AES_ARM64_td4@PAGEOFF
53345+
add x6, x6, L_AES_ARM64_td4@PAGEOFF
5334653346
#endif /* __APPLE__ */
5334753347
L_AES_ECB_decrypt_loop_block:
5334853348
mov x19, x3
@@ -53659,14 +53659,14 @@ _AES_CBC_decrypt:
5365953659
add x6, x6, :lo12:L_AES_ARM64_td4
5366053660
#else
5366153661
adrp x6, L_AES_ARM64_td4@PAGE
53662-
add x6, x6, :lo12:L_AES_ARM64_td4@PAGEOFF
53662+
add x6, x6, L_AES_ARM64_td4@PAGEOFF
5366353663
#endif /* __APPLE__ */
5366453664
#ifndef __APPLE__
5366553665
adrp x7, L_AES_ARM64_td
5366653666
add x7, x7, :lo12:L_AES_ARM64_td
5366753667
#else
5366853668
adrp x7, L_AES_ARM64_td@PAGE
53669-
add x7, x7, :lo12:L_AES_ARM64_td@PAGEOFF
53669+
add x7, x7, L_AES_ARM64_td@PAGEOFF
5367053670
#endif /* __APPLE__ */
5367153671
L_AES_CBC_decrypt_loop_block:
5367253672
mov x20, x3
@@ -54327,7 +54327,7 @@ _GCM_gmult_len:
5432754327
add x10, x10, :lo12:L_GCM_gmult_len_r
5432854328
#else
5432954329
adrp x10, L_GCM_gmult_len_r@PAGE
54330-
add x10, x10, :lo12:L_GCM_gmult_len_r@PAGEOFF
54330+
add x10, x10, L_GCM_gmult_len_r@PAGEOFF
5433154331
#endif /* __APPLE__ */
5433254332
L_GCM_gmult_len_start_block:
5433354333
ldp x4, x5, [x0]
@@ -54754,7 +54754,7 @@ _AES_GCM_encrypt:
5475454754
add x19, x19, :lo12:L_AES_ARM64_te
5475554755
#else
5475654756
adrp x19, L_AES_ARM64_te@PAGE
54757-
add x19, x19, :lo12:L_AES_ARM64_te@PAGEOFF
54757+
add x19, x19, L_AES_ARM64_te@PAGEOFF
5475854758
#endif /* __APPLE__ */
5475954759
ldp x16, x17, [x5]
5476054760
rev32 x16, x16
@@ -55100,7 +55100,7 @@ _AES_XTS_encrypt:
5510055100
add x8, x8, :lo12:L_AES_ARM64_te
5510155101
#else
5510255102
adrp x8, L_AES_ARM64_te@PAGE
55103-
add x8, x8, :lo12:L_AES_ARM64_te@PAGEOFF
55103+
add x8, x8, L_AES_ARM64_te@PAGEOFF
5510455104
#endif /* __APPLE__ */
5510555105
mov x9, #0x87
5510655106
mov x26, x5
@@ -56056,21 +56056,21 @@ _AES_XTS_decrypt:
5605656056
add x8, x8, :lo12:L_AES_ARM64_td
5605756057
#else
5605856058
adrp x8, L_AES_ARM64_td@PAGE
56059-
add x8, x8, :lo12:L_AES_ARM64_td@PAGEOFF
56059+
add x8, x8, L_AES_ARM64_td@PAGEOFF
5606056060
#endif /* __APPLE__ */
5606156061
#ifndef __APPLE__
5606256062
adrp x9, L_AES_ARM64_td4
5606356063
add x9, x9, :lo12:L_AES_ARM64_td4
5606456064
#else
5606556065
adrp x9, L_AES_ARM64_td4@PAGE
56066-
add x9, x9, :lo12:L_AES_ARM64_td4@PAGEOFF
56066+
add x9, x9, L_AES_ARM64_td4@PAGEOFF
5606756067
#endif /* __APPLE__ */
5606856068
#ifndef __APPLE__
5606956069
adrp x10, L_AES_ARM64_te
5607056070
add x10, x10, :lo12:L_AES_ARM64_te
5607156071
#else
5607256072
adrp x10, L_AES_ARM64_te@PAGE
56073-
add x10, x10, :lo12:L_AES_ARM64_te@PAGEOFF
56073+
add x10, x10, L_AES_ARM64_te@PAGEOFF
5607456074
#endif /* __APPLE__ */
5607556075
ands w11, w2, #15
5607656076
cset w11, ne

‎wolfcrypt/src/port/arm/armv8-chacha-asm.S‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ _wc_chacha_crypt_bytes:
9595
add x5, x5, :lo12:L_chacha20_arm64_rol8
9696
#else
9797
adrp x5, L_chacha20_arm64_rol8@PAGE
98-
add x5, x5, :lo12:L_chacha20_arm64_rol8@PAGEOFF
98+
add x5, x5, L_chacha20_arm64_rol8@PAGEOFF
9999
#endif /* __APPLE__ */
100100
#ifndef __APPLE__
101101
adrp x6, L_chacha20_arm64_ctr
102102
add x6, x6, :lo12:L_chacha20_arm64_ctr
103103
#else
104104
adrp x6, L_chacha20_arm64_ctr@PAGE
105-
add x6, x6, :lo12:L_chacha20_arm64_ctr@PAGEOFF
105+
add x6, x6, L_chacha20_arm64_ctr@PAGEOFF
106106
#endif /* __APPLE__ */
107107
eor v29.16b, v29.16b, v29.16b
108108
mov x26, #5
@@ -1134,7 +1134,7 @@ _wc_chacha_setkey:
11341134
add x3, x3, :lo12:L_chacha_setkey_arm64_constant
11351135
#else
11361136
adrp x3, L_chacha_setkey_arm64_constant@PAGE
1137-
add x3, x3, :lo12:L_chacha_setkey_arm64_constant@PAGEOFF
1137+
add x3, x3, L_chacha_setkey_arm64_constant@PAGEOFF
11381138
#endif /* __APPLE__ */
11391139
subs x2, x2, #16
11401140
add x3, x3, x2

0 commit comments

Comments
 (0)