X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fppc-arch.c;h=7aa24efbba21967cafa4d54dafd551be1bd86996;hb=1f23c9f7828d8aebeda92c8c1126114e10461ffa;hp=84c3365098bdef29fc5eff0aa1771228e20e7724;hpb=1419c1d2d50f039be46a8667351b7738ac4965e4;p=sbcl.git

diff --git a/src/runtime/ppc-arch.c b/src/runtime/ppc-arch.c
index 84c3365..7aa24ef 100644
--- a/src/runtime/ppc-arch.c
+++ b/src/runtime/ppc-arch.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
-#include "arch.h"
 #include "sbcl.h"
+#include "arch.h"
 #include "globals.h"
 #include "validate.h"
 #include "os.h"
@@ -31,16 +31,13 @@
 #define PT_DSISR	42
 #endif
 
-void arch_init()
-{
+void arch_init() {
 }
 
 os_vm_address_t 
 arch_get_bad_addr(int sig, siginfo_t *code, os_context_t *context)
 {
-    unsigned long badinstr;
     unsigned int *pc =  (unsigned int *)(*os_context_pc_addr(context));
-    int instclass;
     os_vm_address_t addr;
     
     
@@ -49,7 +46,7 @@ arch_get_bad_addr(int sig, siginfo_t *code, os_context_t *context)
     if ((((unsigned long)pc) & 3) != 0 ||
 	((pc < READ_ONLY_SPACE_START ||
 	  pc >= READ_ONLY_SPACE_START+READ_ONLY_SPACE_SIZE) &&
-	 ((lispobj *)pc < current_dynamic_space &&
+	 ((lispobj *)pc < current_dynamic_space || 
 	  (lispobj *)pc >= current_dynamic_space + DYNAMIC_SPACE_SIZE)))
 	return 0;
     
@@ -98,14 +95,6 @@ arch_install_breakpoint(void *pc)
 }
 
 void 
-get_spinlock(lispobj *word,int value)
-{
-    /* FIXME */
-    *word=value;
-}
-
-
-void 
 arch_remove_breakpoint(void *pc, unsigned long orig_inst)
 {
     *(unsigned long *)pc = orig_inst;
@@ -133,7 +122,6 @@ arch_do_displaced_inst(os_context_t *context,unsigned int orig_inst)
 static void 
 sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context)
 {
-    int badinst;
     u32 code;
     sigset_t *mask;
 #ifdef LISP_FEATURE_LINUX
@@ -155,7 +143,7 @@ sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context)
     }
     if ((code >> 16) == ((3 << 10) | (6 << 5))) {
 	/* twllei reg_ZERO,N will always trap if reg_ZERO = 0 */
-	int trap = code & 0x1f, extra = (code >> 5) & 0x1f;
+	int trap = code & 0x1f;
 	
 	switch (trap) {
 	case trap_Halt:
@@ -197,12 +185,24 @@ sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context)
 	    interrupt_handle_now(signal, code, context);
 	    break;
 	}
+#ifdef LISP_FEATURE_DARWIN
+	sigreturn(context);
+#endif
+	return;
     }
     if (((code >> 26) == 3) && (((code >> 21) & 31) == 24)) {
 	interrupt_internal_error(signal, code, context, 0);
+#ifdef LISP_FEATURE_DARWIN
+	sigreturn(context);
+#endif
+	return;
     }
     
     interrupt_handle_now(signal, code, context);
+#ifdef LISP_FEATURE_DARWIN
+    /* Work around G5 bug */
+    sigreturn(context);
+#endif
 }
 
 
@@ -266,3 +266,95 @@ ppc_flush_icache(os_vm_address_t address, os_vm_size_t length)
     address += 32;
   }
 }
+
+#ifdef LISP_FEATURE_LINKAGE_TABLE
+
+/* Linkage tables for PowerPC
+ *
+ * Linkage entry size is 16, because we need at least 4 instructions to
+ * implement a jump.
+ */
+
+/*
+ * Define the registers to use in the linkage jump table. Can be the
+ * same. Some care must be exercised when choosing these. It has to be
+ * a register that is not otherwise being used. reg_NFP is a good
+ * choice. call_into_c trashes reg_NFP without preserving it, so we can
+ * trash it in the linkage jump table.
+ */
+#define LINKAGE_TEMP_REG        reg_NFP
+#define LINKAGE_ADDR_REG        reg_NFP
+
+/*
+ * Insert the necessary jump instructions at the given address.
+ */
+void
+arch_write_linkage_table_jmp(void* reloc_addr, void *target_addr)
+{
+  /*
+   * Make JMP to function entry.
+   *
+   * The instruction sequence is:
+   *
+   *        addis 13, 0, (hi part of addr)
+   *        ori   13, 13, (low part of addr)
+   *        mtctr 13
+   *        bctr
+   *        
+   */
+  int* inst_ptr;
+  unsigned long hi;                   /* Top 16 bits of address */
+  unsigned long lo;                   /* Low 16 bits of address */
+  unsigned int inst;
+
+  inst_ptr = (int*) reloc_addr;
+
+  /*
+   * Split the target address into hi and lo parts for the sethi
+   * instruction.  hi is the top 22 bits.  lo is the low 10 bits.
+   */
+  hi = (unsigned long) target_addr;
+  lo = hi & 0xffff;
+  hi >>= 16;
+
+  /*
+   * addis 13, 0, (hi part)
+   */
+      
+  inst = (15 << 26) | (LINKAGE_TEMP_REG << 21) | (0 << 16) | hi;
+  *inst_ptr++ = inst;
+
+  /*
+   * ori 13, 13, (lo part)
+   */
+
+  inst = (24 << 26) | (LINKAGE_TEMP_REG << 21) | (LINKAGE_TEMP_REG << 16) | lo;
+  *inst_ptr++ = inst;
+  
+  /*
+   * mtctr 13
+   */
+
+  inst = (31 << 26) | (LINKAGE_TEMP_REG << 21) | (9 << 16) | (467 << 1);
+  *inst_ptr++ = inst;
+
+  /*
+   * bctr
+   */
+
+  inst = (19 << 26) | (20 << 21) | (528 << 1);
+  *inst_ptr++ = inst;
+
+
+  *inst_ptr++ = inst;
+  
+  os_flush_icache((os_vm_address_t) reloc_addr, (char*) inst_ptr - (char*) reloc_addr);
+}
+
+void 
+arch_write_linkage_table_ref(void * reloc_addr, void *target_addr)
+{
+    *(unsigned long *)reloc_addr = (unsigned long)target_addr;
+}
+
+#endif