You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2026/10/26 18:58:13 UTC
(mynewt-core) 02/09: kernel/os: Use __asm instead of asm
This is an automated email from the ASF dual-hosted git repository.
sjanc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 99d45bb703b1970ab7c96d98d38891aac91d8cde
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Tue Oct 20 00:54:03 2026 +0200
kernel/os: Use __asm instead of asm
asm is a GNU extension keyword that is not available when compiling
with -std=c11. Use __asm which is always available in GCC and clang.
Assisted-by: Claude:claude-opus-5-5
---
kernel/os/src/arch/cortex_m3/os_fault.c | 2 +-
kernel/os/src/arch/cortex_m33/os_fault.c | 48 ++++++++++++++++----------------
kernel/os/src/arch/cortex_m4/os_fault.c | 2 +-
kernel/os/src/arch/cortex_m7/os_fault.c | 2 +-
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/kernel/os/src/arch/cortex_m3/os_fault.c b/kernel/os/src/arch/cortex_m3/os_fault.c
index df815fb46..7cbee941f 100644
--- a/kernel/os/src/arch/cortex_m3/os_fault.c
+++ b/kernel/os/src/arch/cortex_m3/os_fault.c
@@ -135,7 +135,7 @@ __assert_func(const char *file, int line, const char *func, const char *e)
#endif
SCB->ICSR = SCB_ICSR_NMIPENDSET_Msk;
- asm("isb");
+ __asm("isb");
hal_system_reset();
}
diff --git a/kernel/os/src/arch/cortex_m33/os_fault.c b/kernel/os/src/arch/cortex_m33/os_fault.c
index 7dc370360..8555da45c 100644
--- a/kernel/os/src/arch/cortex_m33/os_fault.c
+++ b/kernel/os/src/arch/cortex_m33/os_fault.c
@@ -134,34 +134,34 @@ mtb_stop(void)
* Store MTB registers in mtb_state_at_crash so it can be used for
* crash analyzes.
*/
- asm volatile (".syntax unified \n"
- " ldr r1, =0xe00ff000 \n"
- " ldr r2, [r1, #0x1c] \n"
- " tst r2, #1 \n"
- " beq 1f \n"
- " bic r2, #0x00ff \n"
- " bic r2, #0x0f00 \n"
- " add r1, r2 \n"
- " ldr r2, [r1, #4] \n"
- " bic r2, #0x80000000 \n"
- " str r2, [r1, #4] \n"
+ __asm volatile(".syntax unified \n"
+ " ldr r1, =0xe00ff000 \n"
+ " ldr r2, [r1, #0x1c] \n"
+ " tst r2, #1 \n"
+ " beq 1f \n"
+ " bic r2, #0x00ff \n"
+ " bic r2, #0x0f00 \n"
+ " add r1, r2 \n"
+ " ldr r2, [r1, #4] \n"
+ " bic r2, #0x80000000 \n"
+ " str r2, [r1, #4] \n"
#if MYNEWT_VAL(OS_COREDUMP)
- " str r2, [%[mtbs], #4]\n"
- " ldr r2, [r1] \n"
- " str r2, [%[mtbs]] \n"
- " ldr r2, [r1, #8] \n"
- " str r2, [%[mtbs], #8]\n"
- " ldr r2, [r1, #12] \n"
- " str r2, [%[mtbs], #12]\n"
+ " str r2, [%[mtbs], #4]\n"
+ " ldr r2, [r1] \n"
+ " str r2, [%[mtbs]] \n"
+ " ldr r2, [r1, #8] \n"
+ " str r2, [%[mtbs], #8]\n"
+ " ldr r2, [r1, #12] \n"
+ " str r2, [%[mtbs], #12]\n"
#endif /* MYNEWT_VAL(OS_COREDUMP) */
- " 1: \n"
- :
+ " 1: \n"
+ :
#if MYNEWT_VAL(OS_COREDUMP)
- : [mtbs] "r" (&mtb_state_at_crash)
+ : [mtbs] "r"(&mtb_state_at_crash)
#else
- :
+ :
#endif
- : "r1", "r2");
+ : "r1", "r2");
}
void
@@ -196,7 +196,7 @@ __assert_func(const char *file, int line, const char *func, const char *e)
#endif
SCB->ICSR = SCB_ICSR_PENDNMISET_Msk;
- asm("isb");
+ __asm("isb");
hal_system_reset();
}
diff --git a/kernel/os/src/arch/cortex_m4/os_fault.c b/kernel/os/src/arch/cortex_m4/os_fault.c
index 019c27fbf..7e5847d8d 100644
--- a/kernel/os/src/arch/cortex_m4/os_fault.c
+++ b/kernel/os/src/arch/cortex_m4/os_fault.c
@@ -151,7 +151,7 @@ __assert_func(const char *file, int line, const char *func, const char *e)
#endif
SCB->ICSR = SCB_ICSR_NMIPENDSET_Msk;
- asm("isb");
+ __asm("isb");
hal_system_reset();
}
diff --git a/kernel/os/src/arch/cortex_m7/os_fault.c b/kernel/os/src/arch/cortex_m7/os_fault.c
index 9f3cb21d1..603bbdcfc 100644
--- a/kernel/os/src/arch/cortex_m7/os_fault.c
+++ b/kernel/os/src/arch/cortex_m7/os_fault.c
@@ -134,7 +134,7 @@ __assert_func(const char *file, int line, const char *func, const char *e)
#endif
SCB->ICSR = SCB_ICSR_NMIPENDSET_Msk;
- asm("isb");
+ __asm("isb");
hal_system_reset();
}