0.8.5.29:

[sbcl.git] / src / runtime / x86-linux-os.c

diff --git a/src/runtime/x86-linux-os.c b/src/runtime/x86-linux-os.c
index 9b46107..7d42968 100644 (file)
--- a/src/runtime/x86-linux-os.c
+++ b/src/runtime/x86-linux-os.c
@@ -20,6 +20,7 @@
 #include <sys/file.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "./signal.h"
 #include "os.h"
@@ -50,9 +51,8 @@ size_t os_vm_page_size;
 
 u32 local_ldt_copy[LDT_ENTRIES*LDT_ENTRY_SIZE/sizeof(u32)];
 
-/* XXX this could be conditionally compiled based on some
- * "debug-friendly" flag.  But it doesn't really make stuff slower,
- * just the runtime gets fractionally larger */
+/* This is never actually called, but it's great for calling from gdb when
+ * users have thread-related problems that maintainers can't duplicate */
 
 void debug_get_ldt()
 { 
@@ -112,20 +112,10 @@ int arch_os_thread_init(struct thread *thread) {
     return 1;
 }
 
-/* if you can't do something like this (maybe because you're using a 
- * register for thread base that is only available in Lisp code)
- * you'll just have to find_thread_by_pid(getpid())
- */
-struct thread *arch_os_get_current_thread() {
-#ifdef LISP_FEATURE_SB_THREAD
-    register struct thread *me=0;
-    if(all_threads)
-       __asm__ ("movl %%fs:%c1,%0" : "=r" (me)
-                : "i" (offsetof (struct thread,this)));
-    return me;
-#else
-    return all_threads;
-#endif
+struct thread *debug_get_fs() {
+    register u32 fs;
+    __asm__ __volatile__ ("movl %%fs,%0" : "=r" (fs)  : );
+    return fs;
 }
 
 /* free any arch/os-specific resources used by thread, which is now
@@ -160,14 +150,14 @@ os_context_register_t *
 os_context_register_addr(os_context_t *context, int offset)
 {
     switch(offset) {
-    case  0: return &context->uc_mcontext.gregs[11]; /* EAX */
-    case  2: return &context->uc_mcontext.gregs[10]; /* ECX */
-    case  4: return &context->uc_mcontext.gregs[9]; /* EDX */
-    case  6: return &context->uc_mcontext.gregs[8]; /* EBX */
-    case  8: return &context->uc_mcontext.gregs[7]; /* ESP */
-    case 10: return &context->uc_mcontext.gregs[6]; /* EBP */
-    case 12: return &context->uc_mcontext.gregs[5]; /* ESI */
-    case 14: return &context->uc_mcontext.gregs[4]; /* EDI */
+    case reg_EAX: return &context->uc_mcontext.gregs[11]; 
+    case reg_ECX: return &context->uc_mcontext.gregs[10]; 
+    case reg_EDX: return &context->uc_mcontext.gregs[9]; 
+    case reg_EBX: return &context->uc_mcontext.gregs[8]; 
+    case reg_ESP: return &context->uc_mcontext.gregs[7]; 
+    case reg_EBP: return &context->uc_mcontext.gregs[6]; 
+    case reg_ESI: return &context->uc_mcontext.gregs[5]; 
+    case reg_EDI: return &context->uc_mcontext.gregs[4]; 
     default: return 0;
     }
     return &context->uc_mcontext.gregs[offset];