Cortex-M/Thumb2 ASM: fix label

[SparkiDev]

Description

IAR doesn't like %=.
Fix code to be consistent in use of labels and branch instructions.

Fixes zd#18315

Testing

./configure '--disable-shared' '--enable-all' '--enable-sp-asm' '--enable-armasm' 'LDFLAGS=--static' '--host=armv7m' 'CC=arm-linux-gnueabi-gcc' '--disable-crl-monitor'
./configure '--disable-shared' '--enable-all' '--enable-sp-asm' '--enable-armasm=inline' 'LDFLAGS=--static' '--host=armv7m' 'CC=arm-linux-gnueabi-gcc' '--disable-crl-monitor'

Checklist

• added tests
• updated/added doxygen
• updated appropriate READMEs
• Updated manual and documentation

[josepho0918]

@SparkiDev I'm using wolfSSL with IAR v9.50.2 and haven't seen issues with %=. I wonder if this is specific to older IAR versions. Might an IAR version check be helpful?

[SparkiDev]

Hi @josepho0918,

I've modified the code to check the version of IAR.
Please let us know if the label is getting %= for you.

Thanks,
Sean

[SparkiDev]

Hi @josepho0918

Could you please tell me what value you have for: IAR_SYSTEMS_ICC'
The cusotmer using 8.32.1.18631 is seeing 9.

Thanks,
Sean

[josepho0918]

Hi @josepho0918

Could you please tell me what value you have for: IAR_SYSTEMS_ICC' The cusotmer using 8.32.1.18631 is seeing 9.

Thanks, Sean

Hi @SparkiDev

The value I have for __IAR_SYSTEMS_ICC__ is also 9. I think it should be checked with defined(__IAR_SYSTEMS_ICC__) && (__VER__ < 9000000).

[SparkiDev]

Hi @josepho0918,

Thanks for the help!
I'll be adjusting the code and updating the PR.

Sean

[josepho0918]

Hi @SparkiDev,

I have tested the latest changes, and IAR is complaining Error[Og006]: Error in inline assembly: "Branch offset too long" for BNE, BEQ and BLT. We may need to use BNE.W, BEQ.W and BLT.W with IAR.

[SparkiDev]

Hi @josepho0918,

I've modified the code to use B*.W/N for IAR.
Please let me know whether this compiles for you!

Thanks,
Sean

[josepho0918]

Hi @josepho0918,

I've modified the code to use B*.W/N for IAR. Please let me know whether this compiles for you!

Thanks, Sean

Hi @SparkiDev,

Excellent work! There're no compilation errors now, and the tests have passed.

[dgarske]

@SparkiDev seeing consistent failures with GCC after this PR. Thanks @night1rider for spotting it. Can reproduce easily.

#define WOLFSSL_SP_SMALL
#define WOLFSSL_SP_ARM_CORTEX_M_ASM
#define WOLFSSL_HAVE_SP_RSA
#define WOLFSSL_HAVE_SP_ECC

/Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.12.3.rel1.macos64_1.0.200.202406191456/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld: warning: STM32H753.elf has a LOAD segment with RWX permissions
/Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.12.3.rel1.macos64_1.0.200.202406191456/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld: ./Middlewares/Third_Party/wolfSSL_wolfSSL_wolfSSL/wolfssl/wolfcrypt/src/sp_cortexm.o: in function `sp_2048_cmp_32':
/Users/davidgarske/Projects/WolfSSL/STM/STM32H7/STM32H753/Debug/../Middlewares/Third_Party/wolfSSL_wolfSSL_wolfSSL/wolfssl/wolfcrypt/src/sp_cortexm.c:4758: undefined reference to `L_sp_2048_cmp_32_words'
/Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.12.3.rel1.macos64_1.0.200.202406191456/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld: ./Middlewares/Third_Party/wolfSSL_wolfSSL_wolfSSL/wolfssl/wolfcrypt/src/sp_cortexm.o: in function `sp_2048_cmp_64':
/Users/davidgarske/Projects/WolfSSL/STM/STM32H7/STM32H753/Debug/../Middlewares/Third_Party/wolfSSL_wolfSSL_wolfSSL/wolfssl/wolfcrypt/src/sp_cortexm.c:7527: undefined reference to `L_sp_2048_cmp_64_words'
/Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.12.3.rel1.macos64_1.0.200.202406191456/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld: ./Middlewares/Third_Party/wolfSSL_wolfSSL_wolfSSL/wolfssl/wolfcrypt/src/sp_cortexm.o: in function `sp_3072_cmp_48':
/Users/davidgarske/Projects/WolfSSL/STM/STM32H7/STM32H753/Debug/../Middlewares/Third_Party/wolfSSL_wolfSSL_wolfSSL/wolfssl/wolfcrypt/src/sp_cortexm.c:16255: undefined reference to `L_sp_3072_cmp_48_words'
/Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.12.3.rel1.macos64_1.0.200.202406191456/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld: ./Middlewares/Third_Party/wolfSSL_wolfSSL_wolfSSL/wolfssl/wolfcrypt/src/sp_cortexm.o: in function `sp_3072_cmp_96':
/Users/davidgarske/Projects/WolfSSL/STM/STM32H7/STM32H753/Debug/../Middlewares/Third_Party/wolfSSL_wolfSSL_wolfSSL/wolfssl/wolfcrypt/src/sp_cortexm.c:19784: undefined reference to `L_sp_3072_cmp_96_words'
/Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.12.3.rel1.macos64_1.0.200.202406191456/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/bin/ld: ./Middlewares/Third_Party/wolfSSL_wolfSSL_wolfSSL/wolfssl/wolfcrypt/src/sp_cortexm.o: in function `sp_256_cmp_8':
/Users/davidgarske/Projects/WolfSSL/STM/STM32H7/STM32H753/Debug/../Middlewares/Third_Party/wolfSSL_wolfSSL_wolfSSL/wolfssl/wolfcrypt/src/sp_cortexm.c:34633: undefined reference to `L_sp_256_cmp_8_words'
collect2: error: ld returned 1 exit status