X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-linux-os.c;h=15eb762787fd401ee1dd461c478dd2783e51d076;hb=1f23c9f7828d8aebeda92c8c1126114e10461ffa;hp=9b461076466ea5a8eb018f3c608b3668eded6061;hpb=3537df0868f37c98475405b6dea497d053ac06f7;p=sbcl.git

diff --git a/src/runtime/x86-linux-os.c b/src/runtime/x86-linux-os.c
index 9b46107..15eb762 100644
--- a/src/runtime/x86-linux-os.c
+++ b/src/runtime/x86-linux-os.c
@@ -20,7 +20,9 @@
 #include <sys/file.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <errno.h>
 
+#include "sbcl.h"
 #include "./signal.h"
 #include "os.h"
 #include "arch.h"
@@ -28,7 +30,6 @@
 #include "interrupt.h"
 #include "interr.h"
 #include "lispregs.h"
-#include "sbcl.h"
 #include <sys/socket.h>
 #include <sys/utsname.h>
 
@@ -41,8 +42,13 @@
 #include <asm/ldt.h>
 #include <linux/unistd.h>
 #include <sys/mman.h>
+#include <linux/version.h>
 #include "thread.h"		/* dynamic_values_bytes */
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#define user_desc  modify_ldt_ldt_s 
+#endif
+
 _syscall3(int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount );
 
 #include "validate.h"
@@ -50,9 +56,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()
 { 
@@ -60,15 +65,15 @@ void debug_get_ldt()
     printf("%d bytes in ldt: print/x local_ldt_copy\n", n);
 }
 
-lispobj modify_ldt_lock;	/* protect all calls to modify_ldt */
+volatile lispobj modify_ldt_lock;	/* protect all calls to modify_ldt */
 
 int arch_os_thread_init(struct thread *thread) {
     stack_t sigstack;
 #ifdef LISP_FEATURE_SB_THREAD
-    /* this must be called from a function that has an exclusive lock
-     * on all_threads
+    /* FIXME Lock ordering rules: all_threads_lock must usually be
+     * held when getting modify_ldt_lock
      */
-    struct modify_ldt_ldt_s ldt_entry = {
+    struct user_desc ldt_entry = {
 	1, 0, 0, /* index, address, length filled in later */
 	1, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 1
     }; 
@@ -112,20 +117,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
@@ -133,7 +128,7 @@ struct thread *arch_os_get_current_thread() {
  */
 
 int arch_os_thread_cleanup(struct thread *thread) {
-    struct modify_ldt_ldt_s ldt_entry = {
+    struct user_desc ldt_entry = {
 	0, 0, 0, 
 	0, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 0
     }; 
@@ -160,14 +155,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];