Steal the kernel's __ASM_SEL() implementation and use it to consolidate
ASM_TRY(). The only difference between the 32-bit and 64-bit versions is
the size of the address stored in the table.
No functional change intended.
Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---
lib/x86/desc.h | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/lib/x86/desc.h b/lib/x86/desc.h
index 2a285eb..10ba8cb 100644
--- a/lib/x86/desc.h
+++ b/lib/x86/desc.h
@@ -3,6 +3,18 @@
#include <setjmp.h>
+#ifdef __ASSEMBLY__
+#define __ASM_FORM(x, ...) x,## __VA_ARGS__
+#else
+#define __ASM_FORM(x, ...) " " xstr(x,##__VA_ARGS__) " "
+#endif
+
+#ifndef __x86_64__
+#define __ASM_SEL(a,b) __ASM_FORM(a)
+#else
+#define __ASM_SEL(a,b) __ASM_FORM(b)
+#endif
+
void setup_idt(void);
void load_idt(void);
void setup_alt_stack(void);
@@ -80,21 +92,12 @@ typedef struct __attribute__((packed)) {
u16 iomap_base;
} tss64_t;
-#ifdef __x86_64
-#define ASM_TRY(catch) \
- "movl $0, %%gs:4 \n\t" \
- ".pushsection .data.ex \n\t" \
- ".quad 1111f, " catch "\n\t" \
- ".popsection \n\t" \
+#define ASM_TRY(catch) \
+ "movl $0, %%gs:4 \n\t" \
+ ".pushsection .data.ex \n\t" \
+ __ASM_SEL(.long, .quad) " 1111f, " catch "\n\t" \
+ ".popsection \n\t" \
"1111:"
-#else
-#define ASM_TRY(catch) \
- "movl $0, %%gs:4 \n\t" \
- ".pushsection .data.ex \n\t" \
- ".long 1111f, " catch "\n\t" \
- ".popsection \n\t" \
- "1111:"
-#endif
/*
* selector 32-bit 64-bit
--
2.37.1.559.g78731f0fdb-goog
