PatchSet 4735
Date: 2004/05/16 11:16:36
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Some compile fixes.
* kaffe/kaffevm/mem/gc-incremental.c
(gcMalloc): Removed a suspicious static variable which is not
used anyway and caused compile error.
* kaffe/kaffevm/support.c
(userProperties): Set to NULL.
* kaffe/kaffevm/jit/icode.c:
(softcall_exit_method): New function copied from JIT3.
Members:
ChangeLog:1.2309->1.2310
kaffe/kaffevm/support.c:1.66->1.67
kaffe/kaffevm/jit/icode.c:1.25->1.26
kaffe/kaffevm/mem/gc-incremental.c:1.80->1.81
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2309 kaffe/ChangeLog:1.2310
--- kaffe/ChangeLog:1.2309 Sat May 15 16:47:40 2004
+++ kaffe/ChangeLog Sun May 16 11:16:36 2004
@@ -1,3 +1,15 @@
+2004-05-16 Guilhem Lavaux <[EMAIL PROTECTED]>
+
+ * kaffe/kaffevm/mem/gc-incremental.c
+ (gcMalloc): Removed a suspicious static variable which is not
+ used anyway and caused compile error.
+
+ * kaffe/kaffevm/support.c
+ (userProperties): Set to NULL.
+
+ * kaffe/kaffevm/jit/icode.c:
+ (softcall_exit_method): New function copied from JIT3.
+
2004-05-15 Dalibor Topic <[EMAIL PROTECTED]>
* configure.ac: Improved description for xdebugging.
Index: kaffe/kaffe/kaffevm/support.c
diff -u kaffe/kaffe/kaffevm/support.c:1.66 kaffe/kaffe/kaffevm/support.c:1.67
--- kaffe/kaffe/kaffevm/support.c:1.66 Sun Apr 18 13:57:27 2004
+++ kaffe/kaffe/kaffevm/support.c Sun May 16 11:16:38 2004
@@ -48,7 +48,7 @@
#define ERROR_SIGNATURE "(Ljava/lang/String;)V"
/* Anchor point for user defined properties */
-userProperty* userProperties;
+userProperty* userProperties = NULL;
#if defined(NO_SHARED_LIBRARIES)
/* Internal native functions */
Index: kaffe/kaffe/kaffevm/jit/icode.c
diff -u kaffe/kaffe/kaffevm/jit/icode.c:1.25 kaffe/kaffe/kaffevm/jit/icode.c:1.26
--- kaffe/kaffe/kaffevm/jit/icode.c:1.25 Tue Sep 2 16:40:58 2003
+++ kaffe/kaffe/kaffevm/jit/icode.c Sun May 16 11:16:38 2004
@@ -3596,6 +3596,23 @@
fixup_function_call();
}
+#if defined(ENABLE_JVMPI)
+void
+softcall_exit_method(Method *meth)
+{
+ begin_func_sync();
+#if defined(PUSHARG_FORWARDS)
+ pusharg_ref_const(meth, 0);
+#else
+ pusharg_ref_const(meth, 0);
+#endif
+ call_soft(soft_exit_method);
+ popargs();
+ end_func_sync();
+}
+#endif
+
+
#if defined(GC_INCREMENTAL)
void
softcall_addreference(SlotInfo* from, SlotInfo* to)
Index: kaffe/kaffe/kaffevm/mem/gc-incremental.c
diff -u kaffe/kaffe/kaffevm/mem/gc-incremental.c:1.80
kaffe/kaffe/kaffevm/mem/gc-incremental.c:1.81
--- kaffe/kaffe/kaffevm/mem/gc-incremental.c:1.80 Wed Apr 21 10:15:07 2004
+++ kaffe/kaffe/kaffevm/mem/gc-incremental.c Sun May 16 11:16:39 2004
@@ -1041,11 +1041,7 @@
* is lost.
*/
-#if !(defined(NDEBUG) || !defined(KAFFE_VMDEBUG))
- static int ranout;
-#endif /* !(defined(NDEBUG) || !defined(KAFFE_VMDEBUG)) */
-
- assert (ranout++ == 0 || !!!"Ran out of
memory!");
+ assert (!!!"Ran out of memory!");
}
/* Guess we've really run out */
unlockStaticMutex(&gc_lock);
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
