Skip to content

ChaCha20 ARM32/Thumb2 BE asm: remove start of support #11276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philljj merged 1 commit into from
Aug 26, 2026
+2 −58
Merged

ChaCha20 ARM32/Thumb2 BE asm: remove start of support #11276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions wolfcrypt/src/port/arm/armv8-32-chacha-asm.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ wc_chacha_setiv:
ldr r12, [r1, #4]
ldr lr, [r1, #8]
str r2, [r0, #48]
#ifdef BIG_ENDIAN_ORDER
rev r4, r4
rev r12, r12
rev lr, lr
#endif /* BIG_ENDIAN_ORDER */
stm r3, {r4, r12, lr}
pop {r4, pc}
.size wc_chacha_setiv,.-wc_chacha_setiv
Expand Down Expand Up @@ -88,12 +83,6 @@ wc_chacha_setkey:
ldr r5, [r1, #4]
ldr r12, [r1, #8]
ldr lr, [r1, #12]
#ifdef BIG_ENDIAN_ORDER
rev r4, r4
rev r5, r5
rev r12, r12
rev lr, lr
#endif /* BIG_ENDIAN_ORDER */
stm r0!, {r4, r5, r12, lr}
# Next 16 bytes of key.
beq L_chacha_arm32_setkey_same_key_bytes
Expand Down Expand Up @@ -1199,15 +1188,9 @@ wc_chacha_setkey:
# Start with constants
vldm r3, {q0}
vld1.8 {q1}, [r1]!
#ifdef BIG_ENDIAN_ORDER
vrev32.16 q1, q1
#endif /* BIG_ENDIAN_ORDER */
vstm r0!, {q0-q1}
beq L_chacha_setkey_arm32_done
vld1.8 {q1}, [r1]
#ifdef BIG_ENDIAN_ORDER
vrev32.16 q1, q1
#endif /* BIG_ENDIAN_ORDER */
L_chacha_setkey_arm32_done:
vstm r0, {q1}
bx lr
Expand Down
17 changes: 0 additions & 17 deletions wolfcrypt/src/port/arm/armv8-32-chacha-asm_c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ WC_OMIT_FRAME_POINTER void wc_chacha_setiv(word32* x, const byte* iv,
"ldr r12, [%[iv], #4]\n\t"
"ldr lr, [%[iv], #8]\n\t"
"str %[counter], [%[x], #48]\n\t"
#ifdef BIG_ENDIAN_ORDER
"rev r4, r4\n\t"
"rev r12, r12\n\t"
"rev lr, lr\n\t"
#endif /* BIG_ENDIAN_ORDER */
"stm r3, {r4, r12, lr}\n\t"
#ifndef WOLFSSL_NO_VAR_ASSIGN_REG
: [x] "+r" (x), [iv] "+r" (iv), [counter] "+r" (counter)
Expand Down Expand Up @@ -126,12 +121,6 @@ WC_OMIT_FRAME_POINTER void wc_chacha_setkey(word32* x, const byte* key,
"ldr r5, [%[key], #4]\n\t"
"ldr r12, [%[key], #8]\n\t"
"ldr lr, [%[key], #12]\n\t"
#ifdef BIG_ENDIAN_ORDER
"rev r4, r4\n\t"
"rev r5, r5\n\t"
"rev r12, r12\n\t"
"rev lr, lr\n\t"
#endif /* BIG_ENDIAN_ORDER */
"stm %[x]!, {r4, r5, r12, lr}\n\t"
/* Next 16 bytes of key. */
"beq L_chacha_arm32_setkey_same_key_bytes_%=\n\t"
Expand Down Expand Up @@ -1336,15 +1325,9 @@ WC_OMIT_FRAME_POINTER void wc_chacha_setkey(word32* x, const byte* key,
/* Start with constants */
"vldm r3, {q0}\n\t"
"vld1.8 {q1}, [%[key]]!\n\t"
#ifdef BIG_ENDIAN_ORDER
"vrev32.16 q1, q1\n\t"
#endif /* BIG_ENDIAN_ORDER */
"vstm %[x]!, {q0-q1}\n\t"
"beq L_chacha_setkey_arm32_done_%=\n\t"
"vld1.8 {q1}, [%[key]]\n\t"
#ifdef BIG_ENDIAN_ORDER
"vrev32.16 q1, q1\n\t"
#endif /* BIG_ENDIAN_ORDER */
"\n"
"L_chacha_setkey_arm32_done_%=:\n\t"
"vstm %[x], {q1}\n\t"
Expand Down
15 changes: 2 additions & 13 deletions wolfcrypt/src/port/arm/thumb2-chacha-asm.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,9 @@ wc_chacha_setiv:
LDR r5, [r1, #4]
LDR r6, [r1, #8]
STR r2, [r0, #48]
#ifdef BIG_ENDIAN_ORDER
REV r4, r4
REV r5, r5
REV r6, r6
#endif /* BIG_ENDIAN_ORDER */
STM r3, {r4, r5, r6}
POP {r4, r5, r6, pc}
/* Cycle Count = 26 */
/* Cycle Count = 23 */
.size wc_chacha_setiv,.-wc_chacha_setiv
#ifndef __APPLE__
.text
Expand Down Expand Up @@ -90,12 +85,6 @@ wc_chacha_setkey:
LDR r4, [r1, #4]
LDR r5, [r1, #8]
LDR r6, [r1, #12]
#ifdef BIG_ENDIAN_ORDER
REV r3, r3
REV r4, r4
REV r5, r5
REV r6, r6
#endif /* BIG_ENDIAN_ORDER */
STM r0!, {r3, r4, r5, r6}
/* Next 16 bytes of key. */
#if defined(__GNUC__) || defined(__ICCARM__) || defined(__IAR_SYSTEMS_ICC__)
Expand All @@ -112,7 +101,7 @@ wc_chacha_setkey:
L_chacha_thumb2_setkey_same_key_bytes:
STM r0, {r3, r4, r5, r6}
POP {r4, r5, r6, r7, pc}
/* Cycle Count = 60 */
/* Cycle Count = 56 */
.size wc_chacha_setkey,.-wc_chacha_setkey
.text
.align 4
Expand Down
11 changes: 0 additions & 11 deletions wolfcrypt/src/port/arm/thumb2-chacha-asm_c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ WC_OMIT_FRAME_POINTER void wc_chacha_setiv(word32* x, const byte* iv,
"LDR r5, [%[iv], #4]\n\t"
"LDR r6, [%[iv], #8]\n\t"
"STR %[counter], [%[x], #48]\n\t"
#ifdef BIG_ENDIAN_ORDER
"REV r4, r4\n\t"
"REV r5, r5\n\t"
"REV r6, r6\n\t"
#endif /* BIG_ENDIAN_ORDER */
"STM r3, {r4, r5, r6}\n\t"
#ifndef WOLFSSL_NO_VAR_ASSIGN_REG
: [x] "+r" (x), [iv] "+r" (iv), [counter] "+r" (counter)
Expand Down Expand Up @@ -125,12 +120,6 @@ WC_OMIT_FRAME_POINTER void wc_chacha_setkey(word32* x, const byte* key,
"LDR r4, [%[key], #4]\n\t"
"LDR r5, [%[key], #8]\n\t"
"LDR r6, [%[key], #12]\n\t"
#ifdef BIG_ENDIAN_ORDER
"REV r3, r3\n\t"
"REV r4, r4\n\t"
"REV r5, r5\n\t"
"REV r6, r6\n\t"
#endif /* BIG_ENDIAN_ORDER */
"STM %[x]!, {r3, r4, r5, r6}\n\t"
/* Next 16 bytes of key. */
#if defined(__GNUC__)
Expand Down
Loading