[kaffe] CVS kaffe (dalibor): Fixed jit tests to build again

[Kaffe CVS]

PatchSet 4973 
Date: 2004/07/15 10:29:33
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed jit tests to build again

2004-07-15  Dalibor Topic  <robilad at kaffe.org>,
            Timothy S. Stack <stack at cs.utah.edu>

        * test/internal/jit_stub.c:
        Fixed to build again with updated jni.

        Reported by: Arnaud Vandyck  <avdyk at ressource-toi.org>

Members: 
	ChangeLog:1.2537->1.2538 
	test/internal/jit_stub.c:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2537 kaffe/ChangeLog:1.2538
--- kaffe/ChangeLog:1.2537	Thu Jul 15 04:19:15 2004
+++ kaffe/ChangeLog	Thu Jul 15 10:29:33 2004
@@ -1,3 +1,11 @@
+2004-07-15  Dalibor Topic  <robilad at kaffe.org>,
+	    Timothy S. Stack <stack at cs.utah.edu>
+
+	* test/internal/jit_stub.c:
+	Fixed to build again with updated jni.
+
+	Reported by: Arnaud Vandyck  <avdyk at ressource-toi.org>
+
 2004-07-15  Jim Huang  <jserv at kaffe.org>
 
 	* libraries/javalib/java/awt/MouseEvt.java
@@ -12,7 +20,7 @@
 
 	* kaffe/kaffevm/ksem.c (ksemGet): Readded jmutex_lock.
 
-2004-07-13  Dalibor Topic  <robilad at kaffe.org>
+2004-07-14  Dalibor Topic  <robilad at kaffe.org>
 
         * libraries/javalib/essential.files,
         libraries/javalib/profiles/allatonce/all.files,
@@ -20,7 +28,7 @@
 	Shuffled java/lang/IllegalMonitorStateException.java to 
 	essential file set to fix build on kjc.
 
-2004-07-13  Dalibor Topic  <robilad at kaffe.org>
+2004-07-14  Dalibor Topic  <robilad at kaffe.org>
 
 	* config/superh: Moved over to
 	* config/sh: new directory.
@@ -57,21 +65,21 @@
         scripts/config.sub:
 	Rengenerated.
 
-2004-07-13  Dalibor Topic  <robilad at kaffe.org>
+2004-07-14  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/gnu/classpath/Configuration.java
 	(default_awt_toolkit): Added new field for classpath AWT.
 
         Reported by: Jim Huang  <jserv at kaffe.org>
 
-2004-07-13  Dalibor Topic  <robilad at kaffe.org>
+2004-07-14  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/java/lang/Thread.java
 	(holdsLock): Implemented.
 
 	Reported by: Jim Huang  <jserv at kaffe.org>
 	
-2004-07-13  Dalibor Topic  <robilad at kaffe.org>
+2004-07-14  Dalibor Topic  <robilad at kaffe.org>
 
 	* config/sparc/jit-sparc.def:
 	Fixed stray LOUT without closing brace.
Index: kaffe/test/internal/jit_stub.c
diff -u kaffe/test/internal/jit_stub.c:1.7 kaffe/test/internal/jit_stub.c:1.8
--- kaffe/test/internal/jit_stub.c:1.7	Sun Apr 25 19:57:49 2004
+++ kaffe/test/internal/jit_stub.c	Thu Jul 15 10:29:37 2004
@@ -33,12 +33,10 @@
 
 #include <xprof/debugFile.h>
 
-JavaVMInitArgs vmargs;
+KaffeVM_Arguments vmargs;
 JNIEnv* env;
 int noExit = 0;
 
-extern JavaVMInitArgs Kaffe_JavaVMArgs[1]; // XXX
-
 extern int internal_test(parsedString *ps);
 
 /* If not otherwise specified, assume at least 1MB for main thread */
@@ -61,7 +59,6 @@
 /* Initialisation prototypes */
 void initClasspath(void);
 void initNative(void);
-void initThreads(void);
 
 int main(int argc, char *argv[])
 {
@@ -70,7 +67,7 @@
 	char *cp;
 
 	dbgSetMaskStr("MOREJIT,JIT");
-	vmargs.version = JAVA_VERSION_HEX;
+	vmargs.version = JNI_VERSION_1_1;
 	JNI_GetDefaultJavaVMInitArgs(&vmargs);
 	
 #if defined(KAFFE_XDEBUGGING)
@@ -99,8 +96,8 @@
 	INIT_MD();
 #endif
 
-	Kaffe_JavaVMArgs[0] = vmargs;
-	threadStackSize = Kaffe_JavaVMArgs[0].nativeStackSize;
+	Kaffe_JavaVMArgs = vmargs;
+	threadStackSize = Kaffe_JavaVMArgs.nativeStackSize;
 	
 	/* Register allocation types with gc subsystem */
 	main_collector = initCollector();