Merge branch 'master' of git://factorcode.org/git/factor

basis/cpu/ppc/ppc.factor

@@ -3,9 +3,10 @@
 USING: accessors assocs sequences kernel combinators make math
 math.order math.ranges system namespaces locals layouts words
 alien alien.c-types literals cpu.architecture cpu.ppc.assembler
-literals compiler.cfg.registers compiler.cfg.instructions
-compiler.constants compiler.codegen compiler.codegen.fixup
-compiler.cfg.intrinsics compiler.cfg.stack-frame ;
+cpu.ppc.assembler.backend literals compiler.cfg.registers
+compiler.cfg.instructions compiler.constants compiler.codegen
+compiler.codegen.fixup compiler.cfg.intrinsics
+compiler.cfg.stack-frame ;
 IN: cpu.ppc
 
 ! PowerPC register assignments:
@@ -116,7 +117,7 @@ M: ppc stack-frame-size ( stack-frame -- i )
 M: ppc %call ( word -- ) 0 BL rc-relative-ppc-3 rel-word-pic ;
 
 M: ppc %jump ( word -- )
-    0 3 LOAD32 rc-absolute-ppc-2/2 rel-here
+    0 6 LOAD32 8 rc-absolute-ppc-2/2 rel-here
     0 B rc-relative-ppc-3 rel-word-pic-tail ;
 
 M: ppc %jump-label ( label -- ) B ;
@@ -130,7 +131,7 @@ M:: ppc %dispatch ( src temp offset -- )
     BCTR ;
 
 M: ppc %dispatch-label ( word -- )
-    0 , rc-absolute-cell rel-word ;
+    B{ 0 0 0 0 } % rc-absolute-cell rel-word ;
 
 :: (%slot) ( obj slot tag temp -- reg offset )
     temp slot obj ADD

vm/cpu-ppc.S

@@ -236,8 +236,10 @@ DEF(void,flush_icache,(void *start, int len)):
 	blr
 
 DEF(void,primitive_inline_cache_miss,(void)):
-    mflr r3
+    mflr r6
+DEF(void,primitive_inline_cache_miss_tail,(void)):
     PROLOGUE
+    mr r3,r6
     bl MANGLE(inline_cache_miss)
     EPILOGUE
     mtctr r3

vm/cpu-ppc.hpp

@@ -7,11 +7,22 @@ namespace factor
 register cell ds asm("r13");
 register cell rs asm("r14");
 
+/* In the instruction sequence:
+
+   LOAD32 r3,...
+   B blah
+
+   the offset from the immediate operand to LOAD32 to the instruction after
+   the branch is two instructions. */
+static const fixnum xt_tail_pic_offset = 4 * 2;
+
 inline static void check_call_site(cell return_address)
 {
 #ifdef FACTOR_DEBUG
 	cell insn = *(cell *)return_address;
-	assert((insn & 0x3) == 0x1);
+	/* Check that absolute bit is 0 */
+	assert((insn & 0x2) == 0x0);
+	/* Check that instruction is branch */
 	assert((insn >> 26) == 0x12);
 #endif
 }
@@ -21,8 +32,8 @@ inline static void check_call_site(cell return_address)
 inline static void *get_call_target(cell return_address)
 {
 	return_address -= sizeof(cell);
-
 	check_call_site(return_address);
+
 	cell insn = *(cell *)return_address;
 	cell unsigned_addr = (insn & B_MASK);
 	fixnum signed_addr = (fixnum)(unsigned_addr << 6) >> 6;
@@ -32,19 +43,25 @@ inline static void *get_call_target(cell return_address)
 inline static void set_call_target(cell return_address, void *target)
 {
 	return_address -= sizeof(cell);
-
-#ifdef FACTOR_DEBUG
-	assert((return_address & ~B_MASK) == 0);
 	check_call_site(return_address);
-#endif
+
 	cell insn = *(cell *)return_address;
-	insn = ((insn & ~B_MASK) | (((cell)target - return_address) & B_MASK));
+
+	fixnum relative_address = ((cell)target - return_address);
+	insn = ((insn & ~B_MASK) | (relative_address & B_MASK));
 	*(cell *)return_address = insn;
 
 	/* Flush the cache line containing the call we just patched */
 	__asm__ __volatile__ ("icbi 0, %0\n" "sync\n"::"r" (return_address):);
 }
 
+inline static bool tail_call_site_p(cell return_address)
+{
+	return_address -= sizeof(cell);
+	cell insn = *(cell *)return_address;
+	return (insn & 0x1) == 0;
+}
+
 /* Defined in assembly */
 VM_ASM_API void c_to_factor(cell quot);
 VM_ASM_API void throw_impl(cell quot, stack_frame *rewind);