PatchSet 4431
Date: 2004/02/16 15:37:34
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Replaced macro by static inline function
2004-02-16 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/verify.c
(getOpstackWTop): New static inline function.
(OPSTACK_WTOP) Removed.
Replaced use of OPSTACK_WTOP by getOpstackWTop.
Members:
ChangeLog:1.2014->1.2015
kaffe/kaffevm/verify.c:1.47->1.48
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2014 kaffe/ChangeLog:1.2015
--- kaffe/ChangeLog:1.2014 Mon Feb 16 15:01:48 2004
+++ kaffe/ChangeLog Mon Feb 16 15:37:34 2004
@@ -1,9 +1,16 @@
+2004-02-16 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/verify.c
+ (getOpstackWTop): New static inline function.
+ (OPSTACK_WTOP) Removed.
+ Replaced use of OPSTACK_WTOP by getOpstackWTop.
+
2004-02-15 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/verify.c
(getOpstackTop): New static inline function.
(OPSTACK_TOP) Removed.
- Replaced use of OPSTACK_Top by getOpstackTop.
+ Replaced use of OPSTACK_TOP by getOpstackTop.
2004-02-15 Dalibor Topic <[EMAIL PROTECTED]>
Index: kaffe/kaffe/kaffevm/verify.c
diff -u kaffe/kaffe/kaffevm/verify.c:1.47 kaffe/kaffe/kaffevm/verify.c:1.48
--- kaffe/kaffe/kaffevm/verify.c:1.47 Mon Feb 16 15:01:50 2004
+++ kaffe/kaffe/kaffevm/verify.c Mon Feb 16 15:37:35 2004
@@ -2579,6 +2579,18 @@
}
/*
+ * Helper function for opstack access in verifyBasicBlock.
+ *
+ * @return second item on the operand stack from the top.
+ */
+static inline
+Type *
+getOpstackWTop(BlockInfo* block)
+{
+ return getOpstackItem(block, 2);
+}
+
+/*
* verifyBasicBlock()
* Simulates execution of a basic block by modifying its simulated operand stack
and local variable array.
*/
@@ -2660,9 +2672,6 @@
return verifyErrorInVerifyBasicBlock(einfo, method, this, "stack
overflow"); \
}
-
-#define OPSTACK_WTOP getOpstackItem(block, 2)
-
#define OPSTACK_INFO(_N) \
(block->opstack[block->stacksz - _N].tinfo)
@@ -2711,7 +2720,7 @@
#define OPSTACK_WPEEK_T_BLIND(_TINFO) \
if (getOpstackTop(block)->data.class != TWIDE->data.class) { \
return verifyErrorInVerifyBasicBlock(einfo, method, this, "trying to
pop a wide value off operand stack where there is none"); \
- } else if (OPSTACK_WTOP->data.class != (_TINFO)->data.class) { \
+ } else if (getOpstackWTop(block)->data.class != (_TINFO)->data.class) { \
return verifyErrorInVerifyBasicBlock(einfo, method, this, "mismatched
stack types"); \
}
@@ -3638,7 +3647,7 @@
case IF_ACMPNE:
ENSURE_OPSTACK_SIZE(2);
if (!isReference(getOpstackTop(block)) ||
- !isReference(OPSTACK_WTOP)) {
+ !isReference(getOpstackWTop(block))) {
return verifyErrorInVerifyBasicBlock(einfo, method,
this, "if_acmp* when item on top of stack is not a reference type");
}
OPSTACK_POP_BLIND;
@@ -3795,7 +3804,7 @@
case DUP_X1:
ENSURE_OPSTACK_SIZE(2);
- if (isWide(getOpstackTop(block)) || isWide(OPSTACK_WTOP)) {
+ if (isWide(getOpstackTop(block)) ||
isWide(getOpstackWTop(block))) {
return verifyErrorInVerifyBasicBlock(einfo, method,
this, "dup_x1: splits up a double or long");
}
@@ -3821,8 +3830,8 @@
case DUP2:
ENSURE_OPSTACK_SIZE(2);
- OPSTACK_PUSH(OPSTACK_WTOP);
- OPSTACK_PUSH(OPSTACK_WTOP);
+ OPSTACK_PUSH(getOpstackWTop(block));
+ OPSTACK_PUSH(getOpstackWTop(block));
break;
case DUP2_X1:
@@ -3859,13 +3868,13 @@
case SWAP:
ENSURE_OPSTACK_SIZE(2);
- if (isWide(getOpstackTop(block)) || isWide(OPSTACK_WTOP)) {
+ if (isWide(getOpstackTop(block)) ||
isWide(getOpstackWTop(block))) {
return verifyErrorInVerifyBasicBlock(einfo, method,
this, "cannot swap 2 bytes of a long or double");
}
*type = *getOpstackTop(block);
- *getOpstackTop(block) = *OPSTACK_WTOP;
- *OPSTACK_WTOP = *type;
+ *getOpstackTop(block) = *getOpstackWTop(block);
+ *getOpstackWTop(block) = *type;
break;
@@ -3919,8 +3928,6 @@
#undef LOCALS_INFO
#undef OPSTACK_INFO
-
-#undef OPSTACK_WTOP
#undef CHECK_STACK_OVERFLOW
#undef ENSURE_OPSTACK_SIZE
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
