Skip to content

Zephyr: define the Thumb-2 assembly macros and allow benchmark argument parsing #11495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dgarske wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −2
Open

Zephyr: define the Thumb-2 assembly macros and allow benchmark argument parsing #11495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .wolfssl_known_macro_extras
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ CONFIG_TLS_STACK_WOLFSSL
CONFIG_USE_WOLFSSL_ESP_SDK_TIME
CONFIG_USE_WOLFSSL_ESP_SDK_WIFI
CONFIG_WOLFCRYPT_ARMASM
CONFIG_WOLFCRYPT_ARMASM_THUMB2
CONFIG_WOLFCRYPT_FIPS
CONFIG_WOLFCRYPT_FIPS_READY
CONFIG_WOLFCRYPT_FIPS_V2
Expand Down Expand Up @@ -1239,6 +1240,7 @@ WOLFSSL_XILINX_CRYPTO_OLD
WOLFSSL_XILINX_PATCH
WOLFSSL_XIL_MSG_NO_SLEEP
WOLFSSL_ZEPHYR
WOLFSSL_ZEPHYR_MAIN_ARGS
WOLF_ALLOW_BUILTIN
WOLF_CONF_ASN_TIME
WOLF_CRYPTO_CB_ASYNC_POLL
Expand Down
8 changes: 7 additions & 1 deletion wolfssl/wolfcrypt/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3151,7 +3151,13 @@
#define USE_FLAT_BENCHMARK_H
#define USE_FLAT_TEST_H
#define EXIT_FAILURE 1
#define MAIN_NO_ARGS
/* A Zephyr application normally has no argv to hand the test or benchmark
* entry points. One that does - it may build its own argument list to pick
* an algorithm subset - can define WOLFSSL_ZEPHYR_MAIN_ARGS to keep the
* option parsing compiled in. */
#ifndef WOLFSSL_ZEPHYR_MAIN_ARGS
#define MAIN_NO_ARGS
#endif

void *z_realloc(void *ptr, size_t size);
#define realloc z_realloc
Expand Down
11 changes: 10 additions & 1 deletion zephyr/user_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,16 @@ extern "C" {

/* Default is ARMv8 */

#if 0 /* ARMv7 */
#ifdef CONFIG_WOLFCRYPT_ARMASM_THUMB2
/* Cortex-M and Cortex-R. zephyr/CMakeLists.txt compiles the thumb2-*
* ports for this, and they export different symbol names than the
* ARMv8 and AArch32 ones, so the C side has to be told as well or the
* link fails. Matches what configure sets for --enable-armasm on a
* Thumb-2 target. */
#define WOLFSSL_ARMASM_THUMB2
#define WOLFSSL_ARMASM_NO_HW_CRYPTO
#define WOLFSSL_ARM_ARCH 7
#elif 0 /* ARMv7 */
#define WOLFSSL_ARM_ARCH 7
#define WOLFSSL_ARMASM_NO_HW_CRYPTO /* enable if processor does not support aes/sha instructions */
#endif
Expand Down
Loading