[kaffe] CVS kaffe (guilhem): A few small fixes.

[Kaffe CVS]

PatchSet 4918 
Date: 2004/07/09 12:50:13
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
A few small fixes.

        * kaffe/kaffevm/external.c
        (discoverLibraryHome): Embrace between ENABLE_BINRELOC.

        * kaffe/kaffevm/jit3/constpool.c
        (constPoolTypeNames): Added 'const' (fix a warning).

        * kaffe/kaffevm/systems/unix-pthreads/signal.c
        (detectStackBoundaries): Check whether the previous handler
        was NULL for SIGSEGV and SIGBUS before reregistering it.

        * config/i386/jit3-i386.def
        (rnames): Added 'const' (fix a warning).

Members: 
	ChangeLog:1.2484->1.2485 
	config/i386/jit3-i386.def:1.24->1.25 
	kaffe/kaffevm/external.c:1.63->1.64 
	kaffe/kaffevm/jit3/constpool.c:1.8->1.9 
	kaffe/kaffevm/systems/unix-pthreads/signal.c:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2484 kaffe/ChangeLog:1.2485
--- kaffe/ChangeLog:1.2484	Fri Jul  9 06:20:22 2004
+++ kaffe/ChangeLog	Fri Jul  9 12:50:13 2004
@@ -1,3 +1,18 @@
+2004-07-09  Guilhem Lavaux <guilhem at kaffe.org>
+
+	* kaffe/kaffevm/external.c
+	(discoverLibraryHome): Embrace between ENABLE_BINRELOC.
+
+	* kaffe/kaffevm/jit3/constpool.c
+	(constPoolTypeNames): Added 'const' (fix a warning).
+
+	* kaffe/kaffevm/systems/unix-pthreads/signal.c
+	(detectStackBoundaries): Check whether the previous handler
+	was NULL for SIGSEGV and SIGBUS before reregistering it.
+
+	* config/i386/jit3-i386.def
+	(rnames): Added 'const' (fix a warning).
+
 2004-07-09  Jim Huang  <jserv at kaffe.org>
 
 	* libraries/javalib/profiles/default/coreawt.files,
Index: kaffe/config/i386/jit3-i386.def
diff -u kaffe/config/i386/jit3-i386.def:1.24 kaffe/config/i386/jit3-i386.def:1.25
--- kaffe/config/i386/jit3-i386.def:1.24	Sun Apr  4 04:52:37 2004
+++ kaffe/config/i386/jit3-i386.def	Fri Jul  9 12:50:15 2004
@@ -60,7 +60,7 @@
 	}
 
 
-char* rnames[] = { "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi", "flt0/dbl0" };
+const char* rnames[] = { "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi", "flt0/dbl0" };
 #define	regname(n)	rnames[n]
 
 #define	REG_eax		0
Index: kaffe/kaffe/kaffevm/external.c
diff -u kaffe/kaffe/kaffevm/external.c:1.63 kaffe/kaffe/kaffevm/external.c:1.64
--- kaffe/kaffe/kaffevm/external.c:1.63	Thu Jul  8 17:29:49 2004
+++ kaffe/kaffe/kaffevm/external.c	Fri Jul  9 12:50:15 2004
@@ -142,6 +142,7 @@
 	return (0);
 }
 
+#ifdef ENABLE_BINRELOC
 static
 const char *discoverLibraryHome()
 {
@@ -165,6 +166,7 @@
   
   return libraryHome;
 }
+#endif
 
 void
 initNative(void)
Index: kaffe/kaffe/kaffevm/jit3/constpool.c
diff -u kaffe/kaffe/kaffevm/jit3/constpool.c:1.8 kaffe/kaffe/kaffevm/jit3/constpool.c:1.9
--- kaffe/kaffe/kaffevm/jit3/constpool.c:1.8	Mon Mar 29 21:39:15 2004
+++ kaffe/kaffe/kaffevm/jit3/constpool.c	Fri Jul  9 12:50:16 2004
@@ -111,7 +111,7 @@
 	return (c);
 }
 
-char *constpoolTypeNames[] = {
+const char *constpoolTypeNames[] = {
 	"<invalid>",
 	"int",
 	"long",
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c:1.9 kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c:1.10
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c:1.9	Fri Jul  9 02:57:53 2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/signal.c	Fri Jul  9 12:50:16 2004
@@ -486,10 +486,12 @@
 #endif
 
 #if defined(SIGSEGV)
-	registerSyncSignalHandler(SIGSEGV, handler_segv);
+	if (handler_segv != NULL)
+	  registerSyncSignalHandler(SIGSEGV, handler_segv);
 #endif
 #if defined(SIGBUS)
-	registerSyncSignalHandler(SIGBUS, handler_bus);
+	if (handler_bus != NULL)
+	  registerSyncSignalHandler(SIGBUS, handler_bus);
 #endif
 }