PatchSet 5538
Date: 2005/03/13 15:52:10
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
(TSHORTARR): Made static.
(getTSHORTARR) Added.
* kaffe/kaffevm/verifier/verify-type.h:
(TSHORTARR) Removed prototype.
(getTSHORTARR) Added prototype.
* kaffe/kaffevm/verifier/verify-debug.c,
kaffe/kaffevm/verifier/verify-block.c:
Replaced use of TSHORTARR by getTSHORTARR.
Members:
ChangeLog:1.3712->1.3713
kaffe/kaffevm/verifier/verify-block.c:1.11->1.12
kaffe/kaffevm/verifier/verify-type.c:1.14->1.15
kaffe/kaffevm/verifier/verify-type.h:1.11->1.12
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3712 kaffe/ChangeLog:1.3713
--- kaffe/ChangeLog:1.3712 Sun Mar 13 15:48:38 2005
+++ kaffe/ChangeLog Sun Mar 13 15:52:10 2005
@@ -1,6 +1,20 @@
2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/verifier/verify-type.c
+ (TSHORTARR): Made static.
+ (getTSHORTARR) Added.
+
+ * kaffe/kaffevm/verifier/verify-type.h:
+ (TSHORTARR) Removed prototype.
+ (getTSHORTARR) Added prototype.
+
+ * kaffe/kaffevm/verifier/verify-debug.c,
+ kaffe/kaffevm/verifier/verify-block.c:
+ Replaced use of TSHORTARR by getTSHORTARR.
+
+2005-03-13 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/verifier/verify-type.c
(TINTARR): Made static.
(getTINTARR) Added.
Index: kaffe/kaffe/kaffevm/verifier/verify-block.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-block.c:1.11
kaffe/kaffe/kaffevm/verifier/verify-block.c:1.12
--- kaffe/kaffe/kaffevm/verifier/verify-block.c:1.11 Sun Mar 13 15:48:41 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-block.c Sun Mar 13 15:52:13 2005
@@ -725,7 +725,7 @@
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;
+ case TYPE_Short: OPSTACK_PUSH(getTSHORTARR()); break;
case TYPE_Int: OPSTACK_PUSH(getTINTARR()); break;
case TYPE_Long: OPSTACK_PUSH(getTLONGARR()); break;
default: return verifyError(v, "newarray of unknown
type");
@@ -784,7 +784,7 @@
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;
+ case SALOAD: ARRAY_LOAD(TINT, getTSHORTARR()); break;
case LALOAD: ARRAY_WLOAD(TLONG, getTLONGARR()); break;
case DALOAD: ARRAY_WLOAD(TDOUBLE, getTDOUBLEARR()); break;
@@ -869,7 +869,7 @@
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;
+ case SASTORE: ARRAY_STORE(TINT, getTSHORTARR()); break;
case LASTORE: ARRAY_WSTORE(TLONG, getTLONGARR()); break;
case DASTORE: ARRAY_WSTORE(TDOUBLE, getTDOUBLEARR()); break;
Index: kaffe/kaffe/kaffevm/verifier/verify-type.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.c:1.14
kaffe/kaffe/kaffevm/verifier/verify-type.c:1.15
--- kaffe/kaffe/kaffevm/verifier/verify-type.c:1.14 Sun Mar 13 15:48:41 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.c Sun Mar 13 15:52:13 2005
@@ -98,7 +98,12 @@
static const char* SHORTARR_SIG = "[S";
static Type verify_SHORTARR;
-Type* TSHORTARR = &verify_SHORTARR;
+static Type* TSHORTARR = &verify_SHORTARR;
+
+Type* getTSHORTARR(void)
+{
+ return TSHORTARR;
+}
static const char* INTARR_SIG = "[I";
static Type verify_INTARR;
Index: kaffe/kaffe/kaffevm/verifier/verify-type.h
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.h:1.11
kaffe/kaffe/kaffevm/verifier/verify-type.h:1.12
--- kaffe/kaffe/kaffevm/verifier/verify-type.h:1.11 Sun Mar 13 15:48:41 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.h Sun Mar 13 15:52:13 2005
@@ -108,7 +108,7 @@
extern Type* TCHARARR;
extern Type* TBYTEARR;
extern Type* TBOOLARR;
-extern Type* TSHORTARR;
+extern Type* getTSHORTARR(void);
extern Type* getTINTARR(void);
extern Type* getTLONGARR(void);
extern Type* getTFLOATARR(void);
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
