X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Falpha-arch.c;h=4402723b04eed6ae6130bab318e5dacc25726389;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=bbf1741b818f5fbbf90b281cd1a6a463329dc795;hpb=5037c9ac22cbab91eb3cf1ee6261c8589e17e81d;p=sbcl.git

diff --git a/src/runtime/alpha-arch.c b/src/runtime/alpha-arch.c
index bbf1741..4402723 100644
--- a/src/runtime/alpha-arch.c
+++ b/src/runtime/alpha-arch.c
@@ -15,7 +15,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <asm/pal.h>		/* for PAL_gentrap */
 
 #include "runtime.h"
 #include "sbcl.h"
@@ -32,14 +31,17 @@
 #include "monitor.h"
 
 extern char call_into_lisp_LRA[], call_into_lisp_end[];
+
 extern size_t os_vm_page_size;
 #define BREAKPOINT_INST 0x80
 
+
 void
 arch_init(void)
 {
     /* This must be called _after_ os_init(), so that we know what the
      * page size is. */
+
     if (mmap((os_vm_address_t) call_into_lisp_LRA_page,os_vm_page_size,
 	     OS_VM_PROT_ALL,MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED,-1,0)
 	== (os_vm_address_t) -1)
@@ -77,15 +79,7 @@ arch_get_bad_addr (int sig, siginfo_t *code, os_context_t *context)
 	  pc >= current_dynamic_space + DYNAMIC_SPACE_SIZE))
 	return NULL;
 
-    badinst = *pc;
-
-    if (((badinst>>27)!=0x16)	/* STL or STQ */
-	&& ((badinst>>27)!=0x13)) /* STS or STT */
-	return NULL;		/* Otherwise forget about address. */
-  
-    return (os_vm_address_t)
-	(*os_context_register_addr(context,((badinst>>16)&0x1f))
-	 +(badinst&0xffff));
+    return context->uc_mcontext.sc_traparg_a0;
 }
 
 void
@@ -111,26 +105,16 @@ arch_pseudo_atomic_atomic(os_context_t *context)
 void arch_set_pseudo_atomic_interrupted(os_context_t *context)
 {
     /* On coming out of an atomic section, we subtract 1 from
-     * reg_Alloc, then try to store something at that address.  On
-     * OSF/1 we add 1 to reg_Alloc here so that the end-of-atomic code
-     * will raise SIGTRAP for "unaligned access".  Linux catches
-     * unaligned accesses in the kernel and fixes them up[1], so there
-     * we toggle bit 63 instead.  The resulting address is somewhere
-     * out in no-man's land, so we get SIGSEGV when we try to access
-     * it.  We catch whichever signal it is (see the appropriate
-     * *-os.c) and call interrupt_handle_pending() from it */
-
-    /* [1] This behaviour can be changed with osf_setsysinfo, but cmucl
-     * didn't use that */
-
-#ifdef __linux__
+     * reg_Alloc, then try to store something at that address.  So,
+     * to signal that it was interrupted and a signal should be handled, 
+     * we set bit 63 of reg_ALLOC here so that the end-of-atomic code
+     * will raise SIGSEGV (no ram mapped there).  We catch the signal
+     * (see the appropriate *-os.c) and call interrupt_handle_pending() 
+     * for the saved signal instead */
+
     *os_context_register_addr(context,reg_ALLOC) |=  (1L<<63);
-#else
-    *os_context_register_addr(context,reg_ALLOC) |=  2;
-#endif
 }
 
-/* XXX but is the caller of this storing all 64 bits? */
 unsigned long arch_install_breakpoint(void *pc)
 {
     unsigned int *ptr = (unsigned int *)pc;
@@ -295,10 +279,14 @@ static void
 sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context)
 {
     unsigned int code;
+    sigset_t *mask;
+#ifdef LISP_FEATURE_LINUX
+    os_restore_fp_control(context);
+#endif
 
     /* Don't disallow recursive breakpoint traps.  Otherwise, we can't */
     /* use debugger breakpoints anywhere in here. */
-    sigset_t *mask=(os_context_sigmask_addr(context));
+    mask=(os_context_sigmask_addr(context));
     sigsetmask(mask); 
 
     /* this is different from how CMUCL does it.  CMUCL used "call_pal
@@ -357,7 +345,7 @@ sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context)
 	break;
 
       default:
-	fprintf(stderr, "unidetified breakpoint/trap %d\n",code);
+	fprintf(stderr, "unidentified breakpoint/trap %d\n",code);
 	interrupt_handle_now(signal, siginfo, context);
 	break;
     }