X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-arch.c;h=4c91b74cc9dcf7bf38058380f4fba361492e3533;hb=5e2b057871cf47c795c75106899f5fb05dc3397e;hp=b2c927e992a927605d8fe295ac71ddffaea1e4bf;hpb=ff92598854bf7cae8d57fe49cef4d9a98e1ab345;p=sbcl.git

diff --git a/src/runtime/mips-arch.c b/src/runtime/mips-arch.c
index b2c927e..4c91b74 100644
--- a/src/runtime/mips-arch.c
+++ b/src/runtime/mips-arch.c
@@ -7,9 +7,9 @@
 
 #include <stdio.h>
 
+#include "sbcl.h"
 #include "runtime.h"
 #include "arch.h"
-#include "sbcl.h"
 #include "globals.h"
 #include "validate.h"
 #include "os.h"
@@ -21,12 +21,16 @@
 #include "breakpoint.h"
 #include "monitor.h"
 
-void arch_init()
+#include "genesis/constants.h"
+
+void
+arch_init()
 {
     return;
 }
 
-os_vm_address_t arch_get_bad_addr(int signam, siginfo_t *siginfo, os_context_t *context)
+os_vm_address_t
+arch_get_bad_addr(int signam, siginfo_t *siginfo, os_context_t *context)
 {
     /* Classic CMUCL comment:
 
@@ -34,15 +38,15 @@ os_vm_address_t arch_get_bad_addr(int signam, siginfo_t *siginfo, os_context_t *
     return (os_vm_address_t) siginfo->si_addr;
 }
 
-unsigned long 
-emulate_branch(os_context_t *context, unsigned long inst)
+static unsigned int
+emulate_branch(os_context_t *context, unsigned int inst)
 {
-    long opcode = inst >> 26;
-    long r1 = (inst >> 21) & 0x1f;
-    long r2 = (inst >> 16) & 0x1f;
-    long bdisp = (inst&(1<<15)) ? inst | (-1 << 16) : inst&0xffff;
-    long jdisp = (inst&(1<<25)) ? inst | (-1 << 26) : inst&0xffff;
-    long disp = 0;
+    unsigned int opcode = inst >> 26;
+    unsigned int r1 = (inst >> 21) & 0x1f;
+    unsigned int r2 = (inst >> 16) & 0x1f;
+    unsigned int bdisp = ((inst&(1<<15)) ? inst | (-1 << 16) : inst&0x7fff) << 2;
+    unsigned int jdisp = (inst&0x3ffffff) << 2;
+    unsigned int disp = 0;
 
     switch(opcode) {
     case 0x1: /* bltz, bgez, bltzal, bgezal */
@@ -58,12 +62,14 @@ emulate_branch(os_context_t *context, unsigned long inst)
 	case 0x10: /* bltzal */
 	    if(*os_context_register_addr(context, r1) < 0)
 		disp = bdisp;
-	    *os_context_register_addr(context, 31) = *os_context_pc_addr(context) + 4;
+	    *os_context_register_addr(context, 31)
+		= *os_context_pc_addr(context) + 4;
 	    break;
 	case 0x11: /* bgezal */
 	    if(*os_context_register_addr(context, r1) >= 0)
 		disp = bdisp;
-	    *os_context_register_addr(context, 31) = *os_context_pc_addr(context) + 4;
+	    *os_context_register_addr(context, 31)
+		= *os_context_pc_addr(context) + 4;
 	    break;
 	}
 	break;
@@ -77,17 +83,14 @@ emulate_branch(os_context_t *context, unsigned long inst)
 	   != *os_context_register_addr(context, r2))
 	    disp = bdisp;
 	break;
-    case 0x6: /* ble */
+    case 0x6: /* blez */
 	if(*os_context_register_addr(context, r1)
-	   /* FIXME: One has to assume that the CMUCL gods of old have
-              got the sign issues right... but it might be worth
-              checking, someday */
 	   <= *os_context_register_addr(context, r2))
 	    disp = bdisp;
 	break;
     case 0x7: /* bgtz */
 	if(*os_context_register_addr(context, r1)
-	   >= *os_context_register_addr(context, r2))
+	   > *os_context_register_addr(context, r2))
 	    disp = bdisp;
 	break;
     case 0x2: /* j */
@@ -95,13 +98,15 @@ emulate_branch(os_context_t *context, unsigned long inst)
 	break;
     case 0x3: /* jal */
 	disp = jdisp;
-	*os_context_register_addr(context, 31) = *os_context_pc_addr(context) + 4;
+	*os_context_register_addr(context, 31)
+	    = *os_context_pc_addr(context) + 4;
 	break;
     }
-    return (*os_context_pc_addr(context) + disp * 4);
+    return *os_context_pc_addr(context) + disp;
 }
 
-void arch_skip_instruction(os_context_t *context)
+void
+arch_skip_instruction(os_context_t *context)
 {
     /* Skip the offending instruction */
     if (os_context_bd_cause(context)) {
@@ -112,17 +117,17 @@ void arch_skip_instruction(os_context_t *context)
            better (it can hardly be worse).  We lose() to remind the
            porter to review this code.  -- CSR, 2002-09-06 */
 	lose("bd_cause branch taken; review code for new OS?\n");
-        *os_context_pc_addr(context) = 
-	    emulate_branch(context, 
-			   *(unsigned long *) *os_context_pc_addr(context));
-    }
-    else
+        *os_context_pc_addr(context)
+	    = emulate_branch(context, *os_context_pc_addr(context));
+    } else
         *os_context_pc_addr(context) += 4;
 
-    os_flush_icache((os_vm_address_t) *os_context_pc_addr(context), sizeof(unsigned long));
+    os_flush_icache((os_vm_address_t)*os_context_pc_addr(context),
+		    sizeof(unsigned int));
 }
 
-unsigned char *arch_internal_error_arguments(os_context_t *context)
+unsigned char *
+arch_internal_error_arguments(os_context_t *context)
 {
     if (os_context_bd_cause(context))
 	return (unsigned char *)(*os_context_pc_addr(context) + 8);
@@ -130,45 +135,48 @@ unsigned char *arch_internal_error_arguments(os_context_t *context)
 	return (unsigned char *)(*os_context_pc_addr(context) + 4);
 }
 
-boolean arch_pseudo_atomic_atomic(os_context_t *context)
+boolean
+arch_pseudo_atomic_atomic(os_context_t *context)
 {
     return *os_context_register_addr(context, reg_ALLOC) & 1;
 }
 
-#define PSEUDO_ATOMIC_INTERRUPTED_BIAS 0x7f000000
-
-void arch_set_pseudo_atomic_interrupted(os_context_t *context)
+void
+arch_set_pseudo_atomic_interrupted(os_context_t *context)
 {
-    *os_context_register_addr(context, reg_NL4) |= 1<<31;
+    *os_context_register_addr(context, reg_NL4) |= -1LL<<31;
 }
 
-unsigned long arch_install_breakpoint(void *pc)
+unsigned long
+arch_install_breakpoint(void *pc)
 {
-    unsigned long *ptr = (unsigned long *)pc;
-    unsigned long result = *ptr;
-    *ptr = (trap_Breakpoint << 16) | 0xd;
+    unsigned int *ptr = (unsigned int *)pc;
+    unsigned long result = (unsigned long) *ptr;
 
-    os_flush_icache((os_vm_address_t)ptr, sizeof(unsigned long));
+    *ptr = (trap_Breakpoint << 16) | 0xd;
+    os_flush_icache((os_vm_address_t)ptr, sizeof(unsigned int));
 
     return result;
 }
 
-void arch_remove_breakpoint(void *pc, unsigned long orig_inst)
+void
+arch_remove_breakpoint(void *pc, unsigned long orig_inst)
 {
-    *(unsigned long *)pc = orig_inst;
+    unsigned int *ptr = (unsigned int *)pc;
 
-    os_flush_icache((os_vm_address_t)pc, sizeof(unsigned long));
+    *ptr = (unsigned int) orig_inst;
+    os_flush_icache((os_vm_address_t)ptr, sizeof(unsigned int));
 }
 
-static unsigned long *skipped_break_addr, displaced_after_inst;
+static unsigned int *skipped_break_addr, displaced_after_inst;
 static sigset_t orig_sigmask;
 
-void arch_do_displaced_inst(os_context_t *context,
-			    unsigned int orig_inst)
+void
+arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst)
 {
-    unsigned long *pc = (unsigned long *)*os_context_pc_addr(context);
-    unsigned long *break_pc, *next_pc;
-    unsigned long next_inst;
+    unsigned int *pc = (unsigned int *)*os_context_pc_addr(context);
+    unsigned int *break_pc, *next_pc;
+    unsigned int next_inst;
     int opcode;
 
     orig_sigmask = *os_context_sigmask_addr(context);
@@ -185,71 +193,78 @@ void arch_do_displaced_inst(os_context_t *context,
     }
 
     /* Put the original instruction back. */
-    *break_pc = orig_inst;
-    os_flush_icache((os_vm_address_t)break_pc, sizeof(unsigned long));
+    arch_remove_breakpoint(break_pc, orig_inst);
     skipped_break_addr = break_pc;
 
     /* Figure out where it goes. */
     opcode = next_inst >> 26;
-    if (opcode == 1 || ((opcode & 0x3c) == 0x4) || ((next_inst & 0xf00e0000) == 0x80000000)) {
-        
-        next_pc = emulate_branch(context, next_inst);
-    }
+    if (opcode == 1 || ((opcode & 0x3c) == 0x4) || ((next_inst & 0xf00e0000) == 0x80000000))
+        next_pc = (unsigned int *)emulate_branch(context, next_inst);
     else
 	next_pc = pc+1;
 
-    displaced_after_inst = *next_pc;
-    *next_pc = (trap_AfterBreakpoint << 16) | 0xd;
-    os_flush_icache((os_vm_address_t)next_pc, sizeof(unsigned long));
+    displaced_after_inst = arch_install_breakpoint(next_pc);
+}
+
+static void
+sigill_handler(int signal, siginfo_t *info, void *void_context)
+{
+    os_context_t *context = arch_os_get_context(&void_context);
+
+    fake_foreign_function_call(context);
+    monitor_or_something();
 }
 
-static void sigtrap_handler(int signal, siginfo_t *info, void *void_context)
+static void
+sigtrap_handler(int signal, siginfo_t *info, void *void_context)
 {
     os_context_t *context = arch_os_get_context(&void_context);
     sigset_t *mask;
-    int code;
-    /* Don't disallow recursive breakpoint traps.  Otherwise, we can't */
-    /* use debugger breakpoints anywhere in here. */
+    unsigned int code;
+    sigset_t ss;
+
+    /* Don't disallow recursive breakpoint traps.  Otherwise, we can't
+       use debugger breakpoints anywhere in here. */
     mask = os_context_sigmask_addr(context);
-    sigsetmask(mask);
+    sigprocmask(SIG_SETMASK, mask, NULL);
     code = ((*(int *) (*os_context_pc_addr(context))) >> 16) & 0x1f;
 
     switch (code) {
+    case trap_Halt:
+	fake_foreign_function_call(context);
+	lose("%%primitive halt called; the party is over.\n");
+
     case trap_PendingInterrupt:
 	arch_skip_instruction(context);
+	sigemptyset(&ss);
+	sigaddset(&ss,SIGTRAP);
+	sigprocmask(SIG_UNBLOCK,&ss,0);
 	interrupt_handle_pending(context);
 	break;
-	
-    case trap_Halt:
-	fake_foreign_function_call(context);
-	lose("%%primitive halt called; the party is over.\n");
-	
+
     case trap_Error:
     case trap_Cerror:
 	interrupt_internal_error(signal, info, context, code==trap_Cerror);
 	break;
-	
+
     case trap_Breakpoint:
 	handle_breakpoint(signal, info, context);
 	break;
-	
+
     case trap_FunEndBreakpoint:
 	*os_context_pc_addr(context) = (int)handle_fun_end_breakpoint(signal, info, context);
+	os_flush_icache((os_vm_address_t)*os_context_pc_addr(context), sizeof(unsigned int));
 	break;
-	
+
     case trap_AfterBreakpoint:
-	*skipped_break_addr = (trap_Breakpoint << 16) | 0xd;
-	os_flush_icache((os_vm_address_t)skipped_break_addr,
-			sizeof(unsigned long));
-	skipped_break_addr = NULL;
-	*(unsigned long *)(*os_context_pc_addr(context)) = displaced_after_inst;
-	os_flush_icache((os_vm_address_t) *os_context_pc_addr(context), sizeof(unsigned long));
+	arch_remove_breakpoint(os_context_pc_addr(context), displaced_after_inst);
+	displaced_after_inst = arch_install_breakpoint(skipped_break_addr);
 	*os_context_sigmask_addr(context) = orig_sigmask;
 	break;
 
     case 0x10:
-	/* Clear the flag */
-	*os_context_register_addr(context, reg_NL4) &= 0x7fffffff;
+	/* Clear the pseudo-atomic flag */
+	*os_context_register_addr(context, reg_NL4) &= ~(-1LL<<31);
 	arch_skip_instruction(context);
 	interrupt_handle_pending(context);
 	return;
@@ -260,22 +275,21 @@ static void sigtrap_handler(int signal, siginfo_t *info, void *void_context)
     }
 }
 
-/* FIXME: We must have one of these somewhere. Also, export
-   N-FIXNUM-TAG-BITS from Lispland and use it rather than 2 here. */
-#define FIXNUM_VALUE(lispobj) (((int)lispobj)>>2)
+#define FIXNUM_VALUE(lispobj) (((int)lispobj) >> N_FIXNUM_TAG_BITS)
 
-void sigfpe_handler(int signal, siginfo_t *info, void *void_context)
+static void
+sigfpe_handler(int signal, siginfo_t *info, void *void_context)
 {
-    unsigned long bad_inst;
-    unsigned int op, rs, rt, rd, funct, dest;
+    unsigned int bad_inst;
+    unsigned int op, rs, rt, rd, funct, dest = 32;
     int immed;
-    long result;
+    unsigned int result;
     os_context_t *context = arch_os_get_context(&void_context);
 
     if (os_context_bd_cause(context))
-        bad_inst = *(unsigned long *)(*os_context_pc_addr(context) + 4);
+        bad_inst = *(unsigned int *)(*os_context_pc_addr(context) + 4);
     else
-        bad_inst = *(unsigned long *)(*os_context_pc_addr(context));
+        bad_inst = *(unsigned int *)(*os_context_pc_addr(context));
 
     op = (bad_inst >> 26) & 0x3f;
     rs = (bad_inst >> 21) & 0x1f;
@@ -294,8 +308,7 @@ void sigfpe_handler(int signal, siginfo_t *info, void *void_context)
 	    /* Check to see if this is really a pa_interrupted hit */
 	    if (rs == reg_ALLOC && rt == reg_NL4) {
 		*os_context_register_addr(context, reg_ALLOC)
-		    += (*os_context_register_addr(context, reg_NL4)
-			- PSEUDO_ATOMIC_INTERRUPTED_BIAS);
+		    += *os_context_register_addr(context, reg_NL4) &= ~(-1LL<<31);
 		arch_skip_instruction(context);
 		interrupt_handle_pending(context);
 		return;
@@ -310,10 +323,6 @@ void sigfpe_handler(int signal, siginfo_t *info, void *void_context)
 		- FIXNUM_VALUE(*os_context_register_addr(context, rt));
 	    dest = rd;
 	    break;
-	    
-	default:
-	    dest = 32;
-	    break;
 	}
 	break;
 	
@@ -321,10 +330,6 @@ void sigfpe_handler(int signal, siginfo_t *info, void *void_context)
 	result = FIXNUM_VALUE(*os_context_register_addr(context,rs)) + (immed>>2);
 	dest = rt;
 	break;
-	
-    default:
-	dest = 32;
-	break;
     }
     
     if (dest < 32) {
@@ -334,8 +339,8 @@ void sigfpe_handler(int signal, siginfo_t *info, void *void_context)
         *os_context_register_addr(context,dest) = alloc_number(result);
 
 	*os_context_register_addr(context, reg_ALLOC) =
-	    (unsigned long) dynamic_space_free_pointer;
-	
+	    (unsigned int) dynamic_space_free_pointer;
+
         arch_skip_instruction(context);
 	
     }
@@ -343,22 +348,26 @@ void sigfpe_handler(int signal, siginfo_t *info, void *void_context)
         interrupt_handle_now(signal, info, context);
 }
 
-void arch_install_interrupt_handlers()
+void
+arch_install_interrupt_handlers()
 {    
+    undoably_install_low_level_interrupt_handler(SIGILL,sigill_handler);
     undoably_install_low_level_interrupt_handler(SIGTRAP,sigtrap_handler);
     undoably_install_low_level_interrupt_handler(SIGFPE,sigfpe_handler);
 }
 
 extern lispobj call_into_lisp(lispobj fun, lispobj *args, int nargs);
 
-lispobj funcall0(lispobj function)
+lispobj
+funcall0(lispobj function)
 {
     lispobj *args = current_control_stack_pointer;
 
     return call_into_lisp(function, args, 0);
 }
 
-lispobj funcall1(lispobj function, lispobj arg0)
+lispobj
+funcall1(lispobj function, lispobj arg0)
 {
     lispobj *args = current_control_stack_pointer;
 
@@ -368,7 +377,8 @@ lispobj funcall1(lispobj function, lispobj arg0)
     return call_into_lisp(function, args, 1);
 }
 
-lispobj funcall2(lispobj function, lispobj arg0, lispobj arg1)
+lispobj
+funcall2(lispobj function, lispobj arg0, lispobj arg1)
 {
     lispobj *args = current_control_stack_pointer;
 
@@ -379,7 +389,8 @@ lispobj funcall2(lispobj function, lispobj arg0, lispobj arg1)
     return call_into_lisp(function, args, 2);
 }
 
-lispobj funcall3(lispobj function, lispobj arg0, lispobj arg1, lispobj arg2)
+lispobj
+funcall3(lispobj function, lispobj arg0, lispobj arg1, lispobj arg2)
 {
     lispobj *args = current_control_stack_pointer;
 
@@ -390,4 +401,3 @@ lispobj funcall3(lispobj function, lispobj arg0, lispobj arg1, lispobj arg2)
 
     return call_into_lisp(function, args, 3);
 }
-