Enforce WOLFSSL_SP_NO_UMAAL with _CORTEX_M_ASM #6793
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dgarske
approved these changes
Sep 20, 2023
dgarske
requested changes
Sep 20, 2023
dgarske
force-pushed
the
no_umaal_for_cortexm
branch
from
4a6feb3
to
e73fcc2
Compare
SparkiDev
requested changes
Sep 20, 2023
wolfssl/wolfcrypt/sp_int.h
Outdated
| @@ -178,6 +178,15 @@ extern "C" { | |||
| #define WOLFSSL_SP_DIV_WORD_HALF | |||
| #endif | |||
|
|
|||
| /* Detect Cortex M3 (no UMAAL)*/ | |||
| #ifdef WOLFSSL_SP_ARM_CORTEX_M_ASM | |||
| #if defined(__ARM_ARCH) && (__ARM_ARCH < 8) && defined(__ARM_ARCH_7M__) | |||
There was a problem hiding this comment.
Should this be:
#if defined(__ARM_ARCH) && (__ARM_ARCH < 8) || defined(ARM_ARCH_7M)
There was a problem hiding this comment.
No, that would disable it for M4. It could be just #if defined(ARM_ARCH_7M).
These are set exclusively (only one or the other) for each platform:
M3: #define __ARM_ARCH_7M__ 1
M4: #define __ARM_ARCH_7EM__ 1
There was a problem hiding this comment.
If you want I could rewrite to:
#if defined(WOLFSSL_SP_ARM_CORTEX_M_ASM) && defined(__ARM_ARCH_7M__)
#undef WOLFSSL_SP_NO_UMAAL
#define WOLFSSL_SP_NO_UMAAL
#endif
There was a problem hiding this comment.
OK make it just ARM_ARCH_7M like in the your last comment.
dgarske
force-pushed
the
no_umaal_for_cortexm
branch
from
e73fcc2
to
347394c
Compare
SparkiDev
approved these changes
Sep 21, 2023
|
Retest this please |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Implicitly add WOLFSSL_SP_NO_UMAAL when WOLFSSL_SP_ARM_CORTEX_M_ASM is enabled
Testing
Tested via wolfBoot build