[kaffe] CVS kaffe (dalibor): Replaced macro by static inline function

[Kaffe CVS]

PatchSet 4438 
Date: 2004/02/16 21:36:15
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Replaced macro by static inline function

2004-02-16  Dalibor Topic <robilad at kaffe.org>

        * kaffe/kaffevm/verify.c
        (opstackWPopBlind): New static inline function.
        (OPSTACK_WPOP_BLIND) Removed.
        Replaced use of OPSTACK_WPOP_BLIND by opstackWPopBlind.

Members: 
	ChangeLog:1.2021->1.2022 
	kaffe/kaffevm/verify.c:1.54->1.55 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2021 kaffe/ChangeLog:1.2022
--- kaffe/ChangeLog:1.2021	Mon Feb 16 21:04:50 2004
+++ kaffe/ChangeLog	Mon Feb 16 21:36:15 2004
@@ -1,6 +1,13 @@
 2004-02-16  Dalibor Topic <robilad at kaffe.org>
 
         * kaffe/kaffevm/verify.c
+        (opstackWPopBlind): New static inline function.
+        (OPSTACK_WPOP_BLIND) Removed.
+        Replaced use of OPSTACK_WPOP_BLIND by opstackWPopBlind.
+
+2004-02-16  Dalibor Topic <robilad at kaffe.org>
+
+        * kaffe/kaffevm/verify.c
         (opstackPopBlind): New static inline function.
         (OPSTACK_POP_BLIND) Removed.
         Replaced use of OPSTACK_POP_BLIND by opstackPopBlind.
Index: kaffe/kaffe/kaffevm/verify.c
diff -u kaffe/kaffe/kaffevm/verify.c:1.54 kaffe/kaffe/kaffevm/verify.c:1.55
--- kaffe/kaffe/kaffevm/verify.c:1.54	Mon Feb 16 21:04:52 2004
+++ kaffe/kaffe/kaffevm/verify.c	Mon Feb 16 21:36:17 2004
@@ -2650,6 +2650,17 @@
 }
 
 /*
+ * Helper function for opstack access in verifyBasicBlock.
+ */
+static inline
+void
+opstackWPopBlind(BlockInfo* block)
+{
+	opstackPopBlind(block);
+	opstackPopBlind(block);
+}
+
+/*
  * Helper function for error reporting in OPSTACK_PEEK_T_BLIND macro in verifyBasicBlock.
  */
 static inline
@@ -2796,24 +2807,18 @@
 	OPSTACK_PEEK_T(_TINFO); \
         opstackPopBlind(block)
 
-
-
-#define OPSTACK_WPOP_BLIND \
-	opstackPopBlind(block); \
-	opstackPopBlind(block)
-
 #define OPSTACK_WPOP \
 	ENSURE_OPSTACK_SIZE(2); \
-	OPSTACK_WPOP_BLIND
+	opstackWPopBlind(block)
 
 	/* pop a wide type off the stack and typecheck it */
 #define OPSTACK_WPOP_T_BLIND(_TINFO) \
 	OPSTACK_WPEEK_T_BLIND(_TINFO); \
-	OPSTACK_WPOP_BLIND
+	opstackWPopBlind(block)
 
 #define OPSTACK_WPOP_T(_TINFO) \
         OPSTACK_WPEEK_T(_TINFO); \
-	OPSTACK_WPOP_BLIND
+	opstackWPopBlind(block)
         
 
 	
@@ -3958,7 +3963,6 @@
 #undef OPSTACK_WPOP_T
 #undef OPSTACK_WPOP_T_BLIND
 #undef OPSTACK_WPOP
-#undef OPSTACK_WPOP_BLIND
 
 #undef OPSTACK_POP_T
 #undef OPSTACK_POP_T_BLIND