[kaffe] fixing tests/internal

Dalibor Topic robilad at kaffe.org
Wed Jul 14 10:14:40 PDT 2004


Heya,

it seems that the internal jit tests on CVS head can no longer be built. 
I've tried to write a patch to fix that, but I just managed to make the 
test compile & fail. Any idea what's wrong? I've attached my patch.

cheers,
dalibor topic
-------------- next part --------------
Index: test/internal/jit_stub.c
===================================================================
RCS file: /cvs/kaffe/kaffe/test/internal/jit_stub.c,v
retrieving revision 1.7
diff -u -r1.7 jit_stub.c
--- test/internal/jit_stub.c	25 Apr 2004 19:57:49 -0000	1.7
+++ test/internal/jit_stub.c	14 Jul 2004 17:10:55 -0000
@@ -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_2;
 	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();


More information about the kaffe mailing list