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

[Kaffe CVS]

PatchSet 4439 
Date: 2004/02/16 21:59:37
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
        (opstackPopNBlind): New static inline function.
        (OPSTACK_POP_N_BLIND) Removed.
        Replaced use of OPSTACK_POP_N_BLIND by opstackPopNBlind.

Members: 
	ChangeLog:1.2022->1.2023 
	kaffe/kaffevm/verify.c:1.55->1.56 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2022 kaffe/ChangeLog:1.2023
--- kaffe/ChangeLog:1.2022	Mon Feb 16 21:36:15 2004
+++ kaffe/ChangeLog	Mon Feb 16 21:59:37 2004
@@ -1,6 +1,13 @@
 2004-02-16  Dalibor Topic <robilad at kaffe.org>
 
         * kaffe/kaffevm/verify.c
+        (opstackPopNBlind): New static inline function.
+        (OPSTACK_POP_N_BLIND) Removed.
+        Replaced use of OPSTACK_POP_N_BLIND by opstackPopNBlind.
+
+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.
Index: kaffe/kaffe/kaffevm/verify.c
diff -u kaffe/kaffe/kaffevm/verify.c:1.55 kaffe/kaffe/kaffevm/verify.c:1.56
--- kaffe/kaffe/kaffevm/verify.c:1.55	Mon Feb 16 21:36:17 2004
+++ kaffe/kaffe/kaffevm/verify.c	Mon Feb 16 21:59:38 2004
@@ -2661,6 +2661,22 @@
 }
 
 /*
+ * Helper function for opstack access in verifyBasicBlock.
+ * pop _N things off the stack off the stack.
+ */
+static inline
+void
+opstackPopNBlind(BlockInfo* block,
+		 unsigned int n)
+{
+	unsigned int i;
+
+	for (i = 0; i < n; ++i) {
+		opstackPopBlind(block);
+	}
+}
+
+/*
  * Helper function for error reporting in OPSTACK_PEEK_T_BLIND macro in verifyBasicBlock.
  */
 static inline
@@ -2819,18 +2835,10 @@
 #define OPSTACK_WPOP_T(_TINFO) \
         OPSTACK_WPEEK_T(_TINFO); \
 	opstackWPopBlind(block)
-        
-
-	
-	/* pop _N things off the stack off the stack */
-#define OPSTACK_POP_N_BLIND(_N) \
-	for (n = 0; n < _N; n++) { \
-		opstackPopBlind(block); \
-	}
 	
 #define OPSTACK_POP_N(_N) \
         ENSURE_OPSTACK_SIZE(_N); \
-	OPSTACK_POP_N_BLIND(_N)
+	opstackPopNBlind(block, _N)
 	
 	
 	
@@ -3224,7 +3232,7 @@
 				return verifyErrorInVerifyBasicBlock(einfo, method, this, "attempting to store incompatible type in array");
 			}
 			
-			OPSTACK_POP_N_BLIND(3);
+			opstackPopNBlind(block, 3);
 			break;
 
 #define ARRAY_STORE(_T, _ARRT) \