Skip to content

Commit ae19c55

Browse files
authored
Merge pull request #8966 from SparkiDev/arm32_aes_asm_fixup_bne
ARM 32-bit ASM AES: fixup 32-bit code to not use B.EQ
2 parents 3f83ed2 + d1893db commit ae19c55

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

wolfcrypt/src/port/arm/armv8-aes.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22274,7 +22274,7 @@ int AES_GCM_decrypt_AARCH64(Aes* aes, byte* out, const byte* in, word32 sz,
2227422274

2227522275
"MOV r12, %[R] \n"
2227622276
"CMP r12, #10 \n"
22277-
"B.EQ 1f \n"
22277+
"BEQ 1f \n"
2227822278
"VLD1.32 {q1}, [%[Key]]! \n"
2227922279
"AESMC.8 q0, q0\n"
2228022280
"VLD1.32 {q2}, [%[Key]]! \n"
@@ -22283,7 +22283,7 @@ int AES_GCM_decrypt_AARCH64(Aes* aes, byte* out, const byte* in, word32 sz,
2228322283
"AESE.8 q0, q2\n"
2228422284

2228522285
"CMP r12, #12 \n"
22286-
"B.EQ 1f \n"
22286+
"BEQ 1f \n"
2228722287
"VLD1.32 {q1}, [%[Key]]! \n"
2228822288
"AESMC.8 q0, q0\n"
2228922289
"VLD1.32 {q2}, [%[Key]]! \n"
@@ -22350,7 +22350,7 @@ int AES_GCM_decrypt_AARCH64(Aes* aes, byte* out, const byte* in, word32 sz,
2235022350

2235122351
"MOV r12, %[R] \n"
2235222352
"CMP r12, #10 \n"
22353-
"B.EQ 1f \n"
22353+
"BEQ 1f \n"
2235422354
"VLD1.32 {q1}, [%[Key]]! \n"
2235522355
"AESIMC.8 q0, q0\n"
2235622356
"VLD1.32 {q2}, [%[Key]]! \n"
@@ -22359,7 +22359,7 @@ int AES_GCM_decrypt_AARCH64(Aes* aes, byte* out, const byte* in, word32 sz,
2235922359
"AESD.8 q0, q2\n"
2236022360

2236122361
"CMP r12, #12 \n"
22362-
"B.EQ 1f \n"
22362+
"BEQ 1f \n"
2236322363
"VLD1.32 {q1}, [%[Key]]! \n"
2236422364
"AESIMC.8 q0, q0\n"
2236522365
"VLD1.32 {q2}, [%[Key]]! \n"
@@ -22462,7 +22462,7 @@ int AES_GCM_decrypt_AARCH64(Aes* aes, byte* out, const byte* in, word32 sz,
2246222462
"VST1.32 {q0}, [%[out]]! \n"
2246322463

2246422464
"CMP r11, #0 \n"
22465-
"B.EQ 2f \n"
22465+
"BEQ 2f \n"
2246622466
"VLD1.32 {q12}, [%[input]]! \n"
2246722467
"B 1b \n"
2246822468

@@ -22529,7 +22529,7 @@ int AES_GCM_decrypt_AARCH64(Aes* aes, byte* out, const byte* in, word32 sz,
2252922529
"VST1.32 {q0}, [%[out]]! \n"
2253022530

2253122531
"CMP r11, #0 \n"
22532-
"B.EQ 2f \n"
22532+
"BEQ 2f \n"
2253322533
"VLD1.32 {q12}, [%[input]]! \n"
2253422534
"B 1b \n"
2253522535

@@ -22603,7 +22603,7 @@ int AES_GCM_decrypt_AARCH64(Aes* aes, byte* out, const byte* in, word32 sz,
2260322603
"SUB %[Key], %[Key], #16 \n"
2260422604

2260522605
"CMP r11, #0 \n"
22606-
"B.EQ 2f \n"
22606+
"BEQ 2f \n"
2260722607
"VLD1.32 {q12}, [%[input]]! \n"
2260822608
"B 1b \n"
2260922609

@@ -22701,7 +22701,7 @@ int AES_GCM_decrypt_AARCH64(Aes* aes, byte* out, const byte* in, word32 sz,
2270122701
"VMOV.32 q13, q12 \n"
2270222702

2270322703
"CMP r11, #0 \n"
22704-
"B.EQ 2f \n"
22704+
"BEQ 2f \n"
2270522705
"VLD1.32 {q0}, [%[input]]! \n"
2270622706
"B 1b \n"
2270722707

@@ -22770,7 +22770,7 @@ int AES_GCM_decrypt_AARCH64(Aes* aes, byte* out, const byte* in, word32 sz,
2277022770
"VMOV.32 q14, q15 \n"
2277122771

2277222772
"CMP r11, #0 \n"
22773-
"B.EQ 2f \n"
22773+
"BEQ 2f \n"
2277422774
"VLD1.32 {q0}, [%[input]]! \n"
2277522775
"B 1b \n"
2277622776

@@ -22846,7 +22846,7 @@ int AES_GCM_decrypt_AARCH64(Aes* aes, byte* out, const byte* in, word32 sz,
2284622846
"VMOV.32 q14, q15 \n"
2284722847

2284822848
"CMP r11, #0 \n"
22849-
"B.EQ 2f \n"
22849+
"BEQ 2f \n"
2285022850
"VLD1.32 {q0}, [%[input]]! \n"
2285122851
"B 1b \n"
2285222852

0 commit comments

Comments
 (0)