PatchSet 4594
Date: 2004/03/29 21:13:31
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Added NONRETURNING where gcc warned about it
Members:
ChangeLog:1.2171->1.2172
kaffe/kaffevm/baseClasses.c:1.49->1.50
kaffe/kaffevm/exception.c:1.79->1.80
kaffe/kaffevm/lookup.c:1.34->1.35
kaffe/kaffevm/soft.h:1.14->1.15
kaffe/kaffevm/thread.c:1.58->1.59
kaffe/kaffevm/thread.h:1.17->1.18
kaffe/kaffevm/jit3/codeproto.h:1.14->1.15
kaffe/kaffevm/mem/gc-incremental.c:1.75->1.76
kaffe/kaffevm/systems/unix-jthreads/config-jthreads.h:1.9->1.10
kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.109->1.110
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2171 kaffe/ChangeLog:1.2172
--- kaffe/ChangeLog:1.2171 Mon Mar 29 21:08:27 2004
+++ kaffe/ChangeLog Mon Mar 29 21:13:31 2004
@@ -1,5 +1,10 @@
2004-03-29 Adam Heath <[EMAIL PROTECTED]>
+ Added NONRETURNING where gcc warned
+ about it.
+
+2004-03-29 Adam Heath <[EMAIL PROTECTED]>
+
* kaffe/kafeh/kaffeh-support.h:
Added missing includes and prototypes.
Index: kaffe/kaffe/kaffevm/baseClasses.c
diff -u kaffe/kaffe/kaffevm/baseClasses.c:1.49 kaffe/kaffe/kaffevm/baseClasses.c:1.50
--- kaffe/kaffe/kaffevm/baseClasses.c:1.49 Fri Mar 26 22:58:41 2004
+++ kaffe/kaffe/kaffevm/baseClasses.c Mon Mar 29 21:13:33 2004
@@ -220,7 +220,7 @@
GC_enable(main_collector);
}
-void
+static void NONRETURNING
abortWithEarlyClassFailure(errorInfo* einfo)
{
dprintf("\n"
Index: kaffe/kaffe/kaffevm/exception.c
diff -u kaffe/kaffe/kaffevm/exception.c:1.79 kaffe/kaffe/kaffevm/exception.c:1.80
--- kaffe/kaffe/kaffevm/exception.c:1.79 Mon Mar 29 20:24:30 2004
+++ kaffe/kaffe/kaffevm/exception.c Mon Mar 29 21:13:33 2004
@@ -66,8 +66,8 @@
#endif /* TRANSLATOR */
-static void nullException(struct _exceptionFrame *);
-static void floatingException(struct _exceptionFrame *);
+static void nullException(struct _exceptionFrame *) NONRETURNING;
+static void floatingException(struct _exceptionFrame *) NONRETURNING;
static void dispatchException(Hjava_lang_Throwable*, stackTraceInfo*) NONRETURNING;
extern void printStackTrace(struct Hjava_lang_Throwable*, struct Hjava_lang_Object*,
int);
Index: kaffe/kaffe/kaffevm/lookup.c
diff -u kaffe/kaffe/kaffevm/lookup.c:1.34 kaffe/kaffe/kaffevm/lookup.c:1.35
--- kaffe/kaffe/kaffevm/lookup.c:1.34 Mon Sep 22 15:31:24 2003
+++ kaffe/kaffe/kaffevm/lookup.c Mon Mar 29 21:13:33 2004
@@ -370,6 +370,7 @@
static
void
+NONRETURNING
throwAbstractMethodError(void)
{
throwException(AbstractMethodError);
Index: kaffe/kaffe/kaffevm/soft.h
diff -u kaffe/kaffe/kaffevm/soft.h:1.14 kaffe/kaffe/kaffevm/soft.h:1.15
--- kaffe/kaffe/kaffevm/soft.h:1.14 Sat Oct 11 20:45:49 2003
+++ kaffe/kaffe/kaffevm/soft.h Mon Mar 29 21:13:33 2004
@@ -12,6 +12,8 @@
#ifndef __soft_h
#define __soft_h
+#include "config.h"
+
struct _dispatchTable;
struct Hjava_lang_Class;
struct Hjava_lang_Object;
@@ -28,16 +30,16 @@
jint soft_instanceof(struct Hjava_lang_Class*, struct Hjava_lang_Object*);
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_stackoverflow(void);
+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_stackoverflow(void) NONRETURNING;
void soft_checkarraystore(struct Hjava_lang_Object*, struct Hjava_lang_Object*);
void soft_addreference(void*, void*);
Index: kaffe/kaffe/kaffevm/thread.c
diff -u kaffe/kaffe/kaffevm/thread.c:1.58 kaffe/kaffe/kaffevm/thread.c:1.59
--- kaffe/kaffe/kaffevm/thread.c:1.58 Mon Feb 2 13:32:29 2004
+++ kaffe/kaffe/kaffevm/thread.c Mon Mar 29 21:13:33 2004
@@ -586,7 +586,7 @@
unlockMutex(&tid->base);
}
-static void
+static void NONRETURNING
throwDeath(void)
{
Hjava_lang_Thread *cur = getCurrentThread();
Index: kaffe/kaffe/kaffevm/thread.h
diff -u kaffe/kaffe/kaffevm/thread.h:1.17 kaffe/kaffe/kaffevm/thread.h:1.18
--- kaffe/kaffe/kaffevm/thread.h:1.17 Sun Feb 1 22:14:53 2004
+++ kaffe/kaffe/kaffevm/thread.h Mon Mar 29 21:13:33 2004
@@ -12,6 +12,7 @@
#ifndef __thread_h
#define __thread_h
+#include "config.h"
#include "md.h"
#include "native.h"
@@ -33,7 +34,7 @@
void initNativeThreads(int nativestacksize);
void yieldThread(void);
void sleepThread(jlong);
-void exitThread(void);
+void exitThread(void) NONRETURNING;
bool aliveThread(Hjava_lang_Thread*);
jint framesThread(Hjava_lang_Thread*);
void setPriorityThread(Hjava_lang_Thread*, jint);
Index: kaffe/kaffe/kaffevm/jit3/codeproto.h
diff -u kaffe/kaffe/kaffevm/jit3/codeproto.h:1.14
kaffe/kaffe/kaffevm/jit3/codeproto.h:1.15
--- kaffe/kaffe/kaffevm/jit3/codeproto.h:1.14 Sat Oct 11 20:45:50 2003
+++ kaffe/kaffe/kaffevm/jit3/codeproto.h Mon Mar 29 21:13:33 2004
@@ -11,6 +11,8 @@
#ifndef __codeproto_h
#define __codeproto_h
+#include "config.h"
+
struct Hjava_lang_Class;
void _start_basic_block(void);
@@ -155,7 +157,7 @@
void mon_enter(Method*, SlotInfo*);
void mon_exit(Method*, SlotInfo*);
void epilogue(Method*);
-void softcall_breakpoint(void);
+void softcall_breakpoint(void) NONRETURNING;
void load_int(SlotInfo*, SlotInfo*);
void load_ref(SlotInfo*, SlotInfo*);
Index: kaffe/kaffe/kaffevm/mem/gc-incremental.c
diff -u kaffe/kaffe/kaffevm/mem/gc-incremental.c:1.75
kaffe/kaffe/kaffevm/mem/gc-incremental.c:1.76
--- kaffe/kaffe/kaffevm/mem/gc-incremental.c:1.75 Mon Mar 29 20:24:30 2004
+++ kaffe/kaffe/kaffevm/mem/gc-incremental.c Mon Mar 29 21:13:34 2004
@@ -489,7 +489,7 @@
* until it's finished incrementally, then tidying up before starting
* another one.
*/
-static void
+static void NONRETURNING
gcMan(void* arg)
{
gc_unit* unit;
@@ -849,7 +849,7 @@
* the objects in turn. An object is only finalised once after which
* it is deleted.
*/
-static void
+static void NONRETURNING
finaliserMan(void* arg)
{
gc_block* info;
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/config-jthreads.h
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/config-jthreads.h:1.9
kaffe/kaffe/kaffevm/systems/unix-jthreads/config-jthreads.h:1.10
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/config-jthreads.h:1.9 Mon Aug 4
13:48:14 2003
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/config-jthreads.h Mon Mar 29 21:13:34
2004
@@ -24,6 +24,8 @@
#ifndef __config_jthreads_h
#define __config_jthreads_h
+#include "config.h"
+
#include <assert.h>
#include <setjmp.h>
#include <sys/types.h>
@@ -136,7 +138,7 @@
}
/* let main thread loop until all threads finish, for tests */
-void jthread_exit_when_done();
+void jthread_exit_when_done() NONRETURNING;
/* debug.h stuff */
#ifdef KAFFE_VMDEBUG
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.109
kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.110
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.109 Mon Mar 15 14:19:44
2004
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c Mon Mar 29 21:13:35 2004
@@ -1448,7 +1448,7 @@
assert(!"Rescheduling dead thread");
}
-static void
+static void NONRETURNING
start_this_sucker_on_a_new_frame(void)
{
/* all threads start with interrupts turned off */
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
