[kaffe] CVS kaffe (guilhem): Fixes for POWERPC. Jar tool code cleanup.

[Kaffe CVS]

PatchSet 4703 
Date: 2004/04/27 18:25:15
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Fixes for POWERPC. Jar tool code cleanup.

       * config/powerpc/aix/md.h, config/powerpc/darwin/md.h,
        config/powerpc/linux/md.h, config/powerpc/machten/md.h,
        config/powerpc/netbsd1/md.h:
        Added definition for SIGNAL_ARGS on powerpc architectures.

        * libraries/javalib/kaffe/tools/jar/Jar.java:
        Reorganised "if"s. Code simplification.

Members: 
	ChangeLog:1.2279->1.2280 
	config/powerpc/aix/md.h:1.3->1.4 
	config/powerpc/darwin/md.h:1.2->1.3 
	config/powerpc/linux/md.h:1.4->1.5 
	config/powerpc/machten/md.h:1.1->1.2 
	config/powerpc/netbsd1/md.h:1.2->1.3 
	libraries/javalib/kaffe/tools/jar/Jar.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2279 kaffe/ChangeLog:1.2280
--- kaffe/ChangeLog:1.2279	Tue Apr 27 16:14:21 2004
+++ kaffe/ChangeLog	Tue Apr 27 18:25:15 2004
@@ -1,3 +1,13 @@
+2004-04-27  Guilhem Lavaux <guilhem at kaffe.org>
+
+	* config/powerpc/aix/md.h, config/powerpc/darwin/md.h,
+	config/powerpc/linux/md.h, config/powerpc/machten/md.h,
+	config/powerpc/netbsd1/md.h:
+	Added definition for SIGNAL_ARGS on powerpc architectures.
+
+	* libraries/javalib/kaffe/tools/jar/Jar.java:
+	Reorganised "if"s. Code simplification.
+
 2004-04-27  Dalibor Topic  <robilad at kaffe.org>
 
 	* kaffe/kaffevm/file.c:
Index: kaffe/config/powerpc/aix/md.h
diff -u kaffe/config/powerpc/aix/md.h:1.3 kaffe/config/powerpc/aix/md.h:1.4
--- kaffe/config/powerpc/aix/md.h:1.3	Sun Jun 17 16:40:16 2001
+++ kaffe/config/powerpc/aix/md.h	Tue Apr 27 18:25:16 2004
@@ -34,4 +34,7 @@
 #define COMPARE_AND_EXCHANGE(A,O,N)		\
 	__aix_cmpxchg((void**)(A), (void*)(O), (void*)(N))
 
+#define SIGNAL_ARGS(sig, sc) int sig
+#undef HAVE_SIGALTSTACK
+
 #endif
Index: kaffe/config/powerpc/darwin/md.h
diff -u kaffe/config/powerpc/darwin/md.h:1.2 kaffe/config/powerpc/darwin/md.h:1.3
--- kaffe/config/powerpc/darwin/md.h:1.2	Sat Apr 24 12:32:45 2004
+++ kaffe/config/powerpc/darwin/md.h	Tue Apr 27 18:25:17 2004
@@ -29,6 +29,8 @@
 #define STACK_POINTER(scp) ((scp)->si_addr)
 #else
 #warning Some exceptions may not work properly.
+#define SIGNAL_ARGS(sig, sc) int sig
+#undef HAVE_SIGALTSTACK
 #endif
 
 #endif
Index: kaffe/config/powerpc/linux/md.h
diff -u kaffe/config/powerpc/linux/md.h:1.4 kaffe/config/powerpc/linux/md.h:1.5
--- kaffe/config/powerpc/linux/md.h:1.4	Tue Jul 25 18:38:27 2000
+++ kaffe/config/powerpc/linux/md.h	Tue Apr 27 18:25:17 2004
@@ -25,4 +25,7 @@
 #endif
 #define SP_OFFSET	0
 
+#define SIGNAL_ARGS(sig, sc) int sig
+#undef HAVE_SIGALTSTACK
+
 #endif
Index: kaffe/config/powerpc/machten/md.h
diff -u kaffe/config/powerpc/machten/md.h:1.1 kaffe/config/powerpc/machten/md.h:1.2
--- kaffe/config/powerpc/machten/md.h:1.1	Tue Mar 31 19:10:53 1998
+++ kaffe/config/powerpc/machten/md.h	Tue Apr 27 18:25:17 2004
@@ -19,4 +19,7 @@
 #include "jit-md.h"
 #endif
 
+#define SIGNAL_ARGS(sig, sc) int sig
+#undef HAVE_SIGALTSTACK
+
 #endif
Index: kaffe/config/powerpc/netbsd1/md.h
diff -u kaffe/config/powerpc/netbsd1/md.h:1.2 kaffe/config/powerpc/netbsd1/md.h:1.3
--- kaffe/config/powerpc/netbsd1/md.h:1.2	Mon Aug  6 10:03:10 2001
+++ kaffe/config/powerpc/netbsd1/md.h	Tue Apr 27 18:25:19 2004
@@ -46,4 +46,7 @@
 
 #endif
 
+#define SIGNAL_ARGS(sig, sc) int sig
+#undef HAVE_SIGALTSTACK
+
 #endif
Index: kaffe/libraries/javalib/kaffe/tools/jar/Jar.java
diff -u kaffe/libraries/javalib/kaffe/tools/jar/Jar.java:1.5 kaffe/libraries/javalib/kaffe/tools/jar/Jar.java:1.6
--- kaffe/libraries/javalib/kaffe/tools/jar/Jar.java:1.5	Sun Apr 25 15:34:20 2004
+++ kaffe/libraries/javalib/kaffe/tools/jar/Jar.java	Tue Apr 27 18:25:19 2004
@@ -517,14 +517,13 @@
 
 
 	    String absolute_name = tmp.getAbsolutePath();
-	    String canon = tmp.getCanonicalPath();
 
 	    if (debug) {
+	        String canon = tmp.getCanonicalPath();
+
 		System.out.println("absolute  was \"" + absolute_name + "\"");
 		System.out.println("canon     was \"" + canon + "\"");
-	    }
 
-	    if (debug) {
 		System.out.println("file name is \"" + files[i]
 				   + "\"");