yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tidy-up macros and fix guards around option B

Browse source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-05-24 18:28:46 +01:00
parent 1416cba81f
commit ffbb7c5edc
1 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
library/bn_mul.h
View file

@ -671,37 +671,45 @@
* clang and armcc5 under the same conditions).
*/
#if defined(__ARM_ARCH)
#if __ARM_ARCH >= 6
//#if defined(__ARM_ARCH)
//#if __ARM_ARCH >= 6
#if defined(__thumb__) && !defined(__thumb2__) // Thumb1 (not Thumb 2) ISA
// Only supported by gcc, when optimisation is enabled; only option A works
#if defined(__OPTIMIZE__) && !defined(__ARMCC_VERSION)
#define ARM_OPTION_A
#endif
// Only supported by gcc, when optimisation is enabled; only option A works
#if defined(__OPTIMIZE__) && !defined(__ARMCC_VERSION)
#define ARM_OPTION_A
#endif
#elif defined(__thumb2__) // Thumb 2 ISA
#if !defined(__ARMCC_VERSION) && !defined(__OPTIMIZE__)
// gcc -O0
// only option B builds
#define ARM_OPTION_B
#elif !defined(__ARMCC_VERSION)
// gcc with optimisation - any option builds
#define ARM_OPTION_A
#else
// armclang
// options A or C build
#define ARM_OPTION_A
#endif
#if !defined(__ARMCC_VERSION) && !defined(__OPTIMIZE__)
// gcc -O0: only option B builds
#if defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
#define ARM_OPTION_B
#endif
#else
// gcc with optimisation, or armclang: any option builds
#define ARM_OPTION_B_OR_C
#endif
#elif defined(__arm__) // Arm ISA
// any option builds. A does not seem to work; B is about 2x faster than C (under emulation).
#define ARM_OPTION_B
#endif
// any option builds. A does not seem to work; B is about 2x faster than C (under emulation).
#define ARM_OPTION_B_OR_C
#endif
#if defined(ARM_OPTION_B_OR_C)
#if (__ARM_ARCH >= 6) && defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
#define ARM_OPTION_B
#else
#define ARM_OPTION_C
#endif
#endif
//#endif
//#endif
#if defined(ARM_OPTION_A)