From fcd9ab3f5026c71c0f89906f434b091552bf8ca3 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 30 Jan 2010 01:46:16 +0000
Subject: [PATCH] fix macros...

svn path=/branches/ros-amd64-bringup/; revision=45334
---
 reactos/include/reactos/asm.h | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/reactos/include/reactos/asm.h b/reactos/include/reactos/asm.h
index 2e08472ab42..46e1e5c94cb 100644
--- a/reactos/include/reactos/asm.h
+++ b/reactos/include/reactos/asm.h
@@ -18,7 +18,7 @@ OPTION DOTNAME
 #define VAL(x) x
 
 /* MASM/ML doesn't want explicit [rip] addressing */
-#define RIP(address) address
+#define RIP(address) [address]
 
 /* Due to MASM's reverse syntax, we are forced to use a precompiler macro */
 #define MACRO(name, ...) name MACRO __VA_ARGS__
@@ -33,8 +33,13 @@ ENDM
     name ENDP
 ENDM
 
-/* MASM doesn't have an ASCIIZ macro */
-.ASCIIZ MACRO text
+/* MASM doesn't have an ASCII macro */
+.ASCII MACRO text
+    DB text
+ENDM
+
+/* MASM doesn't have an ASCIZ macro */
+.ASCIZ MACRO text
     DB text, 0
 ENDM
 
@@ -98,13 +103,14 @@ ENDM
     .set cfa_current_offset, cfa_current_offset - \size
 .endm
 
-.macro .pushframe code
-    .if (\code == 0)
-        .cfi_adjust_cfa_offset 0x28
-        .set cfa_current_offset, cfa_current_offset - 0x28
-    .else
+code = 1
+.macro .pushframe param=0
+    .if (\param)
         .cfi_adjust_cfa_offset 0x30
         .set cfa_current_offset, cfa_current_offset - 0x30
+    .else
+        .cfi_adjust_cfa_offset 0x28
+        .set cfa_current_offset, cfa_current_offset - 0x28
     .endif
 .endm