x86, asm: Add 32-bit versions of the combined CFI macros

Add 32-bit versions of the combined CFI macros, equivalent to the
64-bit ones except, obviously, operating on 32-bit stack words.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/arch/x86/include/asm/dwarf2.h b/arch/x86/include/asm/dwarf2.h
index 3afc5e8..ae6253a 100644 (file)
--- a/arch/x86/include/asm/dwarf2.h
+++ b/arch/x86/include/asm/dwarf2.h
@@ -87,9 +87,25 @@
        CFI_RESTORE \reg
        .endm
 #else /*!CONFIG_X86_64*/
+       .macro pushl_cfi reg
+       pushl \reg
+       CFI_ADJUST_CFA_OFFSET 4
+       .endm
 
-       /* 32bit defenitions are missed yet */
+       .macro popl_cfi reg
+       popl \reg
+       CFI_ADJUST_CFA_OFFSET -4
+       .endm
 
+       .macro movl_cfi reg offset=0
+       movl %\reg, \offset(%esp)
+       CFI_REL_OFFSET \reg, \offset
+       .endm
+
+       .macro movl_cfi_restore offset reg
+       movl \offset(%esp), %\reg
+       CFI_RESTORE \reg
+       .endm
 #endif /*!CONFIG_X86_64*/
 #endif /*__ASSEMBLY__*/