base/asm-common.h, *.S: Include metadata for 64-bit Windows stack unwinding.

[catacomb] / base / asm-common.h

diff --git a/base/asm-common.h b/base/asm-common.h
index bcfa7352536dec78ab2fa6435199d4ebe60967ca..0d32ccf90952bd5272236a75d4e12bf214078b85 100644 (file)
--- a/base/asm-common.h
+++ b/base/asm-common.h
@@ -33,12 +33,13 @@
 // Literal pools done the hard way.
 #define _LIT .text .L$_subsec + 1
 #define _ENDLIT .text .L$_subsec
+#define _LTORG .L$_subsec = .L$_subsec + 2; .text .L$_subsec
 
 // Announcing an external function.
 #define FUNC(name)                                                     \
        .globl  F(name);                                                \
        TYPE_FUNC(name);                                                \
-       .macro  ENDFUNC; _ENDFUNC(name); .endm;                         \
+       .macro ENDFUNC; _ENDFUNC(name); .endm;                          \
        FUNC_PREHOOK(name);                                             \
 F(name):                                                               \
        FUNC_POSTHOOK(name)
@@ -48,8 +49,20 @@ F(name):                                                             \
        .purgem ENDFUNC;                                                \
        SIZE_OBJ(name);                                                 \
        ENDFUNC_HOOK(name);                                             \
-       .L$_subsec = .L$_subsec + 2;                                    \
-       .text .L$_subsec
+       _LTORG
+
+// Make a helper function, if necessary.
+#define AUXFN(name)                                                    \
+  .ifndef .L$_auxfn_def.name;                                          \
+       .text 7128;                                                     \
+       .macro _ENDAUXFN; _ENDAUXFN_TAIL(name); .endm;                  \
+       FUNC_PREHOOK(name);                                             \
+name:
+#define _ENDAUXFN_TAIL(name)                                           \
+       .purgem _ENDAUXFN;                                              \
+       .text .L$_subsec;                                               \
+       .L$_auxfn_def.name = 1
+#define ENDAUXFN _ENDAUXFN; .endif
 
 ///--------------------------------------------------------------------------
 /// ELF-specific hacking.
@@ -87,18 +100,26 @@ F(name):                                                           \
 // Set the function hooks.
 #define FUNC_PREHOOK(_) .balign 16
 
+// On Windows, arrange to install stack-unwinding data.
+#if CPUFAM_AMD64 && ABI_WIN
+#  define FUNC_POSTHOOK(name) .seh_proc name
+#  define ENDFUNC_HOOK(_) .seh_endproc
+// Procedures are expected to invoke `.seh_setframe' if necessary, and
+// `.seh_pushreg' and friends, and `.seh_endprologue'.
+#endif
+
 // Don't use the wretched AT&T syntax.  It's festooned with pointless
 // punctuation, and all of the data movement is backwards.  Ugh!
        .intel_syntax noprefix
 
 // Call external subroutine at ADDR, possibly via PLT.
-       .macro  callext addr
+.macro callext addr
 #if WANT_PIC
        call    \addr@PLT
 #else
        call    \addr
 #endif
-       .endm
+.endm
 
 // Do I need to arrange a spare GOT register?
 #if WANT_PIC && CPUFAM_X86
@@ -107,25 +128,19 @@ F(name):                                                          \
 #define GOTREG ebx                     // Not needed in AMD64 so don't care.
 
 // Maybe load GOT address into GOT.
-       .macro  ldgot got=GOTREG
+.macro ldgot got=GOTREG
 #if WANT_PIC && CPUFAM_X86
-       call    _where_am_i.\got
-       add     \got, offset _GLOBAL_OFFSET_TABLE_
-#endif
-       .endm
-
-// Maybe build a helper subroutine for `ldgot GOT'.
-       .macro  gotaux got=GOTREG
-#if WANT_PIC && CPUFAM_X86
-       .align  16
-_where_am_i.\got :
+  AUXFN(_ldgot.\got)
        mov     \got, [esp]
        ret
+  ENDAUXFN
+       call    _ldgot.\got
+       add     \got, offset _GLOBAL_OFFSET_TABLE_
 #endif
-       .endm
+.endm
 
 // Load address of external symbol ADDR into REG, maybe using GOT.
-       .macro  leaext reg, addr, got=GOTREG
+.macro leaext reg, addr, got=GOTREG
 #if WANT_PIC
 #  if CPUFAM_X86
        mov     \reg, [\got + \addr@GOT]
@@ -141,7 +156,7 @@ _where_am_i.\got :
        lea     \reg, \addr[rip]
 #  endif
 #endif
-       .endm
+.endm
 
 // Address expression (possibly using a base register, and a displacement)
 // referring to ADDR, which is within our module, maybe using GOT.
@@ -160,7 +175,7 @@ _where_am_i.\got :
 ///--------------------------------------------------------------------------
 /// ARM-specific hacking.
 
-#if CPUFAM_ARM
+#if CPUFAM_ARMEL
 
 // ARM/Thumb mode things.  Use ARM by default.
 #define ARM .arm; .L$_pcoff = 8
@@ -172,13 +187,13 @@ _where_am_i.\got :
 #define ENDFUNC_HOOK(name) .ltorg
 
 // Call external subroutine at ADDR, possibly via PLT.
-       .macro  callext addr, cond=
+.macro callext addr, cond=
 #if WANT_PIC
        bl\cond \addr(PLT)
 #else
        bl\cond \addr
 #endif
-       .endm
+.endm
 
 // Do I need to arrange a spare GOT register?
 #if WANT_PIC
@@ -187,36 +202,36 @@ _where_am_i.\got :
 #define GOTREG r9
 
 // Maybe load GOT address into GOT.
-       .macro  ldgot   cond=, got=GOTREG
+.macro ldgot   cond=, got=GOTREG
 #if WANT_PIC
        ldr\cond \got, .L$_ldgot$\@
 .L$_ldgot_pc$\@:
        add\cond \got, pc, \got
-       _LIT
+  _LIT
        .balign 4
 .L$_ldgot$\@:
        .word   _GLOBAL_OFFSET_TABLE_ - .L$_ldgot_pc$\@ - .L$_pcoff
-       _ENDLIT
+  _ENDLIT
 #endif
-       .endm
+.endm
 
 // Load address of external symbol ADDR into REG, maybe using GOT.
-       .macro  leaext  reg, addr, cond=, got=GOTREG
+.macro leaext  reg, addr, cond=, got=GOTREG
 #if WANT_PIC
        ldr\cond \reg, .L$_leaext$\@
        ldr\cond \reg, [\got, \reg]
-       _LIT
+  _LIT
        .balign 4
 .L$_leaext$\@:
        .word   \addr(GOT)
-       _ENDLIT
+  _ENDLIT
 #else
        ldr\cond \reg, =\addr
 #endif
-       .endm
+.endm
 
 // Load address of external symbol ADDR into REG directly.
-       .macro  leaextq reg, addr, cond=
+.macro leaextq reg, addr, cond=
 #if WANT_PIC
        ldr\cond \reg, .L$_leaextq$\@
 .L$_leaextq_pc$\@:
@@ -226,15 +241,15 @@ _where_am_i.\got :
        add\cond \reg, pc
        ldr\cond \reg, [\reg]
        .endif
-       _LIT
+  _LIT
        .balign 4
 .L$_leaextq$\@:
        .word   \addr(GOT_PREL) + (. - .L$_leaextq_pc$\@ - .L$_pcoff)
-       _ENDLIT
+  _ENDLIT
 #else
        ldr\cond \reg, =\addr
 #endif
-       .endm
+.endm
 
 #endif