[PATCH v3 4/5] loongarch/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust
FUJITA Tomonori
fujita.tomonori at gmail.com
Thu Feb 13 05:57:58 PST 2025
Add new ARCH_WARN_ASM macro for BUG/WARN assembly code sharing with
Rust to avoid the duplication.
No functional changes.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at gmail.com>
---
arch/loongarch/include/asm/bug.h | 35 ++++++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/arch/loongarch/include/asm/bug.h b/arch/loongarch/include/asm/bug.h
index f6f254f2c5db..06903aef1101 100644
--- a/arch/loongarch/include/asm/bug.h
+++ b/arch/loongarch/include/asm/bug.h
@@ -22,14 +22,21 @@
#ifndef CONFIG_GENERIC_BUG
#define __BUG_ENTRY(flags)
#else
-#define __BUG_ENTRY(flags) \
+
+#define __BUG_ENTRY_START \
.pushsection __bug_table, "aw"; \
.align 2; \
10000: .long 10001f - .; \
- _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \
- .short flags; \
+
+#define __BUG_ENTRY_END \
.popsection; \
10001:
+
+#define __BUG_ENTRY(flags) \
+ __BUG_ENTRY_START \
+ _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \
+ .short flags; \
+ __BUG_ENTRY_END
#endif
#define ASM_BUG_FLAGS(flags) \
@@ -42,10 +49,12 @@
asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags)) \
extra);
+#define ARCH_WARN_REACHABLE ANNOTATE_REACHABLE(10001b)
+
#define __WARN_FLAGS(flags) \
do { \
instrumentation_begin(); \
- __BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE(10001b));\
+ __BUG_FLAGS(BUGFLAG_WARNING|(flags), ARCH_WARN_REACHABLE);\
instrumentation_end(); \
} while (0)
@@ -56,6 +65,24 @@ do { \
unreachable(); \
} while (0)
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+#define __BUG_LOCATION_STRING(file, line) \
+ ".long " file "- .;" \
+ ".short " line ";"
+#else
+#define __BUG_LOCATION_STRING(file, line)
+#endif
+
+#define __BUG_ENTRY_STRING(file, line, flags) \
+ __stringify(__BUG_ENTRY_START) \
+ __BUG_LOCATION_STRING(file, line) \
+ ".short " flags ";" \
+ __stringify(__BUG_ENTRY_END)
+
+#define ARCH_WARN_ASM(file, line, flags, size) \
+ __BUG_ENTRY_STRING(file, line, flags) \
+ __stringify(break BRK_BUG) ";"
+
#define HAVE_ARCH_BUG
#include <asm-generic/bug.h>
--
2.43.0
More information about the linux-riscv
mailing list