PatchSet 5537
Date: 2005/03/13 15:48:38
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
(TINTARR): Made static.
(getTINTARR) Added.
* kaffe/kaffevm/verifier/verify-type.h:
(TINTARR) Removed prototype.
(getTINTARR) Added prototype.
* kaffe/kaffevm/verifier/verify-debug.c,
kaffe/kaffevm/verifier/verify-block.c:
Replaced use of TINTARR by getTINTARR.
Members:
ChangeLog:1.3711->1.3712
kaffe/kaffevm/verifier/verify-block.c:1.10->1.11
kaffe/kaffevm/verifier/verify-debug.c:1.6->1.7
kaffe/kaffevm/verifier/verify-type.c:1.13->1.14
kaffe/kaffevm/verifier/verify-type.h:1.10->1.11
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3711 kaffe/ChangeLog:1.3712
--- kaffe/ChangeLog:1.3711 Sun Mar 13 15:16:35 2005
+++ kaffe/ChangeLog Sun Mar 13 15:48:38 2005
@@ -1,6 +1,20 @@
2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/verifier/verify-type.c
+ (TINTARR): Made static.
+ (getTINTARR) Added.
+
+ * kaffe/kaffevm/verifier/verify-type.h:
+ (TINTARR) Removed prototype.
+ (getTINTARR) Added prototype.
+
+ * kaffe/kaffevm/verifier/verify-debug.c,
+ kaffe/kaffevm/verifier/verify-block.c:
+ Replaced use of TINTARR by getTINTARR.
+
+2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/verifier/verify-type.c
(TLONGARR): Made static.
(getTLONGARR) Added.
Index: kaffe/kaffe/kaffevm/verifier/verify-block.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-block.c:1.10
kaffe/kaffe/kaffevm/verifier/verify-block.c:1.11
--- kaffe/kaffe/kaffevm/verifier/verify-block.c:1.10 Sun Mar 13 15:16:39 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-block.c Sun Mar 13 15:48:41 2005
@@ -726,7 +726,7 @@
case TYPE_Double: OPSTACK_PUSH(getTDOUBLEARR()); break;
case TYPE_Byte: OPSTACK_PUSH(TBYTEARR); break;
case TYPE_Short: OPSTACK_PUSH(TSHORTARR); break;
- case TYPE_Int: OPSTACK_PUSH(TINTARR); break;
+ case TYPE_Int: OPSTACK_PUSH(getTINTARR()); break;
case TYPE_Long: OPSTACK_PUSH(getTLONGARR()); break;
default: return verifyError(v, "newarray of unknown
type");
}
@@ -781,7 +781,7 @@
DBG(VERIFY3, dprintf("%sarray type: ", indent);
printType(type); dprintf("\n"); );
break;
- case IALOAD: ARRAY_LOAD(TINT, TINTARR); break;
+ case IALOAD: ARRAY_LOAD(TINT, getTINTARR()); break;
case FALOAD: ARRAY_LOAD(TFLOAT, getTFLOATARR()); break;
case CALOAD: ARRAY_LOAD(TINT, TCHARARR); break;
case SALOAD: ARRAY_LOAD(TINT, TSHORTARR); break;
@@ -866,7 +866,7 @@
- case IASTORE: ARRAY_STORE(TINT, TINTARR); break;
+ case IASTORE: ARRAY_STORE(TINT, getTINTARR()); break;
case FASTORE: ARRAY_STORE(TFLOAT, getTFLOATARR()); break;
case CASTORE: ARRAY_STORE(TINT, TCHARARR); break;
case SASTORE: ARRAY_STORE(TINT, TSHORTARR); break;
Index: kaffe/kaffe/kaffevm/verifier/verify-debug.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.6
kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.7
--- kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.6 Sun Mar 13 15:16:40 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-debug.c Sun Mar 13 15:48:41 2005
@@ -468,7 +468,7 @@
else if (type == TSHORTARR->data.class) {
dprintf("TSHORTARR");
}
- else if (type == TINTARR->data.class) {
+ else if (type == getTINTARR()->data.class) {
dprintf("TINTARR");
}
else if (type == getTLONGARR()->data.class) {
Index: kaffe/kaffe/kaffevm/verifier/verify-type.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.c:1.13
kaffe/kaffe/kaffevm/verifier/verify-type.c:1.14
--- kaffe/kaffe/kaffevm/verifier/verify-type.c:1.13 Sun Mar 13 15:16:40 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.c Sun Mar 13 15:48:41 2005
@@ -102,7 +102,12 @@
static const char* INTARR_SIG = "[I";
static Type verify_INTARR;
-Type* TINTARR = &verify_INTARR;
+static Type* TINTARR = &verify_INTARR;
+
+Type* getTINTARR(void)
+{
+ return TINTARR;
+}
static const char* LONGARR_SIG = "[J";
static Type verify_LONGARR;
Index: kaffe/kaffe/kaffevm/verifier/verify-type.h
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.h:1.10
kaffe/kaffe/kaffevm/verifier/verify-type.h:1.11
--- kaffe/kaffe/kaffevm/verifier/verify-type.h:1.10 Sun Mar 13 15:16:40 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.h Sun Mar 13 15:48:41 2005
@@ -109,7 +109,7 @@
extern Type* TBYTEARR;
extern Type* TBOOLARR;
extern Type* TSHORTARR;
-extern Type* TINTARR;
+extern Type* getTINTARR(void);
extern Type* getTLONGARR(void);
extern Type* getTFLOATARR(void);
extern Type* getTDOUBLEARR(void);
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
