Alter asm to __asm to comply with C99
C99 spec does now allow asm as a keyword, so compilers instead use __asm.
This allows the tests to be build by external projects that specify
--std=C99
Signed-off-by: Raef Coles <raef.coles@arm.com>
diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_an521/nspe/pal_driver_intf.c b/api-tests/platform/targets/tgt_dev_apis_tfm_an521/nspe/pal_driver_intf.c
index b407e9b..b88d465 100644
--- a/api-tests/platform/targets/tgt_dev_apis_tfm_an521/nspe/pal_driver_intf.c
+++ b/api-tests/platform/targets/tgt_dev_apis_tfm_an521/nspe/pal_driver_intf.c
@@ -128,7 +128,7 @@
while(1)
{
- asm volatile("WFI");
+ __asm volatile("WFI");
}
}
diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_an524/nspe/pal_driver_intf.c b/api-tests/platform/targets/tgt_dev_apis_tfm_an524/nspe/pal_driver_intf.c
index 662ed9a..5ed3ee7 100644
--- a/api-tests/platform/targets/tgt_dev_apis_tfm_an524/nspe/pal_driver_intf.c
+++ b/api-tests/platform/targets/tgt_dev_apis_tfm_an524/nspe/pal_driver_intf.c
@@ -130,7 +130,7 @@
while (1)
{
- asm volatile("WFI");
+ __asm volatile("WFI");
}
}
diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_an539/nspe/pal_driver_intf.c b/api-tests/platform/targets/tgt_dev_apis_tfm_an539/nspe/pal_driver_intf.c
index a83e77a..b4fdc25 100644
--- a/api-tests/platform/targets/tgt_dev_apis_tfm_an539/nspe/pal_driver_intf.c
+++ b/api-tests/platform/targets/tgt_dev_apis_tfm_an539/nspe/pal_driver_intf.c
@@ -130,7 +130,7 @@
while(1)
{
- asm volatile("WFI");
+ __asm volatile("WFI");
}
}
diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_a/nspe/pal_driver_intf.c b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_a/nspe/pal_driver_intf.c
index d0113c0..8e93323 100644
--- a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_a/nspe/pal_driver_intf.c
+++ b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_a/nspe/pal_driver_intf.c
@@ -130,7 +130,7 @@
while(1)
{
- asm volatile("WFI");
+ __asm volatile("WFI");
}
}
diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_b1/nspe/pal_driver_intf.c b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_b1/nspe/pal_driver_intf.c
index d0113c0..8e93323 100644
--- a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_b1/nspe/pal_driver_intf.c
+++ b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_b1/nspe/pal_driver_intf.c
@@ -130,7 +130,7 @@
while(1)
{
- asm volatile("WFI");
+ __asm volatile("WFI");
}
}
diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_s1/nspe/pal_driver_intf.c b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_s1/nspe/pal_driver_intf.c
index cb43986..ffd0fe3 100644
--- a/api-tests/platform/targets/tgt_dev_apis_tfm_musca_s1/nspe/pal_driver_intf.c
+++ b/api-tests/platform/targets/tgt_dev_apis_tfm_musca_s1/nspe/pal_driver_intf.c
@@ -130,7 +130,7 @@
while(1)
{
- asm volatile("WFI");
+ __asm volatile("WFI");
}
}
diff --git a/api-tests/platform/targets/tgt_dev_apis_tfm_psoc64/nspe/pal_driver_intf.c b/api-tests/platform/targets/tgt_dev_apis_tfm_psoc64/nspe/pal_driver_intf.c
index 47b1bad..a437704 100644
--- a/api-tests/platform/targets/tgt_dev_apis_tfm_psoc64/nspe/pal_driver_intf.c
+++ b/api-tests/platform/targets/tgt_dev_apis_tfm_psoc64/nspe/pal_driver_intf.c
@@ -137,7 +137,7 @@
while (1)
{
- asm volatile("WFI");
+ __asm volatile("WFI");
}
}
diff --git a/api-tests/platform/targets/tgt_ff_tfm_an521/nspe/pal_driver_ipc_intf.c b/api-tests/platform/targets/tgt_ff_tfm_an521/nspe/pal_driver_ipc_intf.c
index d06b383..ba4b84b 100644
--- a/api-tests/platform/targets/tgt_ff_tfm_an521/nspe/pal_driver_ipc_intf.c
+++ b/api-tests/platform/targets/tgt_ff_tfm_an521/nspe/pal_driver_ipc_intf.c
@@ -275,6 +275,6 @@
while(1)
{
- asm volatile("WFI");
+ __asm volatile("WFI");
}
}
diff --git a/api-tests/platform/targets/tgt_ff_tfm_musca_a/nspe/pal_driver_ipc_intf.c b/api-tests/platform/targets/tgt_ff_tfm_musca_a/nspe/pal_driver_ipc_intf.c
index d06b383..ba4b84b 100644
--- a/api-tests/platform/targets/tgt_ff_tfm_musca_a/nspe/pal_driver_ipc_intf.c
+++ b/api-tests/platform/targets/tgt_ff_tfm_musca_a/nspe/pal_driver_ipc_intf.c
@@ -275,6 +275,6 @@
while(1)
{
- asm volatile("WFI");
+ __asm volatile("WFI");
}
}
diff --git a/api-tests/platform/targets/tgt_ff_tfm_musca_b1/nspe/pal_driver_ipc_intf.c b/api-tests/platform/targets/tgt_ff_tfm_musca_b1/nspe/pal_driver_ipc_intf.c
index 0a41625..7c3b02f 100644
--- a/api-tests/platform/targets/tgt_ff_tfm_musca_b1/nspe/pal_driver_ipc_intf.c
+++ b/api-tests/platform/targets/tgt_ff_tfm_musca_b1/nspe/pal_driver_ipc_intf.c
@@ -275,6 +275,6 @@
while (1)
{
- asm volatile("WFI");
+ __asm volatile("WFI");
}
}
diff --git a/tbsa-v8m/tbsa_app/tbsa_main.c b/tbsa-v8m/tbsa_app/tbsa_main.c
index 7beae3b..697a16a 100644
--- a/tbsa-v8m/tbsa_app/tbsa_main.c
+++ b/tbsa-v8m/tbsa_app/tbsa_main.c
@@ -71,6 +71,6 @@
exit:
while(1) {
- asm volatile("WFI");
+ __asm volatile("WFI");
}
}
diff --git a/tbsa-v8m/test_pool/base/test_b001/secure.c b/tbsa-v8m/test_pool/base/test_b001/secure.c
index 7c2dad4..b867749 100644
--- a/tbsa-v8m/test_pool/base/test_b001/secure.c
+++ b/tbsa-v8m/test_pool/base/test_b001/secure.c
@@ -55,16 +55,16 @@
__attribute__((naked))
void HF_Handler(void)
{
- asm volatile("mrs r0, control_ns \n"
- "mov r1, #0x2 \n"
- "and r0, r1 \n"
- "cmp r0, r1 \n"
- "beq _psp_ns \n"
- "mrs r0, msp_ns \n"
- "b hard_fault_esr \n"
- "_psp_ns: \n"
- "mrs r0, psp_ns \n"
- "b hard_fault_esr \n");
+ __asm volatile("mrs r0, control_ns \n"
+ "mov r1, #0x2 \n"
+ "and r0, r1 \n"
+ "cmp r0, r1 \n"
+ "beq _psp_ns \n"
+ "mrs r0, msp_ns \n"
+ "b hard_fault_esr \n"
+ "_psp_ns: \n"
+ "mrs r0, psp_ns \n"
+ "b hard_fault_esr \n");
}
tbsa_status_t setup_ns_env(void)
diff --git a/tbsa-v8m/test_pool/base/test_b005/secure.c b/tbsa-v8m/test_pool/base/test_b005/secure.c
index fac6b8a..e740fae 100644
--- a/tbsa-v8m/test_pool/base/test_b005/secure.c
+++ b/tbsa-v8m/test_pool/base/test_b005/secure.c
@@ -41,16 +41,16 @@
__attribute__((naked)) void HF_Handler(void)
{
- asm volatile("mrs r0, control_ns \n"
- "mov r1, #0x2 \n"
- "and r0, r1 \n"
- "cmp r0, r1 \n"
- "beq _psp_ns \n"
- "mrs r0, msp_ns \n"
- "b hard_fault_esr \n"
- "_psp_ns: \n"
- "mrs r0, psp_ns \n"
- "b hard_fault_esr \n");
+ __asm volatile("mrs r0, control_ns \n"
+ "mov r1, #0x2 \n"
+ "and r0, r1 \n"
+ "cmp r0, r1 \n"
+ "beq _psp_ns \n"
+ "mrs r0, msp_ns \n"
+ "b hard_fault_esr \n"
+ "_psp_ns: \n"
+ "mrs r0, psp_ns \n"
+ "b hard_fault_esr \n");
}
void entry_hook(tbsa_val_api_t *val)
diff --git a/tbsa-v8m/test_pool/base/test_b006/secure.c b/tbsa-v8m/test_pool/base/test_b006/secure.c
index 1ed5a45..522be2f 100644
--- a/tbsa-v8m/test_pool/base/test_b006/secure.c
+++ b/tbsa-v8m/test_pool/base/test_b006/secure.c
@@ -41,16 +41,16 @@
__attribute__((naked)) void HF_Handler(void)
{
- asm volatile("mrs r0, control_ns \n"
- "mov r1, #0x2 \n"
- "and r0, r1 \n"
- "cmp r0, r1 \n"
- "beq _psp_ns \n"
- "mrs r0, msp_ns \n"
- "b hard_fault_esr \n"
- "_psp_ns: \n"
- "mrs r0, psp_ns \n"
- "b hard_fault_esr \n");
+ __asm volatile("mrs r0, control_ns \n"
+ "mov r1, #0x2 \n"
+ "and r0, r1 \n"
+ "cmp r0, r1 \n"
+ "beq _psp_ns \n"
+ "mrs r0, msp_ns \n"
+ "b hard_fault_esr \n"
+ "_psp_ns: \n"
+ "mrs r0, psp_ns \n"
+ "b hard_fault_esr \n");
}
void entry_hook(tbsa_val_api_t *val)
diff --git a/tbsa-v8m/test_pool/crypto/test_c003/non_secure.c b/tbsa-v8m/test_pool/crypto/test_c003/non_secure.c
index 8ac3c52..d880965 100644
--- a/tbsa-v8m/test_pool/crypto/test_c003/non_secure.c
+++ b/tbsa-v8m/test_pool/crypto/test_c003/non_secure.c
@@ -99,8 +99,8 @@
/* Shouldn't come here */
val->print(PRINT_ERROR, "\n\r\tFault didn't occur when HUK accessed from Non-secure world!", 0);
- asm volatile ("DSB");
- asm volatile ("ISB");
+ __asm volatile ("DSB");
+ __asm volatile ("ISB");
val->system_reset(WARM_RESET);
}
}
diff --git a/tbsa-v8m/test_pool/crypto/test_c003/secure.c b/tbsa-v8m/test_pool/crypto/test_c003/secure.c
index 213004f..6ca024b 100644
--- a/tbsa-v8m/test_pool/crypto/test_c003/secure.c
+++ b/tbsa-v8m/test_pool/crypto/test_c003/secure.c
@@ -48,8 +48,8 @@
g_val->print(PRINT_DEBUG, "\n\r\tHardFault triggered when HUK was accessed from"
"non-Trusted world", 0);
- asm volatile("DSB");
- asm volatile("ISB");
+ __asm volatile("DSB");
+ __asm volatile("ISB");
g_val->system_reset(WARM_RESET);
@@ -59,16 +59,16 @@
__attribute__((naked))
void HF_Handler(void)
{
- asm volatile("mrs r0, control_ns \n"
- "mov r1, #0x2 \n"
- "and r0, r1 \n"
- "cmp r0, r1 \n"
- "beq _psp_ns \n"
- "mrs r0, msp_ns \n"
- "b hard_fault_esr \n"
- "_psp_ns: \n"
- "mrs r0, psp_ns \n"
- "b hard_fault_esr \n");
+ __asm volatile("mrs r0, control_ns \n"
+ "mov r1, #0x2 \n"
+ "and r0, r1 \n"
+ "cmp r0, r1 \n"
+ "beq _psp_ns \n"
+ "mrs r0, msp_ns \n"
+ "b hard_fault_esr \n"
+ "_psp_ns: \n"
+ "mrs r0, psp_ns \n"
+ "b hard_fault_esr \n");
}
void test_payload(tbsa_val_api_t *val)
diff --git a/tbsa-v8m/test_pool/crypto/test_c006/non_secure.c b/tbsa-v8m/test_pool/crypto/test_c006/non_secure.c
index e29faf5..4e0e744 100644
--- a/tbsa-v8m/test_pool/crypto/test_c006/non_secure.c
+++ b/tbsa-v8m/test_pool/crypto/test_c006/non_secure.c
@@ -150,8 +150,8 @@
/* Control shouldn't come here */
val->print(PRINT_ERROR, "\n\r\tFault didn't occur when Trusted HW Key accessed from Non-secure world!", 0);
- asm volatile ("DSB");
- asm volatile ("ISB");
+ __asm volatile ("DSB");
+ __asm volatile ("ISB");
val->system_reset(WARM_RESET);
}
diff --git a/tbsa-v8m/test_pool/crypto/test_c006/secure.c b/tbsa-v8m/test_pool/crypto/test_c006/secure.c
index 28060e5..24db708 100644
--- a/tbsa-v8m/test_pool/crypto/test_c006/secure.c
+++ b/tbsa-v8m/test_pool/crypto/test_c006/secure.c
@@ -45,16 +45,16 @@
__attribute__((naked))
void HF_Handler(void)
{
- asm volatile("mrs r0, control_ns \n"
- "mov r1, #0x2 \n"
- "and r0, r1 \n"
- "cmp r0, r1 \n"
- "beq _psp_ns \n"
- "mrs r0, msp_ns \n"
- "b hard_fault_esr \n"
- "_psp_ns: \n"
- "mrs r0, psp_ns \n"
- "b hard_fault_esr \n");
+ __asm volatile("mrs r0, control_ns \n"
+ "mov r1, #0x2 \n"
+ "and r0, r1 \n"
+ "cmp r0, r1 \n"
+ "beq _psp_ns \n"
+ "mrs r0, msp_ns \n"
+ "b hard_fault_esr \n"
+ "_psp_ns: \n"
+ "mrs r0, psp_ns \n"
+ "b hard_fault_esr \n");
}
void entry_hook(tbsa_val_api_t *val)
diff --git a/tbsa-v8m/test_pool/crypto/test_c011/secure.c b/tbsa-v8m/test_pool/crypto/test_c011/secure.c
index ef5ddfb..21b61f6 100644
--- a/tbsa-v8m/test_pool/crypto/test_c011/secure.c
+++ b/tbsa-v8m/test_pool/crypto/test_c011/secure.c
@@ -130,9 +130,9 @@
}
/* Change the mode to unprivilege access */
- asm volatile ("MRS %0, control" : "=r" (control));
+ __asm volatile ("MRS %0, control" : "=r" (control));
control |= 0x1;
- asm volatile ("MSR control, %0" : : "r" (control) : "memory");
+ __asm volatile ("MSR control, %0" : : "r" (control) : "memory");
/* Performing unprivilege access to Confidential fuse */
status = val->fuse_ops(FUSE_READ, fuse_desc->addr, data1, MIN(FUSE_SIZE, fuse_desc->size));
diff --git a/tbsa-v8m/test_pool/debug/test_d003/secure.c b/tbsa-v8m/test_pool/debug/test_d003/secure.c
index 7d06acb..eb27fb0 100644
--- a/tbsa-v8m/test_pool/debug/test_d003/secure.c
+++ b/tbsa-v8m/test_pool/debug/test_d003/secure.c
@@ -39,7 +39,7 @@
{
while(delay_cnt--)
{
- asm volatile("NOP");
+ __asm volatile("NOP");
}
}
@@ -196,8 +196,8 @@
if (val->err_check_set(TEST_CHECKPOINT_9, status)) {
goto clean_up;
}
- asm volatile("DSB");
- asm volatile("ISB");
+ __asm volatile("DSB");
+ __asm volatile("ISB");
/* Indicate the debugger about the transition to CLOSED state */
if (test_dbg_seq_write((uint32_t)(memory_desc->start), SEQ_CLOSED_STATE_READ)) {
@@ -226,8 +226,8 @@
if (val->err_check_set(TEST_CHECKPOINT_B, status)) {
goto clean_up;
}
- asm volatile("DSB");
- asm volatile("ISB");
+ __asm volatile("DSB");
+ __asm volatile("ISB");
/*Initialize the memory with known data*/
val->mem_write((uint32_t *)memory_desc->start, WORD, ~TEST_DATA);
@@ -245,8 +245,8 @@
if (val->err_check_set(TEST_CHECKPOINT_C, status)) {
goto clean_up;
}
- asm volatile("DSB");
- asm volatile("ISB");
+ __asm volatile("DSB");
+ __asm volatile("ISB");
/* Indicate the debugger about the transition to CLOSED state */
if (test_dbg_seq_write((uint32_t)(memory_desc->start), SEQ_CLOSED_STATE_WRITE)) {
@@ -272,8 +272,8 @@
if (val->err_check_set(TEST_CHECKPOINT_E, status)) {
goto clean_up;
}
- asm volatile("DSB");
- asm volatile("ISB");
+ __asm volatile("DSB");
+ __asm volatile("ISB");
}
instance++;
} while (instance < GET_NUM_INSTANCE(memory_desc));
diff --git a/tbsa-v8m/test_pool/debug/test_d008/secure.c b/tbsa-v8m/test_pool/debug/test_d008/secure.c
index d8e4d72..2502c74 100644
--- a/tbsa-v8m/test_pool/debug/test_d008/secure.c
+++ b/tbsa-v8m/test_pool/debug/test_d008/secure.c
@@ -129,9 +129,9 @@
}
/* Change the mode to unprivilege access */
- asm volatile ("MRS %0, control" : "=r" (control));
+ __asm volatile ("MRS %0, control" : "=r" (control));
control |= 0x1;
- asm volatile ("MSR control, %0" : : "r" (control) : "memory");
+ __asm volatile ("MSR control, %0" : : "r" (control) : "memory");
/* Performing unprivilege access to DPM */
certificate_valid[dpm_instance] = val->crypto_validate_certificate(dpm_desc->certificate_addr, dpm_desc->public_key_addr, dpm_desc->certificate_size,dpm_desc->public_key_size);
diff --git a/tbsa-v8m/test_pool/mem/test_m001/secure.c b/tbsa-v8m/test_pool/mem/test_m001/secure.c
index 61f24fa..358cc5f 100644
--- a/tbsa-v8m/test_pool/mem/test_m001/secure.c
+++ b/tbsa-v8m/test_pool/mem/test_m001/secure.c
@@ -46,16 +46,16 @@
__attribute__((naked))
void HF_Handler(void)
{
- asm volatile("mrs r0, control_ns \n"
- "mov r1, #0x2 \n"
- "and r0, r1 \n"
- "cmp r0, r1 \n"
- "beq _psp_ns \n"
- "mrs r0, msp_ns \n"
- "b hard_fault_esr \n"
- "_psp_ns: \n"
- "mrs r0, psp_ns \n"
- "b hard_fault_esr \n");
+ __asm volatile("mrs r0, control_ns \n"
+ "mov r1, #0x2 \n"
+ "and r0, r1 \n"
+ "cmp r0, r1 \n"
+ "beq _psp_ns \n"
+ "mrs r0, msp_ns \n"
+ "b hard_fault_esr \n"
+ "_psp_ns: \n"
+ "mrs r0, psp_ns \n"
+ "b hard_fault_esr \n");
}
tbsa_status_t setup_ns_env(void)
diff --git a/tbsa-v8m/test_pool/peripherals/test_p001/secure.c b/tbsa-v8m/test_pool/peripherals/test_p001/secure.c
index fa190fe..5d850ef 100644
--- a/tbsa-v8m/test_pool/peripherals/test_p001/secure.c
+++ b/tbsa-v8m/test_pool/peripherals/test_p001/secure.c
@@ -42,16 +42,16 @@
__attribute__((naked))
void HF_Handler(void)
{
- asm volatile("mrs r0, control_ns \n"
- "mov r1, #0x2 \n"
- "and r0, r1 \n"
- "cmp r0, r1 \n"
- "beq _psp_ns \n"
- "mrs r0, msp_ns \n"
- "b hard_fault_esr \n"
- "_psp_ns: \n"
- "mrs r0, psp_ns \n"
- "b hard_fault_esr \n");
+ __asm volatile("mrs r0, control_ns \n"
+ "mov r1, #0x2 \n"
+ "and r0, r1 \n"
+ "cmp r0, r1 \n"
+ "beq _psp_ns \n"
+ "mrs r0, msp_ns \n"
+ "b hard_fault_esr \n"
+ "_psp_ns: \n"
+ "mrs r0, psp_ns \n"
+ "b hard_fault_esr \n");
}
void entry_hook(tbsa_val_api_t *val)
diff --git a/tbsa-v8m/test_pool/timer/test_t001/secure.c b/tbsa-v8m/test_pool/timer/test_t001/secure.c
index abd8fe9..59b654a 100644
--- a/tbsa-v8m/test_pool/timer/test_t001/secure.c
+++ b/tbsa-v8m/test_pool/timer/test_t001/secure.c
@@ -58,16 +58,16 @@
__attribute__((naked))
void HF_Handler(void)
{
- asm volatile("mrs r0, control_ns \n"
- "mov r1, #0x2 \n"
- "and r0, r1 \n"
- "cmp r0, r1 \n"
- "beq _psp_ns \n"
- "mrs r0, msp_ns \n"
- "b hard_fault_esr \n"
- "_psp_ns: \n"
- "mrs r0, psp_ns \n"
- "b hard_fault_esr \n");
+ __asm volatile("mrs r0, control_ns \n"
+ "mov r1, #0x2 \n"
+ "and r0, r1 \n"
+ "cmp r0, r1 \n"
+ "beq _psp_ns \n"
+ "mrs r0, msp_ns \n"
+ "b hard_fault_esr \n"
+ "_psp_ns: \n"
+ "mrs r0, psp_ns \n"
+ "b hard_fault_esr \n");
}
void entry_hook(tbsa_val_api_t *val)
diff --git a/tbsa-v8m/test_pool/timer/test_t002/secure.c b/tbsa-v8m/test_pool/timer/test_t002/secure.c
index d7cdad5..6e3b7c1 100644
--- a/tbsa-v8m/test_pool/timer/test_t002/secure.c
+++ b/tbsa-v8m/test_pool/timer/test_t002/secure.c
@@ -52,16 +52,16 @@
__attribute__((naked))
void HF_Handler(void)
{
- asm volatile("mrs r0, control_ns \n"
- "mov r1, #0x2 \n"
- "and r0, r1 \n"
- "cmp r0, r1 \n"
- "beq _psp_ns \n"
- "mrs r0, msp_ns \n"
- "b hard_fault_esr \n"
- "_psp_ns: \n"
- "mrs r0, psp_ns \n"
- "b hard_fault_esr \n");
+ __asm volatile("mrs r0, control_ns \n"
+ "mov r1, #0x2 \n"
+ "and r0, r1 \n"
+ "cmp r0, r1 \n"
+ "beq _psp_ns \n"
+ "mrs r0, msp_ns \n"
+ "b hard_fault_esr \n"
+ "_psp_ns: \n"
+ "mrs r0, psp_ns \n"
+ "b hard_fault_esr \n");
}
void entry_hook(tbsa_val_api_t *val)
diff --git a/tbsa-v8m/test_pool/timer/test_t003/secure.c b/tbsa-v8m/test_pool/timer/test_t003/secure.c
index d40e850..ae0f687 100644
--- a/tbsa-v8m/test_pool/timer/test_t003/secure.c
+++ b/tbsa-v8m/test_pool/timer/test_t003/secure.c
@@ -43,16 +43,16 @@
__attribute__((naked)) void HF_Handler(void)
{
- asm volatile("mrs r0, control_ns \n"
- "mov r1, #0x2 \n"
- "and r0, r1 \n"
- "cmp r0, r1 \n"
- "beq _psp_ns \n"
- "mrs r0, msp_ns \n"
- "b hard_fault_esr \n"
- "_psp_ns: \n"
- "mrs r0, psp_ns \n"
- "b hard_fault_esr \n");
+ __asm volatile("mrs r0, control_ns \n"
+ "mov r1, #0x2 \n"
+ "and r0, r1 \n"
+ "cmp r0, r1 \n"
+ "beq _psp_ns \n"
+ "mrs r0, msp_ns \n"
+ "b hard_fault_esr \n"
+ "_psp_ns: \n"
+ "mrs r0, psp_ns \n"
+ "b hard_fault_esr \n");
}
void entry_hook(tbsa_val_api_t *val)
diff --git a/tbsa-v8m/test_pool/version_counters/test_v001/secure.c b/tbsa-v8m/test_pool/version_counters/test_v001/secure.c
index 021f628..3478128 100644
--- a/tbsa-v8m/test_pool/version_counters/test_v001/secure.c
+++ b/tbsa-v8m/test_pool/version_counters/test_v001/secure.c
@@ -41,16 +41,16 @@
__attribute__((naked))
void HF_Handler(void)
{
- asm volatile("mrs r0, control_ns \n"
- "mov r1, #0x2 \n"
- "and r0, r1 \n"
- "cmp r0, r1 \n"
- "beq _psp_ns \n"
- "mrs r0, msp_ns \n"
- "b hard_fault_esr \n"
- "_psp_ns: \n"
- "mrs r0, psp_ns \n"
- "b hard_fault_esr \n");
+ __asm volatile("mrs r0, control_ns \n"
+ "mov r1, #0x2 \n"
+ "and r0, r1 \n"
+ "cmp r0, r1 \n"
+ "beq _psp_ns \n"
+ "mrs r0, msp_ns \n"
+ "b hard_fault_esr \n"
+ "_psp_ns: \n"
+ "mrs r0, psp_ns \n"
+ "b hard_fault_esr \n");
}
void entry_hook(tbsa_val_api_t *val)
diff --git a/tbsa-v8m/val/src/val_debug.c b/tbsa-v8m/val/src/val_debug.c
index d991adb..bf5bbe0 100644
--- a/tbsa-v8m/val/src/val_debug.c
+++ b/tbsa-v8m/val/src/val_debug.c
@@ -118,16 +118,16 @@
return TBSA_STATUS_TIMEOUT;
}
*(uint32_t *)dpm_desc->flag_addr = dbg_status;
- asm volatile("DSB");
- asm volatile("ISB");
+ __asm volatile("DSB");
+ __asm volatile("ISB");
break;
case DBG_WRITE:
*(uint32_t *)dpm_desc->flag_addr = dbg_status | DBG_FLAG_TXFULL;
break;
case DBG_READ:
*(uint32_t *)dpm_desc->flag_addr &= ~DBG_FLAG_RXFULL;
- asm volatile("DSB");
- asm volatile("ISB");
+ __asm volatile("DSB");
+ __asm volatile("ISB");
break;
default:
return TBSA_STATUS_INCORRECT_VALUE;
diff --git a/tbsa-v8m/val/src/val_ns_callable.c b/tbsa-v8m/val/src/val_ns_callable.c
index 8b1adfa..d9cbd5a 100644
--- a/tbsa-v8m/val/src/val_ns_callable.c
+++ b/tbsa-v8m/val/src/val_ns_callable.c
@@ -22,7 +22,7 @@
#define TRANSITION_NS_TO_S(fn_ret, fn_name, ...) \
__attribute__((section(".tbsa_nsc_entry_points"), naked)) \
fn_ret fn_name ## _nsc(__VA_ARGS__) { \
- asm volatile( \
+ __asm volatile( \
"sg \n" \
"push {r7} \n" \
"push {lr} \n" \