Commit 709972b1 authored by H. Peter Anvin's avatar H. Peter Anvin

x86, asm: Make _ASM_EXTABLE() usable from assembly code

We have had this convenient macro _ASM_EXTABLE() to generate exception
table entry in inline assembly.  Make it also usable for pure
assembly.
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent fe9b4e4e
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
# define __ASM_FORM(x) x # define __ASM_FORM(x) x
# define __ASM_EX_SEC .section __ex_table # define __ASM_EX_SEC .section __ex_table, "a"
#else #else
# define __ASM_FORM(x) " " #x " " # define __ASM_FORM(x) " " #x " "
# define __ASM_EX_SEC " .section __ex_table,\"a\"\n" # define __ASM_EX_SEC " .section __ex_table,\"a\"\n"
...@@ -38,10 +38,18 @@ ...@@ -38,10 +38,18 @@
#define _ASM_DI __ASM_REG(di) #define _ASM_DI __ASM_REG(di)
/* Exception table entry */ /* Exception table entry */
#ifdef __ASSEMBLY__
# define _ASM_EXTABLE(from,to) \
__ASM_EX_SEC ; \
_ASM_ALIGN ; \
_ASM_PTR from , to ; \
.previous
#else
# define _ASM_EXTABLE(from,to) \ # define _ASM_EXTABLE(from,to) \
__ASM_EX_SEC \ __ASM_EX_SEC \
_ASM_ALIGN "\n" \ _ASM_ALIGN "\n" \
_ASM_PTR #from "," #to "\n" \ _ASM_PTR #from "," #to "\n" \
" .previous\n" " .previous\n"
#endif
#endif /* _ASM_X86_ASM_H */ #endif /* _ASM_X86_ASM_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment