Skip to content

Commit 65742c4

Browse files
SparkiDevdanielinux
SparkiDev
authored and
danielinux
committed
ARM32 ASM: regenerated with fixes
Fix thumb interwork def check to be consistent and update #endif. Remove duplicate check in generated C files.
1 parent 9c4960f commit 65742c4

16 files changed

Lines changed: 48 additions & 72 deletions

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
#include <wolfssl/wolfcrypt/settings.h>
3232

3333
#ifdef WOLFSSL_ARMASM
34-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
34+
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \
35+
defined(__THUMB_INTERWORK__))
3536
#ifndef WOLFSSL_ARMASM_INLINE
3637
#ifndef NO_AES
3738
#ifdef HAVE_AES_DECRYPT
@@ -5305,7 +5306,7 @@ L_AES_GCM_encrypt_end:
53055306
.size AES_GCM_encrypt,.-AES_GCM_encrypt
53065307
#endif /* HAVE_AESGCM */
53075308
#endif /* !NO_AES */
5308-
#endif /* !__aarch64__ && __arm__ && !__thumb__ */
5309+
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */
53095310
#endif /* WOLFSSL_ARMASM */
53105311

53115312
#if defined(__linux__) && defined(__ELF__)

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
#include <wolfssl/wolfcrypt/error-crypt.h>
3333

3434
#ifdef WOLFSSL_ARMASM
35-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
35+
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \
36+
defined(__THUMB_INTERWORK__))
3637
#include <stdint.h>
3738
#ifdef HAVE_CONFIG_H
3839
#include <config.h>
@@ -41,9 +42,6 @@
4142
#include <wolfssl/wolfcrypt/error-crypt.h>
4243
#ifdef WOLFSSL_ARMASM_INLINE
4344

44-
#ifdef WOLFSSL_ARMASM
45-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
46-
4745
#ifdef __IAR_SYSTEMS_ICC__
4846
#define __asm__ asm
4947
#define __volatile__ volatile
@@ -4852,9 +4850,7 @@ void AES_GCM_encrypt(const unsigned char* in_p, unsigned char* out_p,
48524850

48534851
#endif /* HAVE_AESGCM */
48544852
#endif /* !NO_AES */
4855-
#endif /* !__aarch64__ && __arm__ && !__thumb__ */
4856-
#endif /* WOLFSSL_ARMASM */
4857-
#endif /* !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__)) */
4853+
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */
48584854
#endif /* WOLFSSL_ARMASM */
48594855

48604856
#endif /* WOLFSSL_ARMASM_INLINE */

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
#include <wolfssl/wolfcrypt/settings.h>
3232

3333
#ifdef WOLFSSL_ARMASM
34-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
34+
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \
35+
defined(__THUMB_INTERWORK__))
3536
#ifndef WOLFSSL_ARMASM_INLINE
3637
#ifdef HAVE_CHACHA
3738
.text
@@ -514,7 +515,7 @@ L_chacha_arm32_over_done:
514515
.size wc_chacha_use_over,.-wc_chacha_use_over
515516
#endif /* WOLFSSL_ARMASM_NO_NEON */
516517
#endif /* HAVE_CHACHA */
517-
#endif /* !__aarch64__ && __arm__ && !__thumb__ */
518+
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */
518519
#endif /* WOLFSSL_ARMASM */
519520

520521
#if defined(__linux__) && defined(__ELF__)

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
#include <wolfssl/wolfcrypt/error-crypt.h>
3333

3434
#ifdef WOLFSSL_ARMASM
35-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
35+
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \
36+
defined(__THUMB_INTERWORK__))
3637
#include <stdint.h>
3738
#ifdef HAVE_CONFIG_H
3839
#include <config.h>
@@ -41,9 +42,6 @@
4142
#include <wolfssl/wolfcrypt/error-crypt.h>
4243
#ifdef WOLFSSL_ARMASM_INLINE
4344

44-
#ifdef WOLFSSL_ARMASM
45-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
46-
4745
#ifdef __IAR_SYSTEMS_ICC__
4846
#define __asm__ asm
4947
#define __volatile__ volatile
@@ -568,9 +566,7 @@ void wc_chacha_use_over(byte* over_p, byte* output_p, const byte* input_p,
568566

569567
#endif /* WOLFSSL_ARMASM_NO_NEON */
570568
#endif /* HAVE_CHACHA */
571-
#endif /* !__aarch64__ && __arm__ && !__thumb__ */
572-
#endif /* WOLFSSL_ARMASM */
573-
#endif /* !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__)) */
569+
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */
574570
#endif /* WOLFSSL_ARMASM */
575571

576572
#endif /* WOLFSSL_ARMASM_INLINE */

‎wolfcrypt/src/port/arm/armv8-32-curve25519.S‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
#include <wolfssl/wolfcrypt/settings.h>
3232

3333
#ifdef WOLFSSL_ARMASM
34-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
34+
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \
35+
defined(__THUMB_INTERWORK__))
3536
#ifndef WOLFSSL_ARMASM_INLINE
3637
#if defined(HAVE_CURVE25519) || defined(HAVE_ED25519)
3738
#if !defined(CURVE25519_SMALL) || !defined(ED25519_SMALL)
@@ -9180,7 +9181,7 @@ sc_muladd:
91809181

91819182
#endif /* !CURVE25519_SMALL || !ED25519_SMALL */
91829183
#endif /* HAVE_CURVE25519 || HAVE_ED25519 */
9183-
#endif /* !__aarch64__ && __arm__ && !__thumb__ */
9184+
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */
91849185
#endif /* WOLFSSL_ARMASM */
91859186

91869187
#if defined(__linux__) && defined(__ELF__)

‎wolfcrypt/src/port/arm/armv8-32-curve25519_c.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
#include <wolfssl/wolfcrypt/error-crypt.h>
3333

3434
#ifdef WOLFSSL_ARMASM
35-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
35+
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \
36+
defined(__THUMB_INTERWORK__))
3637
#include <stdint.h>
3738
#ifdef HAVE_CONFIG_H
3839
#include <config.h>
@@ -41,9 +42,6 @@
4142
#include <wolfssl/wolfcrypt/error-crypt.h>
4243
#ifdef WOLFSSL_ARMASM_INLINE
4344

44-
#ifdef WOLFSSL_ARMASM
45-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
46-
4745
#ifdef __IAR_SYSTEMS_ICC__
4846
#define __asm__ asm
4947
#define __volatile__ volatile
@@ -9428,9 +9426,7 @@ void sc_muladd(byte* s_p, const byte* a_p, const byte* b_p, const byte* c_p)
94289426

94299427
#endif /* !CURVE25519_SMALL || !ED25519_SMALL */
94309428
#endif /* HAVE_CURVE25519 || HAVE_ED25519 */
9431-
#endif /* !__aarch64__ && __arm__ && !__thumb__ */
9432-
#endif /* WOLFSSL_ARMASM */
9433-
#endif /* !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__)) */
9429+
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */
94349430
#endif /* WOLFSSL_ARMASM */
94359431

94369432
#endif /* WOLFSSL_ARMASM_INLINE */

‎wolfcrypt/src/port/arm/armv8-32-kyber-asm.S‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
#include <wolfssl/wolfcrypt/settings.h>
3232

3333
#ifdef WOLFSSL_ARMASM
34-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
34+
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \
35+
defined(__THUMB_INTERWORK__))
3536
#ifndef WOLFSSL_ARMASM_INLINE
3637
#ifdef WOLFSSL_WC_KYBER
3738
.text
@@ -9433,7 +9434,7 @@ L_kyber_arm32_rej_uniform_done:
94339434
pop {r4, r5, r6, r7, r8, pc}
94349435
.size kyber_arm32_rej_uniform,.-kyber_arm32_rej_uniform
94359436
#endif /* WOLFSSL_WC_KYBER */
9436-
#endif /* !__aarch64__ && __arm__ && !__thumb__ */
9437+
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */
94379438
#endif /* WOLFSSL_ARMASM */
94389439

94399440
#if defined(__linux__) && defined(__ELF__)

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
#include <wolfssl/wolfcrypt/error-crypt.h>
3333

3434
#ifdef WOLFSSL_ARMASM
35-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
35+
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \
36+
defined(__THUMB_INTERWORK__))
3637
#include <stdint.h>
3738
#ifdef HAVE_CONFIG_H
3839
#include <config.h>
@@ -41,9 +42,6 @@
4142
#include <wolfssl/wolfcrypt/error-crypt.h>
4243
#ifdef WOLFSSL_ARMASM_INLINE
4344

44-
#ifdef WOLFSSL_ARMASM
45-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
46-
4745
#ifdef __IAR_SYSTEMS_ICC__
4846
#define __asm__ asm
4947
#define __volatile__ volatile
@@ -9231,9 +9229,7 @@ unsigned int kyber_arm32_rej_uniform(sword16* p_p, unsigned int len_p,
92319229
}
92329230

92339231
#endif /* WOLFSSL_WC_KYBER */
9234-
#endif /* !__aarch64__ && __arm__ && !__thumb__ */
9235-
#endif /* WOLFSSL_ARMASM */
9236-
#endif /* !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__)) */
9232+
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */
92379233
#endif /* WOLFSSL_ARMASM */
92389234

92399235
#endif /* WOLFSSL_ARMASM_INLINE */

‎wolfcrypt/src/port/arm/armv8-32-poly1305-asm.S‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
#include <wolfssl/wolfcrypt/settings.h>
3232

3333
#ifdef WOLFSSL_ARMASM
34-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
34+
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \
35+
defined(__THUMB_INTERWORK__))
3536
#ifndef WOLFSSL_ARMASM_INLINE
3637
#ifdef HAVE_POLY1305
3738
.text
@@ -348,7 +349,7 @@ poly1305_final:
348349
pop {r4, r5, r6, r7, r8, r9, pc}
349350
.size poly1305_final,.-poly1305_final
350351
#endif /* HAVE_POLY1305 */
351-
#endif /* !__aarch64__ && __arm__ && !__thumb__ */
352+
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */
352353
#endif /* WOLFSSL_ARMASM */
353354

354355
#if defined(__linux__) && defined(__ELF__)

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
#include <wolfssl/wolfcrypt/error-crypt.h>
3333

3434
#ifdef WOLFSSL_ARMASM
35-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
35+
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || \
36+
defined(__THUMB_INTERWORK__))
3637
#include <stdint.h>
3738
#ifdef HAVE_CONFIG_H
3839
#include <config.h>
@@ -41,9 +42,6 @@
4142
#include <wolfssl/wolfcrypt/error-crypt.h>
4243
#ifdef WOLFSSL_ARMASM_INLINE
4344

44-
#ifdef WOLFSSL_ARMASM
45-
#if !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__))
46-
4745
#ifdef __IAR_SYSTEMS_ICC__
4846
#define __asm__ asm
4947
#define __volatile__ volatile
@@ -387,9 +385,7 @@ void poly1305_final(Poly1305* ctx_p, byte* mac_p)
387385
}
388386

389387
#endif /* HAVE_POLY1305 */
390-
#endif /* !__aarch64__ && __arm__ && !__thumb__ */
391-
#endif /* WOLFSSL_ARMASM */
392-
#endif /* !defined(__aarch64__) && defined(__arm__) && (!defined(__thumb__) || defined(__THUMB_INTERWORK__)) */
388+
#endif /* !__aarch64__ && __arm__ && (!__thumb__ || __THUMB_INTERWORK__) */
393389
#endif /* WOLFSSL_ARMASM */
394390

395391
#endif /* WOLFSSL_ARMASM_INLINE */

0 commit comments

Comments
 (0)