[kaffe] CVS kaffe (robilad): Fixed jit build on powerpc-darwin

Kaffe CVS cvs-commits at kaffe.org
Wed Jul 13 14:33:07 PDT 2005


PatchSet 6729 
Date: 2005/07/13 21:27:40
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Fixed jit build on powerpc-darwin

2005-07-13  Andreas Tobler  <toa at pop.agri.ch>

        * config/powerpc/trampolines.S:
        Fixed to work with PIC on darwin. All jit tests pass now on Panther.

Members: 
	ChangeLog:1.4253->1.4254 
	config/powerpc/trampolines.S:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4253 kaffe/ChangeLog:1.4254
--- kaffe/ChangeLog:1.4253	Wed Jul 13 20:46:38 2005
+++ kaffe/ChangeLog	Wed Jul 13 21:27:40 2005
@@ -1,5 +1,10 @@
 2005-07-13  Andreas Tobler  <toa at pop.agri.ch>
 
+	* config/powerpc/trampolines.S:
+	Fixed to work with PIC on darwin. All jitBasic tests pass now on Panther.
+
+2005-07-13  Andreas Tobler  <toa at pop.agri.ch>
+
 	* config/powerpc/darwin/jit3-md.h: Removed broken comment
 	delimiters.
 
Index: kaffe/config/powerpc/trampolines.S
diff -u kaffe/config/powerpc/trampolines.S:1.3 kaffe/config/powerpc/trampolines.S:1.4
--- kaffe/config/powerpc/trampolines.S:1.3	Wed Jun 29 17:23:39 2005
+++ kaffe/config/powerpc/trampolines.S	Wed Jul 13 21:27:43 2005
@@ -3,6 +3,7 @@
  *
  */
 
+#define L(x) x
 #include "kaffe/trampoline.h"
 
 /* include common ppc asm syntax header */
@@ -67,7 +68,7 @@
 # Call soft_fixup_trampoline(). Return value will be in r3,
 # which is the address of the translated native code.
 
-     bl C_FUNC_NAME(soft_fixup_trampoline)
+     bl Lsoft_fixup_trampoline$stub
 
 # Save return value in ctr, so that we can jump there at the
 # end of this function
@@ -115,3 +116,25 @@
      bctr
 
 #endif
+
+.data
+	.align 2
+LDFCM0:
+	.section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32
+	.align	2
+Lsoft_fixup_trampoline$stub:
+	.indirect_symbol _soft_fixup_trampoline
+	mflr	r0
+	bcl	20,31,LO$soft_fixup_trampoline
+LO$soft_fixup_trampoline:
+	mflr	r11
+	addis	r11,r11,ha16(L_soft_fixup_trampoline$lazy_ptr - LO$soft_fixup_trampoline)
+	mtlr	r0
+	lwzu	r12,lo16(L_soft_fixup_trampoline$lazy_ptr - LO$soft_fixup_trampoline)(r11)
+	mtctr	r12
+	bctr
+.data
+.lazy_symbol_pointer
+L_soft_fixup_trampoline$lazy_ptr:
+	.indirect_symbol _soft_fixup_trampoline
+	.long   dyld_stub_binding_helper



More information about the kaffe mailing list