X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-linux-os.c;h=5b55fdc3792c1e779d1aace0adf5878716635bac;hb=13adeede88d026548e4d2da497f93d8024706a2b;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..5b55fdc 100644 --- a/src/runtime/x86-linux-os.c +++ b/src/runtime/x86-linux-os.c @@ -20,7 +20,9 @@ #include #include #include +#include +#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 #include @@ -39,66 +40,75 @@ #include #include #include -#include +#include #include -#include "thread.h" /* dynamic_values_bytes */ +#include +#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 ); +#define modify_ldt sbcl_modify_ldt +static inline int modify_ldt (int func, void *ptr, unsigned long bytecount) +{ + return syscall (SYS_modify_ldt, func, ptr, bytecount); +} #include "validate.h" 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() -{ +{ int n=modify_ldt (0, local_ldt_copy, sizeof local_ldt_copy); 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 = { - 1, 0, 0, /* index, address, length filled in later */ - 1, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 1 - }; + struct user_desc ldt_entry = { + 1, 0, 0, /* index, address, length filled in later */ + 1, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 1 + }; int n; - get_spinlock(&modify_ldt_lock,thread); + get_spinlock(&modify_ldt_lock,(long)thread); n=modify_ldt(0,local_ldt_copy,sizeof local_ldt_copy); /* get next free ldt entry */ if(n) { - u32 *p; - for(n=0,p=local_ldt_copy;*p;p+=LDT_ENTRY_SIZE/sizeof(u32)) - n++; + u32 *p; + for(n=0,p=local_ldt_copy;*p;p+=LDT_ENTRY_SIZE/sizeof(u32)) + n++; } ldt_entry.entry_number=n; ldt_entry.base_addr=(unsigned long) thread; ldt_entry.limit=dynamic_values_bytes; ldt_entry.limit_in_pages=0; if (modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0) { - modify_ldt_lock=0; - /* modify_ldt call failed: something magical is not happening */ - return -1; + modify_ldt_lock=0; + /* modify_ldt call failed: something magical is not happening */ + return 0; } - __asm__ __volatile__ ("movw %w0, %%fs" : : "q" - ((n << 3) /* selector number */ - + (1 << 2) /* TI set = LDT */ - + 3)); /* privilege level */ + __asm__ __volatile__ ("movw %w0, %%fs" : : "q" + ((n << 3) /* selector number */ + + (1 << 2) /* TI set = LDT */ + + 3)); /* privilege level */ thread->tls_cookie=n; modify_ldt_lock=0; if(n<0) return 0; + pthread_setspecific(specials,thread); #endif #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK /* Signal handlers are run on the control stack, so if it is exhausted @@ -107,25 +117,16 @@ int arch_os_thread_init(struct thread *thread) { sigstack.ss_sp=((void *) thread)+dynamic_values_bytes; sigstack.ss_flags=0; sigstack.ss_size = 32*SIGSTKSZ; - sigaltstack(&sigstack,0); + if(sigaltstack(&sigstack,0)<0) + lose("Cannot sigaltstack: %s\n",strerror(errno)); #endif 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 (struct thread *)fs; } /* free any arch/os-specific resources used by thread, which is now @@ -133,17 +134,17 @@ struct thread *arch_os_get_current_thread() { */ int arch_os_thread_cleanup(struct thread *thread) { - struct modify_ldt_ldt_s ldt_entry = { - 0, 0, 0, - 0, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 0 - }; + struct user_desc ldt_entry = { + 0, 0, 0, + 0, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 0 + }; ldt_entry.entry_number=thread->tls_cookie; - get_spinlock(&modify_ldt_lock,thread); + get_spinlock(&modify_ldt_lock,(long)thread); if (modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0) { - modify_ldt_lock=0; - /* modify_ldt call failed: something magical is not happening */ - return 0; + modify_ldt_lock=0; + /* modify_ldt call failed: something magical is not happening */ + return 0; } modify_ldt_lock=0; return 1; @@ -160,14 +161,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]; @@ -181,7 +182,7 @@ os_context_pc_addr(os_context_t *context) os_context_register_t * os_context_sp_addr(os_context_t *context) -{ +{ return &context->uc_mcontext.gregs[17]; /* REG_UESP */ } @@ -195,7 +196,7 @@ unsigned long os_context_fp_control(os_context_t *context) { return ((((context->uc_mcontext.fpregs->cw) & 0xffff) ^ 0x3f) | - (((context->uc_mcontext.fpregs->sw) & 0xffff) << 16)); + (((context->uc_mcontext.fpregs->sw) & 0xffff) << 16)); } sigset_t * @@ -214,4 +215,3 @@ void os_flush_icache(os_vm_address_t address, os_vm_size_t length) { } -