X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.c;h=ac1ed7932166adda340ebf7dd663cdefba655285;hb=3b5fb548ed34612fb853b11b2bcdd29440834eaa;hp=f594d56da8146c4e6db5489db0bf16771316542e;hpb=9ee246f59019b776b38f6c09b2ce730cd0b32844;p=sbcl.git diff --git a/src/runtime/thread.c b/src/runtime/thread.c index f594d56..ac1ed79 100644 --- a/src/runtime/thread.c +++ b/src/runtime/thread.c @@ -33,7 +33,6 @@ #include "runtime.h" #include "validate.h" /* for BINDING_STACK_SIZE etc */ -#include "alloc.h" #include "thread.h" #include "arch.h" #include "target-arch-os.h" @@ -43,6 +42,7 @@ #include "genesis/cons.h" #include "genesis/fdefn.h" #include "interr.h" /* for lose() */ +#include "alloc.h" #include "gc-internal.h" #ifdef LISP_FEATURE_WIN32 @@ -131,6 +131,10 @@ initial_thread_trampoline(struct thread *th) #ifdef LISP_FEATURE_SB_THREAD pthread_setspecific(lisp_thread, (void *)1); #endif +#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_PPC) + /* SIG_STOP_FOR_GC defaults to blocked on PPC? */ + unblock_gc_signals(0,0); +#endif function = th->no_tls_value_marker; th->no_tls_value_marker = NO_TLS_VALUE_MARKER_WIDETAG; if(arch_os_thread_init(th)==0) return 1; @@ -314,12 +318,12 @@ new_thread_trampoline(struct thread *th) #ifdef LISP_FEATURE_MACH_EXCEPTION_HANDLER FSHOW((stderr, "Deallocating mach port %x\n", THREAD_STRUCT_TO_EXCEPTION_PORT(th))); - mach_port_move_member(mach_task_self(), + mach_port_move_member(current_mach_task, THREAD_STRUCT_TO_EXCEPTION_PORT(th), MACH_PORT_NULL); - mach_port_deallocate(mach_task_self(), + mach_port_deallocate(current_mach_task, THREAD_STRUCT_TO_EXCEPTION_PORT(th)); - mach_port_destroy(mach_task_self(), + mach_port_destroy(current_mach_task, THREAD_STRUCT_TO_EXCEPTION_PORT(th)); #endif @@ -340,6 +344,12 @@ free_thread_struct(struct thread *th) THREAD_STRUCT_SIZE); } +#ifdef LISP_FEATURE_SB_THREAD +/* FIXME: should be MAX_INTERRUPTS -1 ? */ +const unsigned int tls_index_start = + MAX_INTERRUPTS + sizeof(struct thread)/sizeof(lispobj); +#endif + /* this is called from any other thread to create the new one, and * initialize all parts of it that can be initialized from another * thread @@ -383,23 +393,22 @@ create_thread_struct(lispobj initial_function) { per_thread->dynamic_values[i] = NO_TLS_VALUE_MARKER_WIDETAG; if (all_threads == 0) { if(SymbolValue(FREE_TLS_INDEX,0)==UNBOUND_MARKER_WIDETAG) { - SetSymbolValue - (FREE_TLS_INDEX, - /* FIXME: should be MAX_INTERRUPTS -1 ? */ - make_fixnum(MAX_INTERRUPTS+ - sizeof(struct thread)/sizeof(lispobj)), - 0); + SetSymbolValue(FREE_TLS_INDEX,tls_index_start << WORD_SHIFT,0); SetSymbolValue(TLS_INDEX_LOCK,make_fixnum(0),0); } #define STATIC_TLS_INIT(sym,field) \ ((struct symbol *)(sym-OTHER_POINTER_LOWTAG))->tls_index= \ - make_fixnum(THREAD_SLOT_OFFSET_WORDS(field)) + (THREAD_SLOT_OFFSET_WORDS(field) << WORD_SHIFT) STATIC_TLS_INIT(BINDING_STACK_START,binding_stack_start); +#ifdef BINDING_STACK_POINTER STATIC_TLS_INIT(BINDING_STACK_POINTER,binding_stack_pointer); +#endif STATIC_TLS_INIT(CONTROL_STACK_START,control_stack_start); STATIC_TLS_INIT(CONTROL_STACK_END,control_stack_end); +#ifdef ALIEN_STACK STATIC_TLS_INIT(ALIEN_STACK,alien_stack_pointer); +#endif #if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64) STATIC_TLS_INIT(PSEUDO_ATOMIC_BITS,pseudo_atomic_bits); #endif @@ -413,9 +422,10 @@ create_thread_struct(lispobj initial_function) { th->binding_stack_start= (lispobj*)((void*)th->control_stack_start+thread_control_stack_size); th->control_stack_end = th->binding_stack_start; + th->control_stack_guard_page_protected = T; th->alien_stack_start= (lispobj*)((void*)th->binding_stack_start+BINDING_STACK_SIZE); - th->binding_stack_pointer=th->binding_stack_start; + set_binding_stack_pointer(th,th->binding_stack_start); th->this=th; th->os_thread=0; #ifdef LISP_FEATURE_SB_THREAD @@ -434,12 +444,22 @@ create_thread_struct(lispobj initial_function) { #else th->alien_stack_pointer=((void *)th->alien_stack_start); #endif -#if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64) +#if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64) || defined(LISP_FEATURE_SB_THREAD) th->pseudo_atomic_bits=0; #endif #ifdef LISP_FEATURE_GENCGC gc_set_region_empty(&th->alloc_region); #endif +#ifdef LISP_FEATURE_SB_THREAD + /* This parallels the same logic in globals.c for the + * single-threaded foreign_function_call_active, KLUDGE and + * all. */ +#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) + th->foreign_function_call_active = 0; +#else + th->foreign_function_call_active = 1; +#endif +#endif #ifndef LISP_FEATURE_SB_THREAD /* the tls-points-into-struct-thread trick is only good for threaded @@ -452,12 +472,8 @@ create_thread_struct(lispobj initial_function) { SetSymbolValue(CONTROL_STACK_START,(lispobj)th->control_stack_start,th); SetSymbolValue(CONTROL_STACK_END,(lispobj)th->control_stack_end,th); #if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64) - SetSymbolValue(BINDING_STACK_POINTER,(lispobj)th->binding_stack_pointer,th); SetSymbolValue(ALIEN_STACK,(lispobj)th->alien_stack_pointer,th); SetSymbolValue(PSEUDO_ATOMIC_BITS,(lispobj)th->pseudo_atomic_bits,th); -#else - current_binding_stack_pointer=th->binding_stack_pointer; - current_control_stack_pointer=th->control_stack_start; #endif #endif bind_variable(CURRENT_CATCH_BLOCK,make_fixnum(0),th); @@ -468,9 +484,15 @@ create_thread_struct(lispobj initial_function) { bind_variable(ALLOW_WITH_INTERRUPTS,T,th); bind_variable(GC_PENDING,NIL,th); bind_variable(ALLOC_SIGNAL,NIL,th); +#ifdef PINNED_OBJECTS + bind_variable(PINNED_OBJECTS,NIL,th); +#endif #ifdef LISP_FEATURE_SB_THREAD bind_variable(STOP_FOR_GC_PENDING,NIL,th); #endif +#ifndef LISP_FEATURE_C_STACK_IS_CONTROL_STACK + access_control_stack_pointer(th)=th->control_stack_start; +#endif th->interrupt_data = (struct interrupt_data *) os_validate(0,(sizeof (struct interrupt_data)));