[kaffe] CVS kaffe (dalibor): Fixed build on sparc64-linux

Kaffe CVS cvs-commits at kaffe.org
Tue Jul 6 10:30:57 PDT 2004


PatchSet 4898 
Date: 2004/07/06 17:16:01
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed build on sparc64-linux

2004-07-06  Dalibor Topic  <robilad at kaffe.org>

        * config/sparc/linux/jit-md.h:
        (EXCEPTIONFRAME) Use generic GET_PC and
        GET_STACK macros from glibc that work on both sparc
        and sparc64. Fixes build on sparc64-linux.

        * kaffe/kaffevm/soft.c,
        kaffe/kaffevm/support.c,
        kaffe/kaffevm/jit/constpool.c,
        kaffe/kaffevm/jit/icode.c,
        kaffe/kaffevm/jit/labels.c,
        kaffe/kaffevm/jit/machine.c,
        kaffe/kaffevm/jit/seq.c,
        kaffe/kaffevm/jit/slots.c,
        libraries/clib/math/BigInteger.c,
        libraries/clib/native/UNIXProcess.c:
        Added missing include for kaffe/jmalloc.h.

Members: 
	ChangeLog:1.2464->1.2465 
	config/sparc/linux/jit-md.h:1.2->1.3 
	kaffe/kaffevm/soft.c:1.63->1.64 
	kaffe/kaffevm/support.c:1.68->1.69 
	kaffe/kaffevm/jit/constpool.c:1.4->1.5 
	kaffe/kaffevm/jit/icode.c:1.26->1.27 
	kaffe/kaffevm/jit/labels.c:1.8->1.9 
	kaffe/kaffevm/jit/machine.c:1.66->1.67 
	kaffe/kaffevm/jit/seq.c:1.3->1.4 
	kaffe/kaffevm/jit/slots.c:1.4->1.5 
	libraries/clib/math/BigInteger.c:1.20->1.21 
	libraries/clib/native/UNIXProcess.c:1.30->1.31 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2464 kaffe/ChangeLog:1.2465
--- kaffe/ChangeLog:1.2464	Tue Jul  6 16:56:58 2004
+++ kaffe/ChangeLog	Tue Jul  6 17:16:01 2004
@@ -1,3 +1,22 @@
+2004-07-06  Dalibor Topic  <robilad at kaffe.org>
+
+        * config/sparc/linux/jit-md.h:
+	(EXCEPTIONFRAME) Use generic GET_PC and 
+	GET_STACK macros from glibc that work on both sparc 
+	and sparc64. Fixes build on sparc64-linux.
+
+        * kaffe/kaffevm/soft.c,
+        kaffe/kaffevm/support.c,
+        kaffe/kaffevm/jit/constpool.c,
+        kaffe/kaffevm/jit/icode.c,
+        kaffe/kaffevm/jit/labels.c,
+        kaffe/kaffevm/jit/machine.c,
+        kaffe/kaffevm/jit/seq.c,
+        kaffe/kaffevm/jit/slots.c,
+        libraries/clib/math/BigInteger.c,
+        libraries/clib/native/UNIXProcess.c:
+	Added missing include for "kaffe/jmalloc.h".
+
 2004-07-06  Guilhem Lavaux <guilhem at kaffe.org>
 
 	* include/jni.h: Fixed compilation for C++.
Index: kaffe/config/sparc/linux/jit-md.h
diff -u kaffe/config/sparc/linux/jit-md.h:1.2 kaffe/config/sparc/linux/jit-md.h:1.3
--- kaffe/config/sparc/linux/jit-md.h:1.2	Thu Apr  4 12:55:32 2002
+++ kaffe/config/sparc/linux/jit-md.h	Tue Jul  6 17:16:08 2004
@@ -27,15 +27,13 @@
 #include <sigcontext.h> 
 #endif
 
-#include <asm/ptrace.h>
-
 /* Function prototype for signal handlers */
 #define	EXCEPTIONPROTO							\
 	int sig, struct sigcontext* ctx
 
 /* Get the first exception frame from a signal handler */
 #define	EXCEPTIONFRAME(f, c)						\
-	(f).retbp = (c)->si_regs.u_regs[UREG_FP];			\
-	(f).retpc = (c)->si_regs.pc
+	(f).retbp = GET_STACK(c);			\
+	(f).retpc = GET_PC(c)
 
 #endif
Index: kaffe/kaffe/kaffevm/soft.c
diff -u kaffe/kaffe/kaffevm/soft.c:1.63 kaffe/kaffe/kaffevm/soft.c:1.64
--- kaffe/kaffe/kaffevm/soft.c:1.63	Mon May 24 17:24:41 2004
+++ kaffe/kaffe/kaffevm/soft.c	Tue Jul  6 17:16:13 2004
@@ -9,6 +9,8 @@
  * of this file.
  */
 
+#include <stdarg.h>
+
 #include "debug.h"
 #define	TDBG(s)
 
@@ -16,8 +18,8 @@
 #include "config-std.h"
 #include "config-math.h"
 #include "config-mem.h"
-#include <stdarg.h>
 #include "gtypes.h"
+#include "kaffe/jmalloc.h"
 #include "bytecode.h"
 #include "slots.h"
 #include "access.h"
Index: kaffe/kaffe/kaffevm/support.c
diff -u kaffe/kaffe/kaffevm/support.c:1.68 kaffe/kaffe/kaffevm/support.c:1.69
--- kaffe/kaffe/kaffevm/support.c:1.68	Mon Jul  5 16:40:40 2004
+++ kaffe/kaffe/kaffevm/support.c	Tue Jul  6 17:16:15 2004
@@ -17,6 +17,7 @@
 #include <stdarg.h>
 #include "errors.h"
 #include "kaffe/jni_md.h"
+#include "kaffe/jmalloc.h"
 #include "gtypes.h"
 #include "access.h"
 #include "object.h"
Index: kaffe/kaffe/kaffevm/jit/constpool.c
diff -u kaffe/kaffe/kaffevm/jit/constpool.c:1.4 kaffe/kaffe/kaffevm/jit/constpool.c:1.5
--- kaffe/kaffe/kaffevm/jit/constpool.c:1.4	Sun Jun 27 12:08:36 2004
+++ kaffe/kaffe/kaffevm/jit/constpool.c	Tue Jul  6 17:16:18 2004
@@ -14,6 +14,7 @@
 #include "gtypes.h"
 #include "constpool.h"
 #include "gc.h"
+#include "kaffe/jmalloc.h"
 #include "support.h"
 #include "stats.h"
 
Index: kaffe/kaffe/kaffevm/jit/icode.c
diff -u kaffe/kaffe/kaffevm/jit/icode.c:1.26 kaffe/kaffe/kaffevm/jit/icode.c:1.27
--- kaffe/kaffe/kaffevm/jit/icode.c:1.26	Sun May 16 11:16:38 2004
+++ kaffe/kaffe/kaffevm/jit/icode.c	Tue Jul  6 17:16:19 2004
@@ -12,6 +12,7 @@
 #include "config-std.h"
 #include "config-mem.h"
 #include "gtypes.h"
+#include "kaffe/jmalloc.h"
 #include "slots.h"
 #include "seq.h"
 #include "registers.h"
Index: kaffe/kaffe/kaffevm/jit/labels.c
diff -u kaffe/kaffe/kaffevm/jit/labels.c:1.8 kaffe/kaffe/kaffevm/jit/labels.c:1.9
--- kaffe/kaffe/kaffevm/jit/labels.c:1.8	Sun Jun 17 16:39:09 2001
+++ kaffe/kaffe/kaffevm/jit/labels.c	Tue Jul  6 17:16:20 2004
@@ -13,6 +13,7 @@
 #include "config-mem.h"
 #include "gtypes.h"
 #include "classMethod.h"
+#include "kaffe/jmalloc.h"
 #include "labels.h"
 #include "code-analyse.h"
 #include "itypes.h"
Index: kaffe/kaffe/kaffevm/jit/machine.c
diff -u kaffe/kaffe/kaffevm/jit/machine.c:1.66 kaffe/kaffe/kaffevm/jit/machine.c:1.67
--- kaffe/kaffe/kaffevm/jit/machine.c:1.66	Tue Jul  6 15:57:14 2004
+++ kaffe/kaffe/kaffevm/jit/machine.c	Tue Jul  6 17:16:20 2004
@@ -14,6 +14,7 @@
 #include "config-mem.h"
 #include "classMethod.h"
 #include "gtypes.h"
+#include "kaffe/jmalloc.h"
 #include "bytecode.h"
 #include "slots.h"
 #include "registers.h"
Index: kaffe/kaffe/kaffevm/jit/seq.c
diff -u kaffe/kaffe/kaffevm/jit/seq.c:1.3 kaffe/kaffe/kaffevm/jit/seq.c:1.4
--- kaffe/kaffe/kaffevm/jit/seq.c:1.3	Wed May  5 19:06:25 1999
+++ kaffe/kaffe/kaffevm/jit/seq.c	Tue Jul  6 17:16:21 2004
@@ -12,6 +12,7 @@
 #include "config-std.h"
 #include "config-mem.h"
 #include "gtypes.h"
+#include "kaffe/jmalloc.h"
 #include "seq.h"
 #include "gc.h"
 #include "support.h"
Index: kaffe/kaffe/kaffevm/jit/slots.c
diff -u kaffe/kaffe/kaffevm/jit/slots.c:1.4 kaffe/kaffe/kaffevm/jit/slots.c:1.5
--- kaffe/kaffe/kaffevm/jit/slots.c:1.4	Mon Jun 14 00:12:38 1999
+++ kaffe/kaffe/kaffevm/jit/slots.c	Tue Jul  6 17:16:21 2004
@@ -11,6 +11,7 @@
 #include "config.h"
 #include "config-std.h"
 #include "gtypes.h"
+#include "kaffe/jmalloc.h"
 #include "slots.h"
 #include "registers.h"
 #include "md.h"
Index: kaffe/libraries/clib/math/BigInteger.c
diff -u kaffe/libraries/clib/math/BigInteger.c:1.20 kaffe/libraries/clib/math/BigInteger.c:1.21
--- kaffe/libraries/clib/math/BigInteger.c:1.20	Tue Sep 30 19:50:53 2003
+++ kaffe/libraries/clib/math/BigInteger.c	Tue Jul  6 17:16:25 2004
@@ -16,6 +16,8 @@
 #include <gmp.h>
 #include <stdlib.h>
 
+#include "kaffe/jmalloc.h"
+
 static jfieldID number;
 
 static void *
Index: kaffe/libraries/clib/native/UNIXProcess.c
diff -u kaffe/libraries/clib/native/UNIXProcess.c:1.30 kaffe/libraries/clib/native/UNIXProcess.c:1.31
--- kaffe/libraries/clib/native/UNIXProcess.c:1.30	Fri May 21 15:19:24 2004
+++ kaffe/libraries/clib/native/UNIXProcess.c	Tue Jul  6 17:16:28 2004
@@ -17,6 +17,7 @@
 #include "config-mem.h"
 #include "config-io.h"
 #include "config-signal.h"
+#include "kaffe/jmalloc.h"
 #include <jni.h>
 #include <jsyscall.h>
 #include <native.h>




More information about the kaffe mailing list