[kaffe] CVS kaffe (dalibor): Small fix for jit engine compilation breakage
Kaffe CVS
cvs-commits at kaffe.org
Fri Sep 19 06:24:01 PDT 2003
PatchSet 4049
Date: 2003/09/19 13:15:14
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Small fix for jit engine compilation breakage
Jit engine didn't always declare globalMethod, and that broke
the compilation of jni.c. Now the compilation passes jni.c
with the jit engine, but it still breaks due to missing
resetConstants function in jit code.
Members:
ChangeLog:1.1645->1.1646
kaffe/kaffevm/jit/machine.c:1.57->1.58
kaffe/kaffevm/jit/machine.h:1.18->1.19
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1645 kaffe/ChangeLog:1.1646
--- kaffe/ChangeLog:1.1645 Thu Sep 18 22:49:45 2003
+++ kaffe/ChangeLog Fri Sep 19 13:15:14 2003
@@ -1,3 +1,10 @@
+2003-09-19 Dalibor Topic <robilad at kaffe.org>
+
+ * kaffe/kaffevm/jit/machine.c,
+ kaffe/kaffevm/jit/machine.h:
+ Always declare and define globalMethod, which is used
+ by jni. This fixes another compilation problem on arm-linux.
+
2003-09-18 Ito Kazumitsu <kaz at maczuka.gcd.org>
* libraries/javalib/java/io/File.java:
Index: kaffe/kaffe/kaffevm/jit/machine.c
diff -u kaffe/kaffe/kaffevm/jit/machine.c:1.57 kaffe/kaffe/kaffevm/jit/machine.c:1.58
--- kaffe/kaffe/kaffevm/jit/machine.c:1.57 Sun Jul 27 16:53:48 2003
+++ kaffe/kaffe/kaffevm/jit/machine.c Fri Sep 19 13:15:15 2003
@@ -110,11 +110,10 @@
static int codeperbytecode;
int CODEPC;
+Method *globalMethod;
#if defined(KAFFE_PROFILER)
int profFlag; /* flag to control profiling */
-Method *globalMethod;
-
static void printProfilerStats(void);
#endif
Index: kaffe/kaffe/kaffevm/jit/machine.h
diff -u kaffe/kaffe/kaffevm/jit/machine.h:1.18 kaffe/kaffe/kaffevm/jit/machine.h:1.19
--- kaffe/kaffe/kaffevm/jit/machine.h:1.18 Tue Jul 8 07:33:49 2003
+++ kaffe/kaffe/kaffevm/jit/machine.h Fri Sep 19 13:15:15 2003
@@ -179,10 +179,10 @@
extern nativecode* codeblock;
extern uint32 pc;
extern uint32 npc;
+extern Method *globalMethod;
#if defined(KAFFE_PROFILER)
extern int profFlag;
-extern Method *globalMethod;
#endif
#endif
More information about the kaffe
mailing list