[kaffe] CVS kaffe (robilad): Cross-compilation fix for the verifier

[Kaffe CVS]

PatchSet 5534 
Date: 2005/03/13 14:54:17
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Cross-compilation fix for the verifier

2005-03-13  Dalibor Topic  <robilad at kaffe.org>

* kaffe/kaffevm/verifier/verify-type.c
(TDOUBLEARR): Made static.
(getTDOUBLEARR) Added.

* kaffe/kaffevm/verifier/verify-type.h:
(TDOUBLEARR) Removed prototype.
(getTDOUBLEARR) Added prototype.

* kaffe/kaffevm/verifier/verify-debug.c,
kaffe/kaffevm/verifier/verify-block.c:
Replaced use of TDOUBLEARR by getTDOUBLEARR.

Members: 
	ChangeLog:1.3708->1.3709 
	kaffe/kaffevm/verifier/verify-block.c:1.7->1.8 
	kaffe/kaffevm/verifier/verify-debug.c:1.3->1.4 
	kaffe/kaffevm/verifier/verify-type.c:1.10->1.11 
	kaffe/kaffevm/verifier/verify-type.h:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3708 kaffe/ChangeLog:1.3709
--- kaffe/ChangeLog:1.3708	Sun Mar 13 14:47:06 2005
+++ kaffe/ChangeLog	Sun Mar 13 14:54:17 2005
@@ -1,12 +1,32 @@
 2005-03-13  Dalibor Topic  <robilad at kaffe.org>
 
 	* kaffe/kaffevm/verifier/verify-type.c
+	(TDOUBLEARR): Made static. 
+	(getTDOUBLEARR) Added.
+
+	* kaffe/kaffevm/verifier/verify-type.h: 
+	(TDOUBLEARR) Removed prototype.
+	(getTDOUBLEARR) Added prototype.
+
+	* kaffe/kaffevm/verifier/verify-debug.c,
+	kaffe/kaffevm/verifier/verify-block.c:
+	Replaced use of TDOUBLEARR by getTDOUBLEARR.
+	
+2005-03-13  Dalibor Topic  <robilad at kaffe.org>
+
+	* kaffe/kaffevm/verifier/verify-type.c
 	(TUNSTABLE): Made static. 
 	(getTUNSTABLE) Added.
 
 	* kaffe/kaffevm/verifier/verify-type.h: 
 	(TUNSTABLE) Removed prototype.
 	(getTUNSTABLE) Added prototype.
+
+	* kaffe/kaffevm/verifier/verify3b.c,
+	kaffe/kaffevm/verifier/verify.c,
+	kaffe/kaffevm/verifier/verify-debug.c,
+	kaffe/kaffevm/verifier/verify-block.c:
+	Replaced use of TUNSTABLE by getTUNSTABLE.
 	
 2005-03-13  Dalibor Topic  <robilad at kaffe.org>
 
Index: kaffe/kaffe/kaffevm/verifier/verify-block.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-block.c:1.7 kaffe/kaffe/kaffevm/verifier/verify-block.c:1.8
--- kaffe/kaffe/kaffevm/verifier/verify-block.c:1.7	Sun Mar 13 14:47:11 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-block.c	Sun Mar 13 14:54:19 2005
@@ -723,7 +723,7 @@
 			case TYPE_Boolean: OPSTACK_PUSH(TBOOLARR);   break;
 			case TYPE_Char:    OPSTACK_PUSH(TCHARARR);   break;
 			case TYPE_Float:   OPSTACK_PUSH(TFLOATARR);  break;
-			case TYPE_Double:  OPSTACK_PUSH(TDOUBLEARR); break;
+			case TYPE_Double:  OPSTACK_PUSH(getTDOUBLEARR()); break;
 			case TYPE_Byte:    OPSTACK_PUSH(TBYTEARR);   break;
 			case TYPE_Short:   OPSTACK_PUSH(TSHORTARR);  break;
 			case TYPE_Int:     OPSTACK_PUSH(TINTARR);    break;
@@ -787,7 +787,7 @@
 		case SALOAD: ARRAY_LOAD(TINT,   TSHORTARR); break;
 			
 		case LALOAD: ARRAY_WLOAD(TLONG,   TLONGARR);   break;
-		case DALOAD: ARRAY_WLOAD(TDOUBLE, TDOUBLEARR); break;
+		case DALOAD: ARRAY_WLOAD(TDOUBLE, getTDOUBLEARR()); break;
 #undef ARRAY_LOAD
 #undef ARRAY_WLOAD
 
@@ -872,7 +872,7 @@
 		case SASTORE: ARRAY_STORE(TINT,   TSHORTARR); break;
 			
 		case LASTORE: ARRAY_WSTORE(TLONG,   TLONGARR);   break;
-		case DASTORE: ARRAY_WSTORE(TDOUBLE, TDOUBLEARR); 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.3 kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.4
--- kaffe/kaffe/kaffevm/verifier/verify-debug.c:1.3	Sun Mar 13 14:47:11 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-debug.c	Sun Mar 13 14:54:19 2005
@@ -477,7 +477,7 @@
 		else if (type == TFLOATARR->data.class) {
 			dprintf("TFLOATARR");
 		}
-		else if (type == TDOUBLEARR->data.class) {
+		else if (type == getTDOUBLEARR()->data.class) {
 			dprintf("TDOUBLEARR");
 		}
 		else if (type == TOBJARR->data.class) {
Index: kaffe/kaffe/kaffevm/verifier/verify-type.c
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.c:1.10 kaffe/kaffe/kaffevm/verifier/verify-type.c:1.11
--- kaffe/kaffe/kaffevm/verifier/verify-type.c:1.10	Sun Mar 13 14:47:11 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.c	Sun Mar 13 14:54:19 2005
@@ -114,7 +114,12 @@
 
 static const char* DOUBLEARR_SIG = "[D";
 static Type  verify_DOUBLEARR;
-Type* TDOUBLEARR = &verify_DOUBLEARR;
+static Type* TDOUBLEARR = &verify_DOUBLEARR;
+
+Type* getTDOUBLEARR(void)
+{
+  return TDOUBLEARR;
+}
 
 /*
  * Initialize Type structures needed for verification
Index: kaffe/kaffe/kaffevm/verifier/verify-type.h
diff -u kaffe/kaffe/kaffevm/verifier/verify-type.h:1.7 kaffe/kaffe/kaffevm/verifier/verify-type.h:1.8
--- kaffe/kaffe/kaffevm/verifier/verify-type.h:1.7	Sun Mar 13 14:47:11 2005
+++ kaffe/kaffe/kaffevm/verifier/verify-type.h	Sun Mar 13 14:54:19 2005
@@ -112,7 +112,7 @@
 extern Type* TINTARR;
 extern Type* TLONGARR;
 extern Type* TFLOATARR;
-extern Type* TDOUBLEARR;
+extern Type* getTDOUBLEARR(void);
 
 extern Type* TSTRING;