PatchSet 5535
Date: 2005/03/13 15:03:15
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
(TFLOATARR): Made static.
(getTFLOATARR) Added.
* kaffe/kaffevm/verifier/verify-type.h:
(TFLOATARR) Removed prototype.
(getTFLOATARR) Added prototype.
* kaffe/kaffevm/verifier/verify-debug.c,
kaffe/kaffevm/verifier/verify-block.c:
Replaced use of TFLOATARR by getTFLOATARR.
Members:
ChangeLog:1.3709->1.3710
kaffe/kaffevm/verifier/verify-block.c:1.8->1.9
kaffe/kaffevm/verifier/verify-debug.c:1.4->1.5
kaffe/kaffevm/verifier/verify-type.c:1.11->1.12
kaffe/kaffevm/verifier/verify-type.h:1.8->1.9
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3709 kaffe/ChangeLog:1.3710
--- kaffe/ChangeLog:1.3709 Sun Mar 13 14:54:17 2005
+++ kaffe/ChangeLog Sun Mar 13 15:03:15 2005
@@ -1,6 +1,20 @@
2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/verifier/verify-type.c
+ (TFLOATARR): Made static.
+ (getTFLOATARR) Added.
+
+ * kaffe/kaffevm/verifier/verify-type.h:
+ (TFLOATARR) Removed prototype.
+ (getTFLOATARR) Added prototype.
+
+ * kaffe/kaffevm/verifier/verify-debug.c,
+ kaffe/kaffevm/verifier/verify-block.c:
+ Replaced use of TFLOATARR by getTFLOATARR.
+
+2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/verifier/verify-type.c
(TDOUBLEARR): Made static.
(getTDOUBLEARR) Added.
Index: kaffe/kaffe/kaffevm/verifier/verify-block.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-block.c:1.8
kaffe/kaffe/kaffevm/verifier/verify-block.c:1.9
--- kaffe/kaffe/kaffevm/verifier/verify-block.c:1.8 Sun Mar 13 14:54:19 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-block.c Sun Mar 13 15:03:19 2005
@@ -722,7 +722,7 @@
switch(code[pc + 1]) {
case TYPE_Boolean: OPSTACK_PUSH(TBOOLARR); break;
case TYPE_Char: OPSTACK_PUSH(TCHARARR); break;
- case TYPE_Float: OPSTACK_PUSH(TFLOATARR); break;
+ case TYPE_Float: OPSTACK_PUSH(getTFLOATARR()); break;
case TYPE_Double: OPSTACK_PUSH(getTDOUBLEARR()); break;
case TYPE_Byte: OPSTACK_PUSH(TBYTEARR); break;
case TYPE_Short: OPSTACK_PUSH(TSHORTARR); break;
@@ -782,7 +782,7 @@
break;
case IALOAD: ARRAY_LOAD(TINT, TINTARR); break;
- case FALOAD: ARRAY_LOAD(TFLOAT, TFLOATARR); break;
+ case FALOAD: ARRAY_LOAD(TFLOAT, getTFLOATARR()); break;
case CALOAD: ARRAY_LOAD(TINT, TCHARARR); break;
case SALOAD: ARRAY_LOAD(TINT, TSHORTARR); break;
@@ -867,7 +867,7 @@
case IASTORE: ARRAY_STORE(TINT, TINTARR); break;
- case FASTORE: ARRAY_STORE(TFLOAT, TFLOATARR); 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.4
kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.5
--- kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.4 Sun Mar 13 14:54:19 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-debug.c Sun Mar 13 15:03:19 2005
@@ -474,7 +474,7 @@
else if (type == TLONGARR->data.class) {
dprintf("TLONGARR");
}
- else if (type == TFLOATARR->data.class) {
+ else if (type == getTFLOATARR()->data.class) {
dprintf("TFLOATARR");
}
else if (type == getTDOUBLEARR()->data.class) {
Index: kaffe/kaffe/kaffevm/verifier/verify-type.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.c:1.11
kaffe/kaffe/kaffevm/verifier/verify-type.c:1.12
--- kaffe/kaffe/kaffevm/verifier/verify-type.c:1.11 Sun Mar 13 14:54:19 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.c Sun Mar 13 15:03:19 2005
@@ -110,7 +110,12 @@
static const char* FLOATARR_SIG = "[F";
static Type verify_FLOATARR;
-Type* TFLOATARR = &verify_FLOATARR;
+static Type* TFLOATARR = &verify_FLOATARR;
+
+Type* getTFLOATARR(void)
+{
+ return TFLOATARR;
+}
static const char* DOUBLEARR_SIG = "[D";
static Type verify_DOUBLEARR;
Index: kaffe/kaffe/kaffevm/verifier/verify-type.h
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.h:1.8
kaffe/kaffe/kaffevm/verifier/verify-type.h:1.9
--- kaffe/kaffe/kaffevm/verifier/verify-type.h:1.8 Sun Mar 13 14:54:19 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.h Sun Mar 13 15:03:19 2005
@@ -111,7 +111,7 @@
extern Type* TSHORTARR;
extern Type* TINTARR;
extern Type* TLONGARR;
-extern Type* TFLOATARR;
+extern Type* getTFLOATARR(void);
extern Type* getTDOUBLEARR(void);
extern Type* TSTRING;
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
