PatchSet 5541
Date: 2005/03/13 16:07:25
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
(TCHARARR): Made static.
(getTCHARARR) Added.
* kaffe/kaffevm/verifier/verify-type.h:
(TCHARARR) Removed prototype.
(getTCHARARR) Added prototype.
* kaffe/kaffevm/verifier/verify-debug.c,
kaffe/kaffevm/verifier/verify-block.c:
Replaced use of TCHARARR by getTCHARARR.
Members:
ChangeLog:1.3715->1.3716
kaffe/kaffevm/verifier/verify-block.c:1.14->1.15
kaffe/kaffevm/verifier/verify-debug.c:1.9->1.10
kaffe/kaffevm/verifier/verify-type.c:1.17->1.18
kaffe/kaffevm/verifier/verify-type.h:1.14->1.15
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3715 kaffe/ChangeLog:1.3716
--- kaffe/ChangeLog:1.3715 Sun Mar 13 16:03:41 2005
+++ kaffe/ChangeLog Sun Mar 13 16:07:25 2005
@@ -1,6 +1,20 @@
2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/verifier/verify-type.c
+ (TCHARARR): Made static.
+ (getTCHARARR) Added.
+
+ * kaffe/kaffevm/verifier/verify-type.h:
+ (TCHARARR) Removed prototype.
+ (getTCHARARR) Added prototype.
+
+ * kaffe/kaffevm/verifier/verify-debug.c,
+ kaffe/kaffevm/verifier/verify-block.c:
+ Replaced use of TCHARARR by getTCHARARR.
+
+2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/verifier/verify-type.c
(TBYTEARR): Made static.
(getTBYTEARR) Added.
Index: kaffe/kaffe/kaffevm/verifier/verify-block.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-block.c:1.14
kaffe/kaffe/kaffevm/verifier/verify-block.c:1.15
--- kaffe/kaffe/kaffevm/verifier/verify-block.c:1.14 Sun Mar 13 16:03:44 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-block.c Sun Mar 13 16:07:28 2005
@@ -721,7 +721,7 @@
switch(code[pc + 1]) {
case TYPE_Boolean: OPSTACK_PUSH(getTBOOLARR()); break;
- case TYPE_Char: OPSTACK_PUSH(TCHARARR); break;
+ case TYPE_Char: OPSTACK_PUSH(getTCHARARR()); break;
case TYPE_Float: OPSTACK_PUSH(getTFLOATARR()); break;
case TYPE_Double: OPSTACK_PUSH(getTDOUBLEARR()); break;
case TYPE_Byte: OPSTACK_PUSH(getTBYTEARR()); break;
@@ -783,7 +783,7 @@
case IALOAD: ARRAY_LOAD(TINT, getTINTARR()); break;
case FALOAD: ARRAY_LOAD(TFLOAT, getTFLOATARR()); break;
- case CALOAD: ARRAY_LOAD(TINT, TCHARARR); break;
+ case CALOAD: ARRAY_LOAD(TINT, getTCHARARR()); break;
case SALOAD: ARRAY_LOAD(TINT, getTSHORTARR()); break;
case LALOAD: ARRAY_WLOAD(TLONG, getTLONGARR()); break;
@@ -868,7 +868,7 @@
case IASTORE: ARRAY_STORE(TINT, getTINTARR()); break;
case FASTORE: ARRAY_STORE(TFLOAT, getTFLOATARR()); break;
- case CASTORE: ARRAY_STORE(TINT, TCHARARR); break;
+ case CASTORE: ARRAY_STORE(TINT, getTCHARARR()); break;
case SASTORE: ARRAY_STORE(TINT, getTSHORTARR()); break;
case LASTORE: ARRAY_WSTORE(TLONG, getTLONGARR()); break;
Index: kaffe/kaffe/kaffevm/verifier/verify-debug.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.9
kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.10
--- kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.9 Sun Mar 13 16:03:44 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-debug.c Sun Mar 13 16:07:28 2005
@@ -456,7 +456,7 @@
dprintf("TNULL");
}
- else if (type == TCHARARR->data.class) {
+ else if (type == getTCHARARR()->data.class) {
dprintf("TCHARARR");
}
else if (type == getTBOOLARR()->data.class) {
Index: kaffe/kaffe/kaffevm/verifier/verify-type.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.c:1.17
kaffe/kaffe/kaffevm/verifier/verify-type.c:1.18
--- kaffe/kaffe/kaffevm/verifier/verify-type.c:1.17 Sun Mar 13 16:03:44 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.c Sun Mar 13 16:07:28 2005
@@ -86,7 +86,12 @@
static const char* CHARARR_SIG = "[C";
static Type verify_CHARARR;
-Type* TCHARARR = &verify_CHARARR;
+static Type* TCHARARR = &verify_CHARARR;
+
+Type* getTCHARARR(void)
+{
+ return TCHARARR;
+}
static const char* BYTEARR_SIG = "[B";
static Type verify_BYTEARR;
Index: kaffe/kaffe/kaffevm/verifier/verify-type.h
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.h:1.14
kaffe/kaffe/kaffevm/verifier/verify-type.h:1.15
--- kaffe/kaffe/kaffevm/verifier/verify-type.h:1.14 Sun Mar 13 16:03:44 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.h Sun Mar 13 16:07:28 2005
@@ -105,7 +105,7 @@
extern Type* getTOBJ(void);
extern Type* TOBJARR;
-extern Type* TCHARARR;
+extern Type* getTCHARARR(void);
extern Type* getTBYTEARR(void);
extern Type* getTBOOLARR(void);
extern Type* getTSHORTARR(void);
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
