[kaffe] CVS kaffe (dalibor): Fix for jit engine compilation breakage due to missing resetConstants

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Thu Sep 25 03:09:02 2003


PatchSet 4063 
Date: 2003/09/25 10:06:13
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fix for jit engine compilation breakage due to missing resetConstants

Members: 
	ChangeLog:1.1658->1.1659 
	kaffe/kaffevm/jni.c:1.94->1.95 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1658 kaffe/ChangeLog:1.1659
--- kaffe/ChangeLog:1.1658	Thu Sep 25 09:27:45 2003
+++ kaffe/ChangeLog	Thu Sep 25 10:06:13 2003
@@ -1,5 +1,15 @@
 2003-09-25  Dalibor Topic <robilad@kaffe.org>
 
+	Fix for jit and intrp engine compilation breakage.
+	
+	* kaffe/kaffevm/jni.c:
+	Include constpool.h to declare resetConstants, if available.
+	(Kaffe_wrapper) Only call resetConstants with jit3 engine.
+
+	Reported by: Kiyo Inaba <inaba@src.ricoh.co.jp>
+
+2003-09-25  Dalibor Topic <robilad@kaffe.org>
+
 	* libraries/javalib/java/util/zip/ZipFile.java:
 	(OPEN_READ, OPEN_DELETE) New constants.
 
Index: kaffe/kaffe/kaffevm/jni.c
diff -u kaffe/kaffe/kaffevm/jni.c:1.94 kaffe/kaffe/kaffevm/jni.c:1.95
--- kaffe/kaffe/kaffevm/jni.c:1.94	Tue Sep 16 19:23:37 2003
+++ kaffe/kaffe/kaffevm/jni.c	Thu Sep 25 10:06:15 2003
@@ -38,6 +38,7 @@
 #include "md.h"
 #include "exception.h"
 #if defined(TRANSLATOR)
+#include "constpool.h"
 #include "seq.h"
 #include "slots.h"
 #include "registers.h"
@@ -4018,7 +4019,9 @@
 		xmeth->accflags |= ACC_JNI;
 
 done:
+#if defined(TRANSLATOR) && defined(JIT3)
 	resetConstants();
+#endif
 	resetLabels();
 
 #if defined(KAFFE_PROFILER)