PatchSet 5544
Date: 2005/03/13 16:47:19
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Cross-compilation fix for verifier
2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/verifier/verify-type.c
(TNULL): Made static.
(getTNULL) Added.
* kaffe/kaffevm/verifier/verify-type.h:
(TNULL) Removed prototype.
(getTNULL) Added prototype.
* kaffe/kaffevm/verifier/verify-block.c:
Replaced use of TNULL by getTNULL and isNull.
Members:
ChangeLog:1.3718->1.3719
kaffe/kaffevm/verifier/verify-block.c:1.17->1.18
kaffe/kaffevm/verifier/verify-type.c:1.20->1.21
kaffe/kaffevm/verifier/verify-type.h:1.17->1.18
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3718 kaffe/ChangeLog:1.3719
--- kaffe/ChangeLog:1.3718 Sun Mar 13 16:15:49 2005
+++ kaffe/ChangeLog Sun Mar 13 16:47:19 2005
@@ -1,6 +1,19 @@
2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/verifier/verify-type.c
+ (TNULL): Made static.
+ (getTNULL) Added.
+
+ * kaffe/kaffevm/verifier/verify-type.h:
+ (TNULL) Removed prototype.
+ (getTNULL) Added prototype.
+
+ * kaffe/kaffevm/verifier/verify-block.c:
+ Replaced use of TNULL by getTNULL and isNull.
+
+2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/verifier/verify-type.c
(TOBJARR): Made static.
(getTOBJARR) Added.
Index: kaffe/kaffe/kaffevm/verifier/verify-block.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-block.c:1.17
kaffe/kaffe/kaffevm/verifier/verify-block.c:1.18
--- kaffe/kaffe/kaffevm/verifier/verify-block.c:1.17 Sun Mar 13 16:15:54 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-block.c Sun Mar 13 16:47:20 2005
@@ -487,7 +487,7 @@
**************************************************************/
/* pushes NULL onto the stack, which matches any object
*/
case ACONST_NULL:
- OPSTACK_PUSH(TNULL);
+ OPSTACK_PUSH(getTNULL());
break;
/* iconst_<n> pushes n onto the stack */
@@ -774,7 +774,7 @@
type->tinfo = TINFO_SIG;
(type->data.sig)++;
}
- else if (type->data.class != TNULL->data.class) {
+ else if (!isNull(type)) {
type->tinfo = TINFO_SIG;
type->data.sig = CLASS_CNAME(type->data.class)
+ 1;
}
@@ -840,7 +840,7 @@
else {
if (arrayType->data.class ==
getTOBJARR()->data.class) {
*arrayType = *getTOBJ();
- } else if (arrayType->data.class !=
TNULL->data.class) {
+ } else if (!isNull(arrayType)) {
arrayType->tinfo = TINFO_SIG;
arrayType->data.sig =
CLASS_CNAME(arrayType->data.class) + 1;
}
Index: kaffe/kaffe/kaffevm/verifier/verify-type.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.c:1.20
kaffe/kaffe/kaffevm/verifier/verify-type.c:1.21
--- kaffe/kaffe/kaffevm/verifier/verify-type.c:1.20 Sun Mar 13 16:15:54 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.c Sun Mar 13 16:47:20 2005
@@ -59,7 +59,12 @@
}
static Type verify_NULL;
-Type* TNULL = &verify_NULL;
+static Type* TNULL = &verify_NULL;
+
+Type* getTNULL(void)
+{
+ return TNULL;
+}
bool
isNull(const Type * t)
Index: kaffe/kaffe/kaffevm/verifier/verify-type.h
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.h:1.17
kaffe/kaffe/kaffevm/verifier/verify-type.h:1.18
--- kaffe/kaffe/kaffevm/verifier/verify-type.h:1.17 Sun Mar 13 16:15:54 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.h Sun Mar 13 16:47:20 2005
@@ -99,7 +99,7 @@
extern Type* TFLOAT;
extern Type* TLONG;
extern Type* TDOUBLE;
-extern Type* TNULL;
+extern Type* getTNULL(void);
extern Type* TWIDE;
extern Type* getTOBJ(void);
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
