[ASM]: CORE-13850 #comment Fix MASM compilation errors with the CFI annotation macros...

svn path=/trunk/; revision=75996

diff --git a/reactos/sdk/include/asm/asm.inc b/reactos/sdk/include/asm/asm.inc
index ac515f5..fdedfdb 100644 (file)
--- a/reactos/sdk/include/asm/asm.inc
+++ b/reactos/sdk/include/asm/asm.inc
@@ -201,16 +201,26 @@ ENDM
 #define NUL 0\r
 \r
 /* For compatibility with GAS */\r
 #define NUL 0\r
 \r
 /* For compatibility with GAS */\r

-#define CFI_STARTPROC\r
-#define CFI_ENDPROC\r
-#define CFI_ADJUST_CFA_OFFSET\r
-#define CFI_OFFSET\r
-#define CFI_REGISTER\r
-#define CFI_DEF_CFA_REGISTER\r
-#define CFI_DEF_CFA\r
-#define CFI_REL_OFFSET\r
-#define CFI_SAME_VALUE\r
-#define CFI_DEF_CFA_OFFSET\r
+CFI_STARTPROC MACRO start\r
+ENDM\r
+CFI_ENDPROC MACRO\r
+ENDM\r
+CFI_DEF_CFA MACRO reg:REQ, offset:REQ\r
+ENDM\r
+CFI_DEF_CFA_OFFSET MACRO offset:REQ\r
+ENDM\r
+CFI_DEF_CFA_REGISTER MACRO reg:REQ\r
+ENDM\r
+CFI_ADJUST_CFA_OFFSET MACRO offset:REQ\r
+ENDM\r
+CFI_OFFSET MACRO reg:REQ, offset:REQ\r
+ENDM\r
+CFI_REGISTER MACRO reg1:REQ, reg2:REQ\r
+ENDM\r
+CFI_REL_OFFSET MACRO reg:REQ, offset:REQ\r
+ENDM\r
+CFI_SAME_VALUE MACRO reg:REQ\r
+ENDM\r

 \r
 #else /***********************************************************************/\r
 \r
 \r
 #else /***********************************************************************/\r
 \r


@@ -387,14 +397,14 @@ code = 1
 /* CFI annotations */\r
 #define CFI_STARTPROC .cfi_startproc\r
 #define CFI_ENDPROC .cfi_endproc\r
 /* CFI annotations */\r
 #define CFI_STARTPROC .cfi_startproc\r
 #define CFI_ENDPROC .cfi_endproc\r

+#define CFI_DEF_CFA .cfi_def_cfa\r
+#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset\r
+#define CFI_DEF_CFA_REGISTER .cfi_def_cfa_register\r

 #define CFI_ADJUST_CFA_OFFSET .cfi_adjust_cfa_offset\r
 #define CFI_OFFSET .cfi_offset\r
 #define CFI_REGISTER .cfi_register\r
 #define CFI_ADJUST_CFA_OFFSET .cfi_adjust_cfa_offset\r
 #define CFI_OFFSET .cfi_offset\r
 #define CFI_REGISTER .cfi_register\r

-#define CFI_DEF_CFA_REGISTER .cfi_def_cfa_register\r
-#define CFI_DEF_CFA .cfi_def_cfa\r

 #define CFI_REL_OFFSET .cfi_rel_offset\r
 #define CFI_SAME_VALUE .cfi_same_value\r
 #define CFI_REL_OFFSET .cfi_rel_offset\r
 #define CFI_SAME_VALUE .cfi_same_value\r

-#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r