PatchSet 5543
Date: 2005/03/13 16:15:49
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
(TOBJARR): Made static.
(getTOBJARR) Added.
* kaffe/kaffevm/verifier/verify-type.h:
(TOBJARR) Removed prototype.
(getTOBJARR) Added prototype.
* kaffe/kaffevm/verifier/verify-debug.c,
kaffe/kaffevm/verifier/verify-block.c:
Replaced use of TOBJARR by getTOBJARR.
Members:
ChangeLog:1.3717->1.3718
kaffe/kaffevm/verifier/verify-block.c:1.16->1.17
kaffe/kaffevm/verifier/verify-debug.c:1.10->1.11
kaffe/kaffevm/verifier/verify-type.c:1.19->1.20
kaffe/kaffevm/verifier/verify-type.h:1.16->1.17
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3717 kaffe/ChangeLog:1.3718
--- kaffe/ChangeLog:1.3717 Sun Mar 13 16:11:00 2005
+++ kaffe/ChangeLog Sun Mar 13 16:15:49 2005
@@ -1,6 +1,20 @@
2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/verifier/verify-type.c
+ (TOBJARR): Made static.
+ (getTOBJARR) Added.
+
+ * kaffe/kaffevm/verifier/verify-type.h:
+ (TOBJARR) Removed prototype.
+ (getTOBJARR) Added prototype.
+
+ * kaffe/kaffevm/verifier/verify-debug.c,
+ kaffe/kaffevm/verifier/verify-block.c:
+ Replaced use of TOBJARR by getTOBJARR.
+
+2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/verifier/verify-type.c
(TSTRING): Made static.
(getTSTRING) Added.
Index: kaffe/kaffe/kaffevm/verifier/verify-block.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-block.c:1.16
kaffe/kaffe/kaffevm/verifier/verify-block.c:1.17
--- kaffe/kaffe/kaffevm/verifier/verify-block.c:1.16 Sun Mar 13 16:11:09 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-block.c Sun Mar 13 16:15:54 2005
@@ -838,7 +838,7 @@
(arrayType->data.sig)++;
}
else {
- if (arrayType->data.class ==
TOBJARR->data.class) {
+ if (arrayType->data.class ==
getTOBJARR()->data.class) {
*arrayType = *getTOBJ();
} else if (arrayType->data.class !=
TNULL->data.class) {
arrayType->tinfo = TINFO_SIG;
Index: kaffe/kaffe/kaffevm/verifier/verify-debug.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.10
kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.11
--- kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.10 Sun Mar 13 16:07:28 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-debug.c Sun Mar 13 16:15:54 2005
@@ -480,7 +480,7 @@
else if (type == getTDOUBLEARR()->data.class) {
dprintf("TDOUBLEARR");
}
- else if (type == TOBJARR->data.class) {
+ else if (type == getTOBJARR()->data.class) {
dprintf("TOBJARR");
}
else {
Index: kaffe/kaffe/kaffevm/verifier/verify-type.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.c:1.19
kaffe/kaffe/kaffevm/verifier/verify-type.c:1.20
--- kaffe/kaffe/kaffevm/verifier/verify-type.c:1.19 Sun Mar 13 16:11:09 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.c Sun Mar 13 16:15:54 2005
@@ -78,7 +78,12 @@
static const char* OBJARR_SIG = "[Ljava/lang/Object;";
static Type verify_OBJARR;
-Type* TOBJARR = &verify_OBJARR;
+static Type* TOBJARR = &verify_OBJARR;
+
+Type* getTOBJARR(void)
+{
+ return TOBJARR;
+}
static const char* STRING_SIG = "Ljava/lang/String;";
static Type verify_STRING;
Index: kaffe/kaffe/kaffevm/verifier/verify-type.h
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.h:1.16
kaffe/kaffe/kaffevm/verifier/verify-type.h:1.17
--- kaffe/kaffe/kaffevm/verifier/verify-type.h:1.16 Sun Mar 13 16:11:09 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.h Sun Mar 13 16:15:54 2005
@@ -104,7 +104,7 @@
extern Type* getTOBJ(void);
-extern Type* TOBJARR;
+extern Type* getTOBJARR(void);
extern Type* getTCHARARR(void);
extern Type* getTBYTEARR(void);
extern Type* getTBOOLARR(void);
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
