[kaffe] CVS kaffe (robilad): factored out powerpc CALL_KAFFE_EXCEPTION into its own file

[Kaffe CVS]

PatchSet 7325 
Date: 2006/07/10 00:57:46
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
factored out powerpc CALL_KAFFE_EXCEPTION into its own file

2006-07-09  Dalibor Topic  <robilad at kaffe.org>

        * config/powerpc/callKaffeException.h: New file.
        * config/powerpc/jit.h: (CALL_KAFFE_EXCEPTION) Moved
        to callKaffeException.h.

        Reported by:  Riccardo Mottola <riccardo at kaffe.org>

Members: 
	ChangeLog:1.4828->1.4829 
	config/powerpc/callKaffeException.h:INITIAL->1.1 
	config/powerpc/jit.h:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4828 kaffe/ChangeLog:1.4829
--- kaffe/ChangeLog:1.4828	Sun Jul  9 17:32:01 2006
+++ kaffe/ChangeLog	Mon Jul 10 00:57:46 2006
@@ -1,4 +1,12 @@
-2006-07-09  Dalibor Topic  <topic at amy.domain.wg>
+2006-07-09  Dalibor Topic  <robilad at kaffe.org>
+
+	* config/powerpc/callKaffeException.h: New file.
+	* config/powerpc/jit.h: (CALL_KAFFE_EXCEPTION) Moved
+	to callKaffeException.h.
+
+	Reported by:  Riccardo Mottola <riccardo at kaffe.org>
+
+2006-07-09  Dalibor Topic  <robilad at kaffe.org>
 
 	* config/arm/linux/config.frag,
 	config/bfin/uclinux/config.frag,
===================================================================
Checking out kaffe/config/powerpc/callKaffeException.h
RCS:  /home/cvs/kaffe/kaffe/config/powerpc/callKaffeException.h,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/config/powerpc/callKaffeException.h	Mon Jul 10 01:15:01 2006
@@ -0,0 +1,37 @@
+/*
+ * powerpc/callKaffeException.h
+ * Common PowerPC JIT exception calling.
+ *
+ * Copyright (c) 2002, 2004 The University of Utah and the Flux Group.
+ * All rights reserved.
+ *
+ * @JANOSVM_KAFFE_JANOSVM_LICENSE@
+ */
+
+#ifndef __powerpc_callKaffeException_h
+#define __powerpc_callKaffeException_h
+
+/*
+ * Call a jitted java exception handler.
+ */
+#if defined(__APPLE__)
+#define CALL_KAFFE_EXCEPTION(frame, handler, object) \
+	asm volatile ("mr r1, %0\n" \
+		      "\tlwz r10, 0(r1)\n" \
+		      "\tlmw r14, -72(r10)\n" \
+		      "\tmr r3, %1\n" \
+		      "\tmtctr %2\n" \
+		      "\tbctr\n" \
+		      : : "r" (frame), "r" (object), "r" (handler) : "r3")
+#else
+#define CALL_KAFFE_EXCEPTION(frame, handler, object) \
+	asm volatile ("mr 1, %0\n" \
+		      "\tlwz 10, 0(1)\n" \
+		      "\tlmw 14, -72(10)\n" \
+		      "\tmr 3, %1\n" \
+		      "\tmtctr %2\n" \
+		      "\tbctr\n" \
+		      : : "r" (frame), "r" (object), "r" (handler) : "r3")
+#endif
+
+#endif
Index: kaffe/config/powerpc/jit.h
diff -u kaffe/config/powerpc/jit.h:1.4 kaffe/config/powerpc/jit.h:1.5
--- kaffe/config/powerpc/jit.h:1.4	Wed Aug 10 21:17:45 2005
+++ kaffe/config/powerpc/jit.h	Mon Jul 10 00:57:51 2006
@@ -91,29 +91,6 @@
 #define FIXUP_TRAMPOLINE_INIT meth = _meth; where = _where;
 
 /*
- * Call a jitted java exception handler.
- */
-#if defined(__APPLE__)
-#define CALL_KAFFE_EXCEPTION(frame, handler, object) \
-	asm volatile ("mr r1, %0\n" \
-		      "\tlwz r10, 0(r1)\n" \
-		      "\tlmw r14, -72(r10)\n" \
-		      "\tmr r3, %1\n" \
-		      "\tmtctr %2\n" \
-		      "\tbctr\n" \
-		      : : "r" (frame), "r" (object), "r" (handler) : "r3")
-#else
-#define CALL_KAFFE_EXCEPTION(frame, handler, object) \
-	asm volatile ("mr 1, %0\n" \
-		      "\tlwz 10, 0(1)\n" \
-		      "\tlmw 14, -72(10)\n" \
-		      "\tmr 3, %1\n" \
-		      "\tmtctr %2\n" \
-		      "\tbctr\n" \
-		      : : "r" (frame), "r" (object), "r" (handler) : "r3")
-#endif
-
-/*
  * Call a JanosVM catastrophe handler.
  * XXX implement me.
  */