Seeing only one regression failure on FreeBSD/amd64 (GCTest, which fails
100% of the time), I went on another warnings cleanup spree. No
improvement in regressions, but fewer warnings as a result. It's mostly
type cleanups, but there's one uninitialized variable fix to jni.c which
looks important, and I think I set the correct initial value for it.
--
Eric Anholt [EMAIL PROTECTED]
http://people.freebsd.org/~anholt/ [EMAIL PROTECTED]
Index: kaffevm/exception.c
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/exception.c,v
retrieving revision 1.95
diff -u -r1.95 exception.c
--- kaffevm/exception.c 31 Mar 2005 10:39:27 -0000 1.95
+++ kaffevm/exception.c 17 Apr 2005 03:10:46 -0000
@@ -409,7 +409,7 @@
lastJniFrame = lastJniFrame->prev);
DBG(ELOOKUP,
- dprintf ("dispatchException(): lastJniFrame is %p, fp 0x%x\n", lastJniFrame, (lastJniFrame?lastJniFrame->frame.jni.fp:0)); );
+ dprintf ("dispatchException(): lastJniFrame is %p, fp %p\n", lastJniFrame, (lastJniFrame?lastJniFrame->frame.jni.fp:0)); );
/*
* now walk up the stack
Index: kaffevm/locks.c
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/locks.c,v
retrieving revision 1.61
diff -u -r1.61 locks.c
--- kaffevm/locks.c 1 Apr 2005 17:00:55 -0000 1.61
+++ kaffevm/locks.c 17 Apr 2005 03:10:46 -0000
@@ -577,8 +577,10 @@
{
}
-void KaffeLock_destroyLock(Collector *gcif, iLock *lock)
+void KaffeLock_destroyLock(Collector *gcif, void *l)
{
+ iLock *lock = (iLock *)l;
+
assert(lock->lockCount == 0);
assert(lock->num_wait == 0);
assert(lock->in_progress == 0);
Index: kaffevm/locks.h
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/locks.h,v
retrieving revision 1.29
diff -u -r1.29 locks.h
--- kaffevm/locks.h 20 Mar 2005 20:30:43 -0000 1.29
+++ kaffevm/locks.h 17 Apr 2005 03:10:46 -0000
@@ -86,6 +86,6 @@
extern void dumpLocks(void);
-extern void KaffeLock_destroyLock(struct _Collector *, iLock *);
+extern void KaffeLock_destroyLock(struct _Collector *, void *);
#endif
Index: kaffevm/string.c
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/string.c,v
retrieving revision 1.42
diff -u -r1.42 string.c
--- kaffevm/string.c 31 Mar 2005 10:39:27 -0000 1.42
+++ kaffevm/string.c 17 Apr 2005 03:10:46 -0000
@@ -490,7 +490,7 @@
void
stringWalk(Collector* collector, void *gc_info, void* str, uint32 size UNUSED)
{
- Hjava_lang_String *objstr = (Hjava_lang_Object *)str;
+ Hjava_lang_String *objstr = (Hjava_lang_String *)str;
iLock *lk;
/* That's all we have to do here */
Index: kaffevm/intrp/checks.h
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/intrp/checks.h,v
retrieving revision 1.4
diff -u -r1.4 checks.h
--- kaffevm/intrp/checks.h 27 Mar 2004 18:05:16 -0000 1.4
+++ kaffevm/intrp/checks.h 17 Apr 2005 03:10:46 -0000
@@ -13,13 +13,13 @@
#define __checks_h
#define check_local_int(l) CHDBG (dprintf ("- local %d: int %d\n", (l), (int) local(l)->v.tint))
-#define check_local_long(l) CHDBG (dprintf ("- local %d: long %lld\n", (l), (jlong) local_long(l)->v.tlong))
+#define check_local_long(l) CHDBG (dprintf ("- local %d: long %jd\n", (l), (jlong) local_long(l)->v.tlong))
#define check_local_float(l) CHDBG (dprintf ("- local %d: float %g\n", (l), (double) local_float(l)->v.tfloat))
#define check_local_double(l) CHDBG (dprintf ("- local %d: double %g\n", (l), (double) local_double(l)->v.tdouble))
#define check_local_ref(l) CHDBG (dprintf ("- local %d: ref %p\n", (l), (void *) local(l)->v.taddr))
#define check_stack_int(l) CHDBG (dprintf ("- stack %d: int %d\n", (l), (int) stack(l)->v.tint))
-#define check_stack_long(l) CHDBG (dprintf ("- stack %d: long %lld\n", (l), (jlong) stack_long(l)->v.tlong))
+#define check_stack_long(l) CHDBG (dprintf ("- stack %d: long %jd\n", (l), (jlong) stack_long(l)->v.tlong))
#define check_stack_float(l) CHDBG (dprintf ("- stack %d: float %g\n", (l), (double) stack(l)->v.tfloat))
#define check_stack_double(l) CHDBG (dprintf ("- stack %d: double %g\n", (l), (double) stack_double(l)->v.tdouble))
#define check_stack_ref(l) CHDBG (dprintf ("- stack %d: ref %p\n", (l), (void *) stack(l)->v.taddr))
Index: kaffevm/intrp/icode.h
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/intrp/icode.h,v
retrieving revision 1.23
diff -u -r1.23 icode.h
--- kaffevm/intrp/icode.h 5 Feb 2005 09:22:42 -0000 1.23
+++ kaffevm/intrp/icode.h 17 Apr 2005 03:10:46 -0000
@@ -16,7 +16,7 @@
#include "soft.h"
#if defined(KAFFE_VMDEBUG)
-static const int32 UNINITIALIZED_STACK_SLOT = 0x00c0ffee;
+static const long UNINITIALIZED_STACK_SLOT = 0x00c0ffee;
#endif
#define move_long_const(t, c) (t)[0].v.tlong = (c)
Index: kaffevm/jni/jni-base.c
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/jni/jni-base.c,v
retrieving revision 1.17
diff -u -r1.17 jni-base.c
--- kaffevm/jni/jni-base.c 8 Apr 2005 06:12:11 -0000 1.17
+++ kaffevm/jni/jni-base.c 17 Apr 2005 03:10:46 -0000
@@ -254,7 +254,7 @@
args->nativeStackSize = sz;
}
DBG(INIT,
- dprintf("Setup stack size to %d\n", sz);
+ dprintf("Setup stack size to %zd\n", sz);
);
}
}
Index: kaffevm/jni/jni-helpers.c
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/jni/jni-helpers.c,v
retrieving revision 1.4
diff -u -r1.4 jni-helpers.c
--- kaffevm/jni/jni-helpers.c 8 Apr 2005 06:12:11 -0000 1.4
+++ kaffevm/jni/jni-helpers.c 17 Apr 2005 03:10:46 -0000
@@ -80,7 +80,7 @@
return address;
}
-jint KaffeJNI_GetDirectBufferCapacity(JNIEnv *env UNUSED, jobject buffer)
+long KaffeJNI_GetDirectBufferCapacity(JNIEnv *env UNUSED, jobject buffer)
{
jmethodID capacity_method;
jint capacity;
Index: kaffevm/jni/jni.c
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/jni/jni.c,v
retrieving revision 1.23
diff -u -r1.23 jni.c
--- kaffevm/jni/jni.c 12 Apr 2005 18:43:20 -0000 1.23
+++ kaffevm/jni/jni.c 17 Apr 2005 03:10:46 -0000
@@ -221,7 +221,7 @@
static jint
KaffeJNI_EnsureLocalCapacity(JNIEnv* env, jint capacity)
{
- jint ret;
+ jint ret = 0;
BEGIN_EXCEPTION_HANDLING(-1);
Index: kaffevm/jni/jni_funcs.h
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/jni/jni_funcs.h,v
retrieving revision 1.7
diff -u -r1.7 jni_funcs.h
--- kaffevm/jni/jni_funcs.h 8 Apr 2005 06:12:11 -0000 1.7
+++ kaffevm/jni/jni_funcs.h 17 Apr 2005 03:10:46 -0000
@@ -24,7 +24,7 @@
jobject KaffeJNI_ToReflectedField (JNIEnv *, jclass, jfieldID, jboolean);
jobject KaffeJNI_NewDirectByteBuffer(JNIEnv *, void *, jlong);
void * KaffeJNI_GetDirectBufferAddress(JNIEnv *, jobject);
-jint KaffeJNI_GetDirectBufferCapacity(JNIEnv *, jobject);
+long KaffeJNI_GetDirectBufferCapacity(JNIEnv *, jobject);
/* ====== String handling =========================================================== */
Index: kaffevm/kaffe-gc/gc-mem.c
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/kaffe-gc/gc-mem.c,v
retrieving revision 1.26
diff -u -r1.26 gc-mem.c
--- kaffevm/kaffe-gc/gc-mem.c 13 Mar 2005 12:57:24 -0000 1.26
+++ kaffevm/kaffe-gc/gc-mem.c 17 Apr 2005 03:10:46 -0000
@@ -613,7 +613,7 @@
/* number of pages allocated for block */
block_count = msz >> gc_pgbits;
- DBG(GCPRIM, dprintf ("large block covers %x pages\n", block_count); );
+ DBG(GCPRIM, dprintf ("large block covers %zx pages\n", block_count); );
/* Setup the meta-data for the block */
DBG(GCDIAG, gc_set_magic_marker(info));
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
