X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-arch.c;h=e0806155810426f9d580448c1780ccf2606289d5;hb=2495095104de841f12a17aeb94207055f75ed897;hp=eec4f32c3903188010d79f46ef81c5e5d78711cf;hpb=3bd7a97d1b11a2b0aee086ef211cae807f3dfc35;p=sbcl.git

diff --git a/src/runtime/x86-arch.c b/src/runtime/x86-arch.c
index eec4f32..e080615 100644
--- a/src/runtime/x86-arch.c
+++ b/src/runtime/x86-arch.c
@@ -24,6 +24,10 @@
 #include "interr.h"
 #include "breakpoint.h"
 #include "monitor.h"
+#include "thread.h"
+
+#include "genesis/static-symbols.h"
+#include "genesis/symbol.h"
 
 #define BREAKPOINT_INST 0xcc	/* INT3 */
 
@@ -85,7 +89,7 @@ void arch_skip_instruction(os_context_t *context)
 	    break;
 
 	case trap_Breakpoint:		/* not tested */
-	case trap_FunctionEndBreakpoint: /* not tested */
+	case trap_FunEndBreakpoint: /* not tested */
 	    break;
 
 	case trap_PendingInterrupt:
@@ -112,13 +116,14 @@ arch_internal_error_arguments(os_context_t *context)
 boolean
 arch_pseudo_atomic_atomic(os_context_t *context)
 {
-    return SymbolValue(PSEUDO_ATOMIC_ATOMIC);
+    return SymbolValue(PSEUDO_ATOMIC_ATOMIC,arch_os_get_current_thread());
 }
 
 void
 arch_set_pseudo_atomic_interrupted(os_context_t *context)
 {
-    SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(1));
+    SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(1),
+		   arch_os_get_current_thread());
 }
 
 /*
@@ -136,6 +141,18 @@ arch_install_breakpoint(void *pc)
     return result;
 }
 
+void 
+get_spinlock(lispobj *word,int value)
+{
+    u32 eax=0;
+    do {
+	asm ("xor %0,%0;lock cmpxchg %1,%2" 
+	     : "=a" (eax)
+	     : "r" (value), "m" (*word)
+	     : "memory", "cc");
+    } while(eax!=0);
+}
+
 void
 arch_remove_breakpoint(void *pc, unsigned long orig_inst)
 {
@@ -217,6 +234,16 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context)
     current_control_stack_pointer =
 	(lispobj *)*os_context_sp_addr(context);
 
+    /* FIXME: CMUCL puts the float control restoration code here.
+       Thus, it seems to me that single-stepping won't restore the
+       float control.  Since SBCL currently doesn't support
+       single-stepping (as far as I can tell) this is somewhat moot,
+       but it might be worth either moving this code up or deleting
+       the single-stepping code entirely.  -- CSR, 2002-07-15 */
+#ifdef LISP_FEATURE_LINUX
+    os_restore_fp_control(context);
+#endif
+
     /* On entry %eip points just after the INT3 byte and aims at the
      * 'kind' value (eg trap_Cerror). For error-trap and Cerror-trap a
      * number of bytes will follow, the first is the length of the byte
@@ -249,10 +276,10 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context)
 	handle_breakpoint(signal, info, context);
 	break;
 
-    case trap_FunctionEndBreakpoint:
+    case trap_FunEndBreakpoint:
 	(char*)(*os_context_pc_addr(context)) -= 1;
 	*os_context_pc_addr(context) =
-	    (int)handle_function_end_breakpoint(signal, info, context);
+	    (int)handle_fun_end_breakpoint(signal, info, context);
 	break;
 
     default:
@@ -303,6 +330,7 @@ call_into_lisp(lispobj fun, lispobj *args, int nargs);
  * could be in registers depending on what the compiler likes. So we
  * copy the args into a portable vector and let the assembly language
  * call-in function figure it out. */
+
 lispobj
 funcall0(lispobj function)
 {