PatchSet 5536
Date: 2005/03/13 15:16:35
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
(TLONGARR): Made static.
(getTLONGARR) Added.
* kaffe/kaffevm/verifier/verify-type.h:
(TLONGARR) Removed prototype.
(getTLONGARR) Added prototype.
* kaffe/kaffevm/verifier/verify-debug.c,
kaffe/kaffevm/verifier/verify-block.c:
Replaced use of TLONGARR by getTLONGARR.
Members:
ChangeLog:1.3710->1.3711
kaffe/kaffevm/verifier/verify-block.c:1.9->1.10
kaffe/kaffevm/verifier/verify-debug.c:1.5->1.6
kaffe/kaffevm/verifier/verify-type.c:1.12->1.13
kaffe/kaffevm/verifier/verify-type.h:1.9->1.10
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3710 kaffe/ChangeLog:1.3711
--- kaffe/ChangeLog:1.3710 Sun Mar 13 15:03:15 2005
+++ kaffe/ChangeLog Sun Mar 13 15:16:35 2005
@@ -1,6 +1,20 @@
2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/verifier/verify-type.c
+ (TLONGARR): Made static.
+ (getTLONGARR) Added.
+
+ * kaffe/kaffevm/verifier/verify-type.h:
+ (TLONGARR) Removed prototype.
+ (getTLONGARR) Added prototype.
+
+ * kaffe/kaffevm/verifier/verify-debug.c,
+ kaffe/kaffevm/verifier/verify-block.c:
+ Replaced use of TLONGARR by getTLONGARR.
+
+2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/verifier/verify-type.c
(TFLOATARR): Made static.
(getTFLOATARR) Added.
Index: kaffe/kaffe/kaffevm/verifier/verify-block.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-block.c:1.9
kaffe/kaffe/kaffevm/verifier/verify-block.c:1.10
--- kaffe/kaffe/kaffevm/verifier/verify-block.c:1.9 Sun Mar 13 15:03:19 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-block.c Sun Mar 13 15:16:39 2005
@@ -727,7 +727,7 @@
case TYPE_Byte: OPSTACK_PUSH(TBYTEARR); break;
case TYPE_Short: OPSTACK_PUSH(TSHORTARR); break;
case TYPE_Int: OPSTACK_PUSH(TINTARR); break;
- case TYPE_Long: OPSTACK_PUSH(TLONGARR); break;
+ case TYPE_Long: OPSTACK_PUSH(getTLONGARR()); break;
default: return verifyError(v, "newarray of unknown
type");
}
break;
@@ -786,7 +786,7 @@
case CALOAD: ARRAY_LOAD(TINT, TCHARARR); break;
case SALOAD: ARRAY_LOAD(TINT, TSHORTARR); break;
- case LALOAD: ARRAY_WLOAD(TLONG, TLONGARR); break;
+ case LALOAD: ARRAY_WLOAD(TLONG, getTLONGARR()); break;
case DALOAD: ARRAY_WLOAD(TDOUBLE, getTDOUBLEARR()); break;
#undef ARRAY_LOAD
#undef ARRAY_WLOAD
@@ -871,7 +871,7 @@
case CASTORE: ARRAY_STORE(TINT, TCHARARR); break;
case SASTORE: ARRAY_STORE(TINT, TSHORTARR); break;
- case LASTORE: ARRAY_WSTORE(TLONG, TLONGARR); break;
+ case LASTORE: ARRAY_WSTORE(TLONG, getTLONGARR()); break;
case DASTORE: ARRAY_WSTORE(TDOUBLE, getTDOUBLEARR()); break;
#undef ARRAY_STORE
#undef ARRAY_WSTORE
Index: kaffe/kaffe/kaffevm/verifier/verify-debug.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.5
kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.6
--- kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.5 Sun Mar 13 15:03:19 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-debug.c Sun Mar 13 15:16:40 2005
@@ -471,7 +471,7 @@
else if (type == TINTARR->data.class) {
dprintf("TINTARR");
}
- else if (type == TLONGARR->data.class) {
+ else if (type == getTLONGARR()->data.class) {
dprintf("TLONGARR");
}
else if (type == getTFLOATARR()->data.class) {
Index: kaffe/kaffe/kaffevm/verifier/verify-type.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.c:1.12
kaffe/kaffe/kaffevm/verifier/verify-type.c:1.13
--- kaffe/kaffe/kaffevm/verifier/verify-type.c:1.12 Sun Mar 13 15:03:19 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.c Sun Mar 13 15:16:40 2005
@@ -106,7 +106,12 @@
static const char* LONGARR_SIG = "[J";
static Type verify_LONGARR;
-Type* TLONGARR = &verify_LONGARR;
+static Type* TLONGARR = &verify_LONGARR;
+
+Type* getTLONGARR(void)
+{
+ return TLONGARR;
+}
static const char* FLOATARR_SIG = "[F";
static Type verify_FLOATARR;
Index: kaffe/kaffe/kaffevm/verifier/verify-type.h
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.h:1.9
kaffe/kaffe/kaffevm/verifier/verify-type.h:1.10
--- kaffe/kaffe/kaffevm/verifier/verify-type.h:1.9 Sun Mar 13 15:03:19 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.h Sun Mar 13 15:16:40 2005
@@ -110,7 +110,7 @@
extern Type* TBOOLARR;
extern Type* TSHORTARR;
extern Type* TINTARR;
-extern Type* TLONGARR;
+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
