Skip to content

Commit 49ad2d5

Browse files
douzzerdouzzer
authored
Merge pull request #8079 from SparkiDev/arm32_asm_regen
ARM32 ASM: regeneration after scripts changes
2 parents 9665434 + fb8d2fc commit 49ad2d5

9 files changed

Lines changed: 587 additions & 408 deletions

‎wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -406,9 +406,9 @@ void AES_invert_key(unsigned char* ks_p, word32 rounds_p)
406406
"str r8, [%[ks]], #4\n\t"
407407
"subs r11, r11, #1\n\t"
408408
"bne L_AES_invert_key_mix_loop_%=\n\t"
409-
: [ks] "+r" (ks), [rounds] "+r" (rounds),
410-
[L_AES_ARM32_te] "+r" (L_AES_ARM32_te_c),
411-
[L_AES_ARM32_td] "+r" (L_AES_ARM32_td_c)
409+
: [ks] "+r" (ks), [rounds] "+r" (rounds),
410+
[L_AES_ARM32_te] "+r" (L_AES_ARM32_te_c),
411+
[L_AES_ARM32_td] "+r" (L_AES_ARM32_td_c)
412412
:
413413
: "memory", "cc", "r12", "lr", "r4", "r5", "r6", "r7", "r8", "r9",
414414
"r10", "r11"
@@ -933,9 +933,9 @@ void AES_set_encrypt_key(const unsigned char* key_p, word32 len_p,
933933
"bne L_AES_set_encrypt_key_loop_128_%=\n\t"
934934
"\n"
935935
"L_AES_set_encrypt_key_end_%=: \n\t"
936-
: [key] "+r" (key), [len] "+r" (len), [ks] "+r" (ks),
937-
[L_AES_ARM32_te] "+r" (L_AES_ARM32_te_c),
938-
[L_AES_ARM32_rcon] "+r" (L_AES_ARM32_rcon_c)
936+
: [key] "+r" (key), [len] "+r" (len), [ks] "+r" (ks),
937+
[L_AES_ARM32_te] "+r" (L_AES_ARM32_te_c),
938+
[L_AES_ARM32_rcon] "+r" (L_AES_ARM32_rcon_c)
939939
:
940940
: "memory", "cc", "r12", "lr", "r5", "r6", "r7", "r8"
941941
);
@@ -1588,7 +1588,7 @@ void AES_encrypt_block(const uint32_t* te_p, int nr_p, int len_p,
15881588
"eor r5, r5, r9\n\t"
15891589
"eor r6, r6, r10\n\t"
15901590
"eor r7, r7, r11\n\t"
1591-
: [te] "+r" (te), [nr] "+r" (nr), [len] "+r" (len), [ks] "+r" (ks)
1591+
: [te] "+r" (te), [nr] "+r" (nr), [len] "+r" (len), [ks] "+r" (ks)
15921592
:
15931593
: "memory", "cc", "lr"
15941594
);
@@ -1841,8 +1841,8 @@ void AES_ECB_encrypt(const unsigned char* in_p, unsigned char* out_p,
18411841
"\n"
18421842
"L_AES_ECB_encrypt_end_%=: \n\t"
18431843
"pop {%[ks]}\n\t"
1844-
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
1845-
[nr] "+r" (nr), [L_AES_ARM32_te_ecb] "+r" (L_AES_ARM32_te_ecb_c)
1844+
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
1845+
[nr] "+r" (nr), [L_AES_ARM32_te_ecb] "+r" (L_AES_ARM32_te_ecb_c)
18461846
:
18471847
: "memory", "cc", "r12", "lr", "r6", "r7", "r8", "r9", "r10", "r11"
18481848
);
@@ -2114,9 +2114,9 @@ void AES_CBC_encrypt(const unsigned char* in_p, unsigned char* out_p,
21142114
"L_AES_CBC_encrypt_end_%=: \n\t"
21152115
"pop {%[ks], r9}\n\t"
21162116
"stm r9, {r4, r5, r6, r7}\n\t"
2117-
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
2118-
[nr] "+r" (nr), [iv] "+r" (iv),
2119-
[L_AES_ARM32_te_cbc] "+r" (L_AES_ARM32_te_cbc_c)
2117+
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
2118+
[nr] "+r" (nr), [iv] "+r" (iv),
2119+
[L_AES_ARM32_te_cbc] "+r" (L_AES_ARM32_te_cbc_c)
21202120
:
21212121
: "memory", "cc", "r12", "lr", "r7", "r8", "r9", "r10", "r11"
21222122
);
@@ -2389,9 +2389,9 @@ void AES_CTR_encrypt(const unsigned char* in_p, unsigned char* out_p,
23892389
"rev r7, r7\n\t"
23902390
#endif /* WOLFSSL_ARM_ARCH && WOLFSSL_ARM_ARCH < 6 */
23912391
"stm r8, {r4, r5, r6, r7}\n\t"
2392-
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
2393-
[nr] "+r" (nr), [ctr] "+r" (ctr),
2394-
[L_AES_ARM32_te_ctr] "+r" (L_AES_ARM32_te_ctr_c)
2392+
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
2393+
[nr] "+r" (nr), [ctr] "+r" (ctr),
2394+
[L_AES_ARM32_te_ctr] "+r" (L_AES_ARM32_te_ctr_c)
23952395
:
23962396
: "memory", "cc", "r12", "lr", "r7", "r8", "r9", "r10", "r11"
23972397
);
@@ -3045,7 +3045,7 @@ void AES_decrypt_block(const uint32_t* td_p, int nr_p, const uint8_t* td4_p)
30453045
"eor r5, r5, r9\n\t"
30463046
"eor r6, r6, r10\n\t"
30473047
"eor r7, r7, r11\n\t"
3048-
: [td] "+r" (td), [nr] "+r" (nr), [td4] "+r" (td4)
3048+
: [td] "+r" (td), [nr] "+r" (nr), [td4] "+r" (td4)
30493049
:
30503050
: "memory", "cc", "lr"
30513051
);
@@ -3331,9 +3331,9 @@ void AES_ECB_decrypt(const unsigned char* in_p, unsigned char* out_p,
33313331
"bne L_AES_ECB_decrypt_loop_block_128_%=\n\t"
33323332
"\n"
33333333
"L_AES_ECB_decrypt_end_%=: \n\t"
3334-
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
3335-
[nr] "+r" (nr), [L_AES_ARM32_td_ecb] "+r" (L_AES_ARM32_td_ecb_c),
3336-
[L_AES_ARM32_td4] "+r" (L_AES_ARM32_td4_c)
3334+
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
3335+
[nr] "+r" (nr), [L_AES_ARM32_td_ecb] "+r" (L_AES_ARM32_td_ecb_c),
3336+
[L_AES_ARM32_td4] "+r" (L_AES_ARM32_td4_c)
33373337
:
33383338
: "memory", "cc", "r12", "lr", "r7", "r8", "r9", "r10", "r11"
33393339
);
@@ -3971,10 +3971,10 @@ void AES_CBC_decrypt(const unsigned char* in_p, unsigned char* out_p,
39713971
"\n"
39723972
"L_AES_CBC_decrypt_end_%=: \n\t"
39733973
"pop {%[ks]-r4}\n\t"
3974-
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
3975-
[nr] "+r" (nr), [iv] "+r" (iv),
3976-
[L_AES_ARM32_td_ecb] "+r" (L_AES_ARM32_td_ecb_c),
3977-
[L_AES_ARM32_td4] "+r" (L_AES_ARM32_td4_c)
3974+
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
3975+
[nr] "+r" (nr), [iv] "+r" (iv),
3976+
[L_AES_ARM32_td_ecb] "+r" (L_AES_ARM32_td_ecb_c),
3977+
[L_AES_ARM32_td4] "+r" (L_AES_ARM32_td4_c)
39783978
:
39793979
: "memory", "cc", "r12", "lr", "r8", "r9", "r10", "r11"
39803980
);
@@ -4576,8 +4576,8 @@ void GCM_gmult_len(unsigned char* x_p, const unsigned char** m_p,
45764576
"subs %[len], %[len], #16\n\t"
45774577
"add %[data], %[data], #16\n\t"
45784578
"bne L_GCM_gmult_len_start_block_%=\n\t"
4579-
: [x] "+r" (x), [m] "+r" (m), [data] "+r" (data), [len] "+r" (len),
4580-
[L_GCM_gmult_len_r] "+r" (L_GCM_gmult_len_r_c)
4579+
: [x] "+r" (x), [m] "+r" (m), [data] "+r" (data), [len] "+r" (len),
4580+
[L_GCM_gmult_len_r] "+r" (L_GCM_gmult_len_r_c)
45814581
:
45824582
: "memory", "cc", "r12", "lr", "r5", "r6", "r7", "r8", "r9", "r10",
45834583
"r11"
@@ -4840,9 +4840,9 @@ void AES_GCM_encrypt(const unsigned char* in_p, unsigned char* out_p,
48404840
"rev r7, r7\n\t"
48414841
#endif /* WOLFSSL_ARM_ARCH && WOLFSSL_ARM_ARCH < 6 */
48424842
"stm r8, {r4, r5, r6, r7}\n\t"
4843-
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
4844-
[nr] "+r" (nr), [ctr] "+r" (ctr),
4845-
[L_AES_ARM32_te_gcm] "+r" (L_AES_ARM32_te_gcm_c)
4843+
: [in] "+r" (in), [out] "+r" (out), [len] "+r" (len), [ks] "+r" (ks),
4844+
[nr] "+r" (nr), [ctr] "+r" (ctr),
4845+
[L_AES_ARM32_te_gcm] "+r" (L_AES_ARM32_te_gcm_c)
48464846
:
48474847
: "memory", "cc", "r12", "lr", "r7", "r8", "r9", "r10", "r11"
48484848
);

‎wolfcrypt/src/port/arm/armv8-32-chacha-asm_c.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void wc_chacha_setiv(word32* x_p, const byte* iv_p, word32 counter_p)
7171
"rev lr, lr\n\t"
7272
#endif /* BIG_ENDIAN_ORDER */
7373
"stm r3, {r4, r12, lr}\n\t"
74-
: [x] "+r" (x), [iv] "+r" (iv), [counter] "+r" (counter)
74+
: [x] "+r" (x), [iv] "+r" (iv), [counter] "+r" (counter)
7575
:
7676
: "memory", "cc", "r3", "r12", "lr", "r4"
7777
);
@@ -119,8 +119,8 @@ void wc_chacha_setkey(word32* x_p, const byte* key_p, word32 keySz_p)
119119
"\n"
120120
"L_chacha_arm32_setkey_same_keyb_ytes_%=: \n\t"
121121
"stm %[x], {r4, r5, r12, lr}\n\t"
122-
: [x] "+r" (x), [key] "+r" (key), [keySz] "+r" (keySz),
123-
[L_chacha_arm32_constants] "+r" (L_chacha_arm32_constants_c)
122+
: [x] "+r" (x), [key] "+r" (key), [keySz] "+r" (keySz),
123+
[L_chacha_arm32_constants] "+r" (L_chacha_arm32_constants_c)
124124
:
125125
: "memory", "cc", "r12", "lr", "r4", "r5"
126126
);
@@ -484,7 +484,7 @@ void wc_chacha_crypt_bytes(ChaCha* ctx_p, byte* c_p, const byte* m_p,
484484
"\n"
485485
"L_chacha_arm32_crypt_done_%=: \n\t"
486486
"add sp, sp, #52\n\t"
487-
: [ctx] "+r" (ctx), [c] "+r" (c), [m] "+r" (m), [len] "+r" (len)
487+
: [ctx] "+r" (ctx), [c] "+r" (c), [m] "+r" (m), [len] "+r" (len)
488488
:
489489
: "memory", "cc", "r12", "lr", "r4", "r5", "r6", "r7", "r8", "r9",
490490
"r10", "r11"
@@ -557,8 +557,8 @@ void wc_chacha_use_over(byte* over_p, byte* output_p, const byte* input_p,
557557
"b L_chacha_arm32_over_byte_loop_%=\n\t"
558558
"\n"
559559
"L_chacha_arm32_over_done_%=: \n\t"
560-
: [over] "+r" (over), [output] "+r" (output), [input] "+r" (input),
561-
[len] "+r" (len)
560+
: [over] "+r" (over), [output] "+r" (output), [input] "+r" (input),
561+
[len] "+r" (len)
562562
:
563563
: "memory", "cc", "r12", "lr", "r4", "r5", "r6", "r7", "r8", "r9"
564564
);

0 commit comments

Comments
 (0)