[kaffe] CVS kaffe (robilad): Various warning fixes
Kaffe CVS
cvs-commits at kaffe.org
Thu Mar 31 02:44:08 PST 2005
PatchSet 5623
Date: 2005/03/31 10:39:23
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Various warning fixes
Members:
ChangeLog:1.3794->1.3795
config/i386/jit3-i386.def:1.29->1.30
include/errors.h:1.17->1.18
include/kaffe_jni.h:1.1->1.2
kaffe/kaffevm/access.c:1.9->1.10
kaffe/kaffevm/access.h:1.10->1.11
kaffe/kaffevm/baseClasses.c:1.61->1.62
kaffe/kaffevm/exception.c:1.94->1.95
kaffe/kaffevm/exception.h:1.32->1.33
kaffe/kaffevm/hashtab.c:1.15->1.16
kaffe/kaffevm/hashtab.h:1.4->1.5
kaffe/kaffevm/ksem.c:1.14->1.15
kaffe/kaffevm/ksem.h:1.12->1.13
kaffe/kaffevm/reference.c:1.4->1.5
kaffe/kaffevm/soft.h:1.18->1.19
kaffe/kaffevm/string.c:1.41->1.42
kaffe/kaffevm/support.h:1.39->1.40
kaffe/kaffevm/thread.c:1.94->1.95
kaffe/kaffevm/utf8const.c:1.46->1.47
kaffe/kaffevm/jit/machine.h:1.21->1.22
kaffe/kaffevm/jit/methodcalls.c:1.8->1.9
kaffe/kaffevm/jit3/basecode.c:1.9->1.10
kaffe/kaffevm/jit3/codeproto.h:1.16->1.17
kaffe/kaffevm/jit3/registers.c:1.19->1.20
kaffe/kaffevm/jni/jni-string.c:1.8->1.9
kaffe/kaffevm/jni/jni.c:1.20->1.21
kaffe/kaffevm/systems/unix-pthreads/lock-impl.c:1.19->1.20
kaffe/kaffevm/systems/unix-pthreads/lock-impl.h:1.9->1.10
kaffe/kaffevm/verifier/verify2.c:1.4->1.5
libraries/clib/native/Array.c:1.21->1.22
libraries/clib/native/Class.c:1.80->1.81
libraries/clib/native/Runtime.c:1.33->1.34
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3794 kaffe/ChangeLog:1.3795
--- kaffe/ChangeLog:1.3794 Wed Mar 30 22:50:07 2005
+++ kaffe/ChangeLog Thu Mar 31 10:39:23 2005
@@ -1,3 +1,63 @@
+2005-03-31 Dalibor Topic <robilad at kaffe.org>
+
+ * config/i386/jit3-i386.def,
+ include/errors.h,
+ include/kaffe_jni.h,
+ kaffe/kaffevm/baseClasses.c,
+ kaffe/kaffevm/exception.c,
+ kaffe/kaffevm/exception.h,
+ kaffe/kaffevm/soft.h,
+ kaffe/kaffevm/support.h,
+ kaffe/kaffevm/thread.c,
+ kaffe/kaffevm/jit3/basecode.c,
+ kaffe/kaffevm/jit3/codeproto.h,
+ libraries/clib/native/Runtime.c:
+ Removed NONRETURNING modifiers.
+
+ * kaffe/kaffevm/access.h,
+ kaffe/kaffevm/access.c (checkAccessFlags):
+ Return const char*.
+
+ * kaffe/kaffevm/exception.c (vmExcept_getSyncObj):
+ Only define for interpreter.
+
+ * kaffe/kaffevm/hashtab.c,
+ kaffe/kaffevm/hashtab.h:
+ Return const void *.
+
+ * kaffe/kaffevm/ksem.c:
+ Fixed comment.
+
+ * kaffe/kaffevm/ksem.h: Indentation changes.
+
+ * kaffe/kaffevm/reference.c:
+ (KaffeVM_isReferenced) Made ref const.
+
+ * kaffe/kaffevm/string.c,
+ kaffe/kaffevm/utf8const.c,
+ kaffe/kaffevm/jni/jni-string.c:
+ Added casts to fix warnings.
+
+ * kaffe/kaffevm/jit/machine.h,
+ kaffe/kaffevm/jit/methodcalls.c,
+ kaffe/kaffevm/jit3/registers.c:
+ Added missing includes.
+
+ * kaffe/kaffevm/jni/jni.c:
+ Use THREAD_JNIENV instead of accessing the jniEnv
+ field directly.
+
+ * kaffe/kaffevm/systems/unix-pthreads/lock-impl.c,
+ kaffe/kaffevm/systems/unix-pthreads/lock-impl.h:
+ Whitespace fixes.
+
+ * kaffe/kaffevm/verifier/verify2.c:
+ (checkField) Made reason const.
+
+ * libraries/clib/native/Array.c,
+ libraries/clib/native/Class.c:
+ Made all codepaths return from non-void functions.
+
2005-03-31 Gerrit P. Haase <gp at familiehaase.de>
* kaffe/jvmpi/Makefile.am,
Index: kaffe/config/i386/jit3-i386.def
diff -u kaffe/config/i386/jit3-i386.def:1.29 kaffe/config/i386/jit3-i386.def:1.30
--- kaffe/config/i386/jit3-i386.def:1.29 Mon Dec 27 16:09:45 2004
+++ kaffe/config/i386/jit3-i386.def Thu Mar 31 10:39:26 2005
@@ -168,7 +168,7 @@
/* --------------------------------------------------------------------- */
-define_insn(unimplemented, NONRETURNING unimplemented)
+define_insn(unimplemented, unimplemented)
{
ABORT();
}
Index: kaffe/include/errors.h
diff -u kaffe/include/errors.h:1.17 kaffe/include/errors.h:1.18
--- kaffe/include/errors.h:1.17 Fri Mar 11 16:41:51 2005
+++ kaffe/include/errors.h Thu Mar 31 10:39:27 2005
@@ -112,7 +112,7 @@
#if !defined(KAFFEH)
-void throwError(struct _errorInfo*) NONRETURNING;
+void throwError(struct _errorInfo*);
/*
* KMALLOC and all the allocating string functions return null on
Index: kaffe/include/kaffe_jni.h
diff -u kaffe/include/kaffe_jni.h:1.1 kaffe/include/kaffe_jni.h:1.2
--- kaffe/include/kaffe_jni.h:1.1 Mon Jul 5 16:40:12 2004
+++ kaffe/include/kaffe_jni.h Thu Mar 31 10:39:27 2005
@@ -14,8 +14,8 @@
const char* classpath;
const char* bootClasspath;
jint (*vfprintf)(FILE*, const char*, va_list);
- void (*exit)(jint) NONRETURNING;
- void (*abort)(void) NONRETURNING;
+ void (*exit)(jint);
+ void (*abort)(void);
jint enableClassGC;
jint enableVerboseGC;
jint disableAsyncGC;
Index: kaffe/kaffe/kaffevm/access.c
diff -u kaffe/kaffe/kaffevm/access.c:1.9 kaffe/kaffe/kaffevm/access.c:1.10
--- kaffe/kaffe/kaffevm/access.c:1.9 Fri Dec 17 17:47:35 2004
+++ kaffe/kaffe/kaffevm/access.c Thu Mar 31 10:39:27 2005
@@ -24,7 +24,7 @@
#include "lookup.h"
#include "soft.h"
-char *checkAccessFlags(access_type_t type, accessFlags access_flags)
+const char *checkAccessFlags(access_type_t type, accessFlags access_flags)
{
const char *retval = NULL;
Index: kaffe/kaffe/kaffevm/access.h
diff -u kaffe/kaffe/kaffevm/access.h:1.10 kaffe/kaffe/kaffevm/access.h:1.11
--- kaffe/kaffe/kaffevm/access.h:1.10 Tue Feb 10 16:47:21 2004
+++ kaffe/kaffe/kaffevm/access.h Thu Mar 31 10:39:27 2005
@@ -59,11 +59,12 @@
/*
* Check the validity of the given flags.
*
- * access_flags - The flag set to check.
- * return - NULL if the flags are valid, otherwise it returns a description
+ * @param type Type of access.
+ * @param access_flags The flag set to check.
+ * @return NULL if the flags are valid, otherwise it returns a description
* of the problem.
*/
-char *checkAccessFlags(access_type_t type, accessFlags access_flags);
+const char *checkAccessFlags(access_type_t type, accessFlags access_flags);
/*
* Check the accessibility of a slot from a specific context.
Index: kaffe/kaffe/kaffevm/baseClasses.c
diff -u kaffe/kaffe/kaffevm/baseClasses.c:1.61 kaffe/kaffe/kaffevm/baseClasses.c:1.62
--- kaffe/kaffe/kaffevm/baseClasses.c:1.61 Sun Mar 13 18:14:29 2005
+++ kaffe/kaffe/kaffevm/baseClasses.c Thu Mar 31 10:39:27 2005
@@ -268,7 +268,7 @@
KGC_enable(main_collector);
}
-static void NONRETURNING
+static void
abortWithEarlyClassFailure(errorInfo* einfo)
{
DBG(INIT,
Index: kaffe/kaffe/kaffevm/exception.c
diff -u kaffe/kaffe/kaffevm/exception.c:1.94 kaffe/kaffe/kaffevm/exception.c:1.95
--- kaffe/kaffe/kaffevm/exception.c:1.94 Fri Mar 11 16:41:52 2005
+++ kaffe/kaffe/kaffevm/exception.c Thu Mar 31 10:39:27 2005
@@ -54,6 +54,16 @@
#include "java_lang_VMThrowable.h"
#if defined(INTERPRETER)
+
+static struct Hjava_lang_Object*
+vmExcept_getSyncObj(VmExceptHandler* eh)
+{
+ assert(eh != NULL);
+ assert(eh->meth != NULL);
+ assert(eh->meth != VMEXCEPTHANDLER_KAFFEJNI_HANDLER);
+ return eh->frame.intrp.syncobj;
+}
+
#define FRAMEOBJECT(O, F, E) (O) = vmExcept_getSyncObj((VmExceptHandler*)(F))
@@ -66,10 +76,10 @@
#endif /* TRANSLATOR */
-static void nullException(struct _exceptionFrame *) NONRETURNING;
-static void floatingException(struct _exceptionFrame *) NONRETURNING;
-static void stackOverflowException(struct _exceptionFrame *) NONRETURNING;
-static void dispatchException(Hjava_lang_Throwable*, stackTraceInfo*) NONRETURNING;
+static void nullException(struct _exceptionFrame *);
+static void floatingException(struct _exceptionFrame *);
+static void stackOverflowException(struct _exceptionFrame *);
+static void dispatchException(Hjava_lang_Throwable*, stackTraceInfo*);
static bool findExceptionBlockInMethod(uintp, Hjava_lang_Class*, Method*, uintp*);
@@ -113,15 +123,6 @@
assert(eh->meth != NULL);
assert(eh->meth != VMEXCEPTHANDLER_KAFFEJNI_HANDLER);
eh->frame.intrp.syncobj = syncobj;
-}
-
-static struct Hjava_lang_Object*
-vmExcept_getSyncObj(VmExceptHandler* eh)
-{
- assert(eh != NULL);
- assert(eh->meth != NULL);
- assert(eh->meth != VMEXCEPTHANDLER_KAFFEJNI_HANDLER);
- return eh->frame.intrp.syncobj;
}
void
Index: kaffe/kaffe/kaffevm/exception.h
diff -u kaffe/kaffe/kaffevm/exception.h:1.32 kaffe/kaffe/kaffevm/exception.h:1.33
--- kaffe/kaffe/kaffevm/exception.h:1.32 Mon Feb 7 01:27:59 2005
+++ kaffe/kaffe/kaffevm/exception.h Thu Mar 31 10:39:27 2005
@@ -103,11 +103,11 @@
#define VMEXCEPTHANDLER_KAFFEJNI_HANDLER ((struct _methods*)1)
-void throwException(struct Hjava_lang_Throwable*) NONRETURNING;
-void throwExternalException(struct Hjava_lang_Throwable*) NONRETURNING;
+void throwException(struct Hjava_lang_Throwable*);
+void throwExternalException(struct Hjava_lang_Throwable*);
struct Hjava_lang_Throwable* error2Throwable(struct _errorInfo* einfo);
-void unhandledException(struct Hjava_lang_Throwable *eobj) NONRETURNING;
+void unhandledException(struct Hjava_lang_Throwable *eobj);
extern void initExceptions(void);
Index: kaffe/kaffe/kaffevm/hashtab.c
diff -u kaffe/kaffe/kaffevm/hashtab.c:1.15 kaffe/kaffe/kaffevm/hashtab.c:1.16
--- kaffe/kaffe/kaffevm/hashtab.c:1.15 Tue Dec 21 08:06:37 2004
+++ kaffe/kaffe/kaffevm/hashtab.c Thu Mar 31 10:39:27 2005
@@ -99,7 +99,7 @@
* or is equal to something that is already there. This returns the
* matching pointer that is actually in the table.
*/
-void *
+const void *
hashAdd(hashtab_t tab, const void *ptr)
{
int i;
@@ -144,7 +144,7 @@
/*
* Find a matching pointer in the table.
*/
-void *
+const void *
hashFind(hashtab_t tab, const void *ptr)
{
int i;
Index: kaffe/kaffe/kaffevm/hashtab.h
diff -u kaffe/kaffe/kaffevm/hashtab.h:1.4 kaffe/kaffe/kaffevm/hashtab.h:1.5
--- kaffe/kaffe/kaffevm/hashtab.h:1.4 Sun Jan 10 23:58:31 1999
+++ kaffe/kaffe/kaffevm/hashtab.h Thu Mar 31 10:39:27 2005
@@ -49,9 +49,9 @@
extern hashtab_t hashInit(hashfunc_t, compfunc_t,
allocfunc_t, freefunc_t);
-extern void* hashAdd(hashtab_t, const void*);
+extern const void* hashAdd(hashtab_t, const void*);
extern void hashRemove(hashtab_t, const void*);
-extern void* hashFind(hashtab_t, const void*);
+extern const void* hashFind(hashtab_t, const void*);
extern void hashDestroy(hashtab_t);
#endif /* __hashtab_h */
Index: kaffe/kaffe/kaffevm/ksem.c
diff -u kaffe/kaffe/kaffevm/ksem.c:1.14 kaffe/kaffe/kaffevm/ksem.c:1.15
--- kaffe/kaffe/kaffevm/ksem.c:1.14 Sun Mar 20 20:30:42 2005
+++ kaffe/kaffe/kaffevm/ksem.c Thu Mar 31 10:39:27 2005
@@ -1,5 +1,5 @@
/*
- * ksem.h
+ * ksem.c
*
* Copyright (c) 200
* University of Utah. All Rights Reserved.
Index: kaffe/kaffe/kaffevm/ksem.h
diff -u kaffe/kaffe/kaffevm/ksem.h:1.12 kaffe/kaffe/kaffevm/ksem.h:1.13
--- kaffe/kaffe/kaffevm/ksem.h:1.12 Sun Mar 20 20:30:43 2005
+++ kaffe/kaffe/kaffevm/ksem.h Thu Mar 31 10:39:27 2005
@@ -39,10 +39,10 @@
*/
#ifndef THREAD_SYSTEM_HAS_KSEM
- extern void ksem_init(struct Ksem* sem);
- extern void ksem_put(volatile struct Ksem* sem);
- extern jboolean ksem_get(volatile struct Ksem* sem, jlong timeout);
- extern void ksem_destroy(struct Ksem* sem);
+extern void ksem_init(struct Ksem* sem);
+extern void ksem_put(volatile struct Ksem* sem);
+extern jboolean ksem_get(volatile struct Ksem* sem, jlong timeout);
+extern void ksem_destroy(struct Ksem* sem);
/*
* Present POSIX mutex+condvar as a binary semaphore.
Index: kaffe/kaffe/kaffevm/reference.c
diff -u kaffe/kaffe/kaffevm/reference.c:1.4 kaffe/kaffe/kaffevm/reference.c:1.5
--- kaffe/kaffe/kaffevm/reference.c:1.4 Fri Mar 11 16:48:51 2005
+++ kaffe/kaffe/kaffevm/reference.c Thu Mar 31 10:39:27 2005
@@ -123,7 +123,7 @@
bool KaffeVM_isReferenced(jobject obj)
{
- referenceLinkListHead *ref;
+ const referenceLinkListHead *ref;
lockStaticMutex(&referencesLock);
ref = hashFind(referencesHashTable, obj);
Index: kaffe/kaffe/kaffevm/soft.h
diff -u kaffe/kaffe/kaffevm/soft.h:1.18 kaffe/kaffe/kaffevm/soft.h:1.19
--- kaffe/kaffe/kaffevm/soft.h:1.18 Mon Aug 30 13:14:40 2004
+++ kaffe/kaffe/kaffevm/soft.h Thu Mar 31 10:39:27 2005
@@ -30,18 +30,18 @@
void* soft_checkcast(struct Hjava_lang_Class*, struct Hjava_lang_Object*);
jint soft_instanceof(struct Hjava_lang_Class*, struct Hjava_lang_Object*);
-void soft_athrow(struct Hjava_lang_Object*) NONRETURNING;
-void soft_badarrayindex(void) NONRETURNING;
-void soft_nullpointer(void) NONRETURNING;
-void soft_divzero(void) NONRETURNING;
-void soft_nosuchmethod(struct Hjava_lang_Class*, Utf8Const*, Utf8Const*) NONRETURNING;
-void soft_nosuchfield(Utf8Const*, Utf8Const*) NONRETURNING;
-void soft_nosuchclass(Utf8Const*) NONRETURNING;
-void soft_linkage(Utf8Const*, Utf8Const*) NONRETURNING;
-void soft_illegalaccess(Utf8Const*, Utf8Const*) NONRETURNING;
-void soft_incompatibleclasschange(Utf8Const*, Utf8Const*) NONRETURNING;
-void soft_abstractmethod(Utf8Const*, Utf8Const*) NONRETURNING;
-void soft_stackoverflow(void) NONRETURNING;
+void soft_athrow(struct Hjava_lang_Object*);
+void soft_badarrayindex(void);
+void soft_nullpointer(void);
+void soft_divzero(void);
+void soft_nosuchmethod(struct Hjava_lang_Class*, Utf8Const*, Utf8Const*);
+void soft_nosuchfield(Utf8Const*, Utf8Const*);
+void soft_nosuchclass(Utf8Const*);
+void soft_linkage(Utf8Const*, Utf8Const*);
+void soft_illegalaccess(Utf8Const*, Utf8Const*);
+void soft_incompatibleclasschange(Utf8Const*, Utf8Const*);
+void soft_abstractmethod(Utf8Const*, Utf8Const*);
+void soft_stackoverflow(void);
void soft_checkarraystore(struct Hjava_lang_Object*, struct Hjava_lang_Object*);
void soft_addreference(void*, void*);
Index: kaffe/kaffe/kaffevm/string.c
diff -u kaffe/kaffe/kaffevm/string.c:1.41 kaffe/kaffe/kaffevm/string.c:1.42
--- kaffe/kaffe/kaffevm/string.c:1.41 Mon Mar 28 16:08:37 2005
+++ kaffe/kaffe/kaffevm/string.c Thu Mar 31 10:39:27 2005
@@ -290,7 +290,7 @@
{
/* XXX assumes stringLock isn't acquired recursively (which it isn't) */
unlockStaticMutex(&stringLock);
- KFREE(ptr);
+ KFREE((void *) ptr);
lockStaticMutex(&stringLock);
}
@@ -447,7 +447,7 @@
/* Return existing copy of this string, if any */
lockStaticMutex(&stringLock);
- string = hashFind(hashTable, &fakeString);
+ string = (Hjava_lang_String *) hashFind(hashTable, &fakeString);
unlockStaticMutex(&stringLock);
if (fakeAry != (HArrayOfChar*)buf) {
Index: kaffe/kaffe/kaffevm/support.h
diff -u kaffe/kaffe/kaffevm/support.h:1.39 kaffe/kaffe/kaffevm/support.h:1.40
--- kaffe/kaffe/kaffevm/support.h:1.39 Fri Mar 11 16:41:53 2005
+++ kaffe/kaffe/kaffevm/support.h Thu Mar 31 10:39:27 2005
@@ -132,9 +132,9 @@
extern struct _methods* lookupObjectMethod(struct Hjava_lang_Object*, const char*, const char*, struct _errorInfo*);
struct _strconst;
-extern void SignalError(const char *, const char *) NONRETURNING;
-extern void SignalErrorf(const char *, const char *, ...) NONRETURNING PRINTFFORMAT(2,3);
-extern void unimp(const char*) NONRETURNING;
+extern void SignalError(const char *, const char *);
+extern void SignalErrorf(const char *, const char *, ...) PRINTFFORMAT(2,3);
+extern void unimp(const char*);
extern void kprintf(FILE*, const char*, ...) PRINTFFORMAT(2,3);
extern int addClasspath(const char*);
extern int prependClasspath(const char*);
Index: kaffe/kaffe/kaffevm/thread.c
diff -u kaffe/kaffe/kaffevm/thread.c:1.94 kaffe/kaffe/kaffevm/thread.c:1.95
--- kaffe/kaffe/kaffevm/thread.c:1.94 Sun Mar 13 20:42:41 2005
+++ kaffe/kaffe/kaffevm/thread.c Thu Mar 31 10:39:27 2005
@@ -573,7 +573,7 @@
unlockMutex(&tid->base);
}
-static void NONRETURNING
+static void
throwDeath(void)
{
throwException(ThreadDeath);
Index: kaffe/kaffe/kaffevm/utf8const.c
diff -u kaffe/kaffe/kaffevm/utf8const.c:1.46 kaffe/kaffe/kaffevm/utf8const.c:1.47
--- kaffe/kaffe/kaffevm/utf8const.c:1.46 Fri Mar 11 16:41:53 2005
+++ kaffe/kaffe/kaffevm/utf8const.c Thu Mar 31 10:39:27 2005
@@ -138,7 +138,7 @@
/* Lock intern table */
lockUTF();
- utf8 = hashFind(hashTable, fake);
+ utf8 = (Utf8Const *) hashFind(hashTable, fake);
if (utf8 != NULL) {
assert(utf8->nrefs >= 1);
@@ -170,7 +170,7 @@
/* Add to hash table */
lockUTF();
- temp = hashAdd(hashTable, utf8);
+ temp = (Utf8Const *) hashAdd(hashTable, utf8);
/*
* temp == 0 -> hash table couldn't resize, return 0
Index: kaffe/kaffe/kaffevm/jit/machine.h
diff -u kaffe/kaffe/kaffevm/jit/machine.h:1.21 kaffe/kaffe/kaffevm/jit/machine.h:1.22
--- kaffe/kaffe/kaffevm/jit/machine.h:1.21 Mon Dec 27 16:09:47 2004
+++ kaffe/kaffe/kaffevm/jit/machine.h Thu Mar 31 10:39:28 2005
@@ -10,6 +10,9 @@
#ifndef __machine_h
#define __machine_h
+#include "errors.h"
+#include "gtypes.h"
+
/* -------------------------------------------------------------------- */
#define KJIT(funcName) KaffeJIT_ ## funcName
Index: kaffe/kaffe/kaffevm/jit/methodcalls.c
diff -u kaffe/kaffe/kaffevm/jit/methodcalls.c:1.8 kaffe/kaffe/kaffevm/jit/methodcalls.c:1.9
--- kaffe/kaffe/kaffevm/jit/methodcalls.c:1.8 Wed Mar 16 10:31:05 2005
+++ kaffe/kaffe/kaffevm/jit/methodcalls.c Thu Mar 31 10:39:28 2005
@@ -18,6 +18,7 @@
#define NEED_sysdepCallMethod 1
#endif
+#include "machine.h"
#include "methodcalls.h"
#define TDBG(s)
Index: kaffe/kaffe/kaffevm/jit3/basecode.c
diff -u kaffe/kaffe/kaffevm/jit3/basecode.c:1.9 kaffe/kaffe/kaffevm/jit3/basecode.c:1.10
--- kaffe/kaffe/kaffevm/jit3/basecode.c:1.9 Fri Dec 17 17:47:35 2004
+++ kaffe/kaffe/kaffevm/jit3/basecode.c Thu Mar 31 10:39:28 2005
@@ -335,9 +335,6 @@
}
void
-#if defined(TWO_OPERAND)
-NONRETURNING
-#endif
slot_lslot_lslot(SlotInfo* dst, SlotInfo* s1, SlotInfo* s2, ifunc f, int type)
{
sequence* seq;
Index: kaffe/kaffe/kaffevm/jit3/codeproto.h
diff -u kaffe/kaffe/kaffevm/jit3/codeproto.h:1.16 kaffe/kaffe/kaffevm/jit3/codeproto.h:1.17
--- kaffe/kaffe/kaffevm/jit3/codeproto.h:1.16 Thu Aug 19 19:29:05 2004
+++ kaffe/kaffe/kaffevm/jit3/codeproto.h Thu Mar 31 10:39:28 2005
@@ -157,7 +157,7 @@
void mon_enter(Method*, SlotInfo*);
void mon_exit(Method*, SlotInfo*);
void epilogue(Method*);
-void softcall_breakpoint(void) NONRETURNING;
+void softcall_breakpoint(void);
void load_int(SlotInfo*, SlotInfo*);
void load_ref(SlotInfo*, SlotInfo*);
Index: kaffe/kaffe/kaffevm/jit3/registers.c
diff -u kaffe/kaffe/kaffevm/jit3/registers.c:1.19 kaffe/kaffe/kaffevm/jit3/registers.c:1.20
--- kaffe/kaffe/kaffevm/jit3/registers.c:1.19 Sun Mar 13 20:46:18 2005
+++ kaffe/kaffe/kaffevm/jit3/registers.c Thu Mar 31 10:39:28 2005
@@ -24,7 +24,7 @@
#include "labels.h"
#include "codeproto.h"
#include "gc.h"
-
+#include "funcs.h"
#include "debug.h"
#include "kaffe_jni.h"
Index: kaffe/kaffe/kaffevm/jni/jni-string.c
diff -u kaffe/kaffe/kaffevm/jni/jni-string.c:1.8 kaffe/kaffe/kaffevm/jni/jni-string.c:1.9
--- kaffe/kaffe/kaffevm/jni/jni-string.c:1.8 Sat Jan 1 15:55:54 2005
+++ kaffe/kaffe/kaffevm/jni/jni-string.c Thu Mar 31 10:39:28 2005
@@ -185,7 +185,7 @@
{
BEGIN_EXCEPTION_HANDLING_VOID();
- KFREE(chars);
+ KFREE((void *) chars);
END_EXCEPTION_HANDLING();
}
Index: kaffe/kaffe/kaffevm/jni/jni.c
diff -u kaffe/kaffe/kaffevm/jni/jni.c:1.20 kaffe/kaffe/kaffevm/jni/jni.c:1.21
--- kaffe/kaffe/kaffevm/jni/jni.c:1.20 Sun Mar 13 23:23:47 2005
+++ kaffe/kaffe/kaffevm/jni/jni.c Thu Mar 31 10:39:28 2005
@@ -67,7 +67,7 @@
table = THREAD_DATA()->jnireferences;
if (table->used == table->frameSize) {
- Kaffe_FatalError(THREAD_DATA()->jniEnv, "No more room for local references");
+ Kaffe_FatalError(THREAD_JNIENV(), "No more room for local references");
}
idx = table->next;
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.c
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.c:1.19 kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.c:1.20
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.c:1.19 Sun Feb 13 16:51:37 2005
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.c Thu Mar 31 10:39:29 2005
@@ -93,7 +93,7 @@
}
void
-jmutex_lock( jmutex* lk )
+jmutex_lock(jmutex* lk )
{
jthread_t cur = jthread_current ();
sigset_t oldmask;
@@ -122,7 +122,7 @@
* have to convert into a absolute timespec now)
*/
jboolean
-jcondvar_wait ( jcondvar* cv, jmutex *mux, jlong timeout )
+jcondvar_wait (jcondvar* cv, jmutex *mux, jlong timeout )
{
jthread_t cur = jthread_current();
int status = 0;
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.h
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.h:1.9 kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.h:1.10
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.h:1.9 Tue Jan 4 18:11:50 2005
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.h Thu Mar 31 10:39:29 2005
@@ -25,12 +25,12 @@
extern void KaffePThread_clearBlockingCall(void *sigdata);
static inline void jmutex_initialise( jmutex* lk ) __UNUSED__;
-extern void jmutex_lock( jmutex* lk );
+extern void jmutex_lock(jmutex* lk );
static inline void jmutex_unlock( jmutex* lk ) __UNUSED__;
static inline void jcondvar_initialise( jcondvar* cv ) __UNUSED__;
static inline void jcondvar_signal( jcondvar* cv, jmutex *mux ) __UNUSED__;
-extern jboolean jcondvar_wait( jcondvar* cv, jmutex* mux, jlong timeout );
+extern jboolean jcondvar_wait(jcondvar* cv, jmutex* mux, jlong timeout );
/* inline jmutex/jcondvar functions. */
Index: kaffe/kaffe/kaffevm/verifier/verify2.c
diff -u kaffe/kaffe/kaffevm/verifier/verify2.c:1.4 kaffe/kaffe/kaffevm/verifier/verify2.c:1.5
--- kaffe/kaffe/kaffevm/verifier/verify2.c:1.4 Sat Jun 26 23:57:19 2004
+++ kaffe/kaffe/kaffevm/verifier/verify2.c Thu Mar 31 10:39:29 2005
@@ -41,7 +41,7 @@
bool
checkField(Field *field, errorInfo *einfo)
{
- char *reason = checkAccessFlags(CLASS_IS_INTERFACE(field->clazz) ? ACC_TYPE_INTERFACE_FIELD : ACC_TYPE_FIELD,
+ const char *reason = checkAccessFlags(CLASS_IS_INTERFACE(field->clazz) ? ACC_TYPE_INTERFACE_FIELD : ACC_TYPE_FIELD,
field->accflags);
if (reason) {
postExceptionMessage(einfo,
Index: kaffe/libraries/clib/native/Array.c
diff -u kaffe/libraries/clib/native/Array.c:1.21 kaffe/libraries/clib/native/Array.c:1.22
--- kaffe/libraries/clib/native/Array.c:1.21 Sat Dec 11 20:49:40 2004
+++ kaffe/libraries/clib/native/Array.c Thu Mar 31 10:39:29 2005
@@ -43,8 +43,8 @@
{
if (size < 0) {
SignalError("java.lang.NegativeArraySizeException", "");
- } else {
- return (newArray(clazz, (jsize) size));
}
+
+ return (newArray(clazz, (jsize) size));
}
Index: kaffe/libraries/clib/native/Class.c
diff -u kaffe/libraries/clib/native/Class.c:1.80 kaffe/libraries/clib/native/Class.c:1.81
--- kaffe/libraries/clib/native/Class.c:1.80 Sun Jan 9 17:26:14 2005
+++ kaffe/libraries/clib/native/Class.c Thu Mar 31 10:39:29 2005
@@ -686,6 +686,7 @@
}
SignalError("java.lang.NoSuchMethodException", ""); /* FIXME */
+ return NULL;
}
static
Index: kaffe/libraries/clib/native/Runtime.c
diff -u kaffe/libraries/clib/native/Runtime.c:1.33 kaffe/libraries/clib/native/Runtime.c:1.34
--- kaffe/libraries/clib/native/Runtime.c:1.33 Sun Feb 6 20:39:10 2005
+++ kaffe/libraries/clib/native/Runtime.c Thu Mar 31 10:39:29 2005
@@ -39,7 +39,6 @@
* Exit this VM
*/
void
-NONRETURNING
java_lang_Runtime_exit0(struct Hjava_lang_Runtime* r UNUSED, jint v)
{
EXIT (v);
More information about the kaffe
mailing list