Index: src/libcfa/concurrency/coroutine =================================================================== --- src/libcfa/concurrency/coroutine (revision 9f1695b6330182a20c37121261ecfa8d045ebd62) +++ src/libcfa/concurrency/coroutine (revision 17af7d185d75583696ef5e090868e66c99131d40) @@ -30,5 +30,5 @@ }; -#define DECL_COROUTINE(X) static inline coroutine_desc* get_coroutine(X* this) { return &this->c; } void main(X* this) +#define DECL_COROUTINE(X) static inline coroutine_desc* get_coroutine(X* this) { return &this->__cor; } void main(X* this) //----------------------------------------------------------------------------- Index: src/libcfa/concurrency/invoke.c =================================================================== --- src/libcfa/concurrency/invoke.c (revision 9f1695b6330182a20c37121261ecfa8d045ebd62) +++ src/libcfa/concurrency/invoke.c (revision 17af7d185d75583696ef5e090868e66c99131d40) @@ -64,5 +64,5 @@ struct thread_desc* thrd = get_thread( this ); - struct coroutine_desc* cor = &thrd->c; + struct coroutine_desc* cor = &thrd->cor; cor->state = Active; @@ -92,7 +92,7 @@ struct FakeStack { void *fixedRegisters[3]; // fixed registers ebx, edi, esi (popped on 1st uSwitch, values unimportant) - uint32_t mxcr; // SSE Status and Control bits (control bits are preserved across function calls) - uint16_t fcw; // X97 FPU control word (preserved across function calls) - void *rturn; // where to go on return from uSwitch + uint32_t mxcr; // SSE Status and Control bits (control bits are preserved across function calls) + uint16_t fcw; // X97 FPU control word (preserved across function calls) + void *rturn; // where to go on return from uSwitch void *dummyReturn; // fake return compiler would have pushed on call to uInvoke void *argument[3]; // for 16-byte ABI, 16-byte alignment starts here @@ -106,13 +106,15 @@ ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->argument[0] = this; // argument to invoke ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = invoke; + ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->mxcr = 0x1F80; //Vol. 2A 3-520 + ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F; //Vol. 1 8-7 #elif defined( __x86_64__ ) struct FakeStack { - void *fixedRegisters[5]; // fixed registers rbx, r12, r13, r14, r15 - uint32_t mxcr; // SSE Status and Control bits (control bits are preserved across function calls) - uint16_t fcw; // X97 FPU control word (preserved across function calls) - void *rturn; // where to go on return from uSwitch - void *dummyReturn; // NULL return address to provide proper alignment + void *fixedRegisters[5]; // fixed registers rbx, r12, r13, r14, r15 + uint32_t mxcr; // SSE Status and Control bits (control bits are preserved across function calls) + uint16_t fcw; // X97 FPU control word (preserved across function calls) + void *rturn; // where to go on return from uSwitch + void *dummyReturn; // NULL return address to provide proper alignment }; Index: src/libcfa/concurrency/invoke.h =================================================================== --- src/libcfa/concurrency/invoke.h (revision 9f1695b6330182a20c37121261ecfa8d045ebd62) +++ src/libcfa/concurrency/invoke.h (revision 17af7d185d75583696ef5e090868e66c99131d40) @@ -28,5 +28,4 @@ #define unlikely(x) __builtin_expect(!!(x), 0) #define thread_local _Thread_local - #define SCHEDULER_CAPACITY 10 struct spinlock { @@ -60,11 +59,11 @@ struct coStack_t { - unsigned int size; // size of stack - void *storage; // pointer to stack - void *limit; // stack grows towards stack limit - void *base; // base of stack - void *context; // address of cfa_context_t - void *top; // address of top of storage - bool userStack; + unsigned int size; // size of stack + void *storage; // pointer to stack + void *limit; // stack grows towards stack limit + void *base; // base of stack + void *context; // address of cfa_context_t + void *top; // address of top of storage + bool userStack; // whether or not the user allocated the stack }; @@ -72,16 +71,16 @@ struct coroutine_desc { - struct coStack_t stack; - const char *name; // textual name for coroutine/task, initialized by uC++ generated code - int errno_; // copy of global UNIX variable errno - enum coroutine_state state; // current execution status for coroutine - struct coroutine_desc *starter; // first coroutine to resume this one - struct coroutine_desc *last; // last coroutine to resume this one + struct coStack_t stack; // stack information of the coroutine + const char *name; // textual name for coroutine/task, initialized by uC++ generated code + int errno_; // copy of global UNIX variable errno + enum coroutine_state state; // current execution status for coroutine + struct coroutine_desc *starter; // first coroutine to resume this one + struct coroutine_desc *last; // last coroutine to resume this one }; struct thread_desc { - struct coroutine_desc c; // coroutine body used to store context + struct coroutine_desc cor; // coroutine body used to store context struct signal_once terminated; // indicate if execuation state is not halted - struct thread_desc * next; // instrusive link field for threads + struct thread_desc * next; // instrusive link field for threads }; Index: src/libcfa/concurrency/kernel.c =================================================================== --- src/libcfa/concurrency/kernel.c (revision 9f1695b6330182a20c37121261ecfa8d045ebd62) +++ src/libcfa/concurrency/kernel.c (revision 17af7d185d75583696ef5e090868e66c99131d40) @@ -107,5 +107,5 @@ void ?{}( thread_desc * this, current_stack_info_t * info) { - (&this->c){ info }; + (&this->cor){ info }; } @@ -113,5 +113,5 @@ // Processor coroutine void ?{}(processorCtx_t * this, processor * proc) { - (&this->c){}; + (&this->__cor){}; this->proc = proc; proc->runner = this; @@ -119,5 +119,5 @@ void ?{}(processorCtx_t * this, processor * proc, current_stack_info_t * info) { - (&this->c){ info }; + (&this->__cor){ info }; this->proc = proc; proc->runner = this; @@ -255,8 +255,8 @@ processorCtx_t proc_cor_storage = { proc, &info }; - LIB_DEBUG_PRINTF("Coroutine : created stack %p\n", proc_cor_storage.c.stack.base); + LIB_DEBUG_PRINTF("Coroutine : created stack %p\n", proc_cor_storage.__cor.stack.base); //Set global state - proc->current_coroutine = &proc->runner->c; + proc->current_coroutine = &proc->runner->__cor; proc->current_thread = NULL; @@ -268,7 +268,7 @@ // back to here. Instead directly call the main since we already are on the // appropriate stack. - proc_cor_storage.c.state = Active; + proc_cor_storage.__cor.state = Active; main( &proc_cor_storage ); - proc_cor_storage.c.state = Halted; + proc_cor_storage.__cor.state = Halted; // Main routine of the core returned, the core is now fully terminated @@ -359,5 +359,5 @@ this_processor = systemProcessor; this_processor->current_thread = mainThread; - this_processor->current_coroutine = &mainThread->c; + this_processor->current_coroutine = &mainThread->cor; // SKULLDUGGERY: Force a context switch to the system processor to set the main thread's context to the current UNIX Index: src/libcfa/concurrency/kernel_private.h =================================================================== --- src/libcfa/concurrency/kernel_private.h (revision 9f1695b6330182a20c37121261ecfa8d045ebd62) +++ src/libcfa/concurrency/kernel_private.h (revision 17af7d185d75583696ef5e090868e66c99131d40) @@ -35,5 +35,5 @@ struct processorCtx_t { processor * proc; - coroutine_desc c; + coroutine_desc __cor; }; Index: src/libcfa/concurrency/monitor =================================================================== --- src/libcfa/concurrency/monitor (revision 9f1695b6330182a20c37121261ecfa8d045ebd62) +++ src/libcfa/concurrency/monitor (revision 17af7d185d75583696ef5e090868e66c99131d40) @@ -34,8 +34,4 @@ } -//Basic entering routine -void enter(monitor_desc *); -void leave(monitor_desc *); - //Array entering routine void enter(monitor_desc **, int count); @@ -49,10 +45,4 @@ static inline int ?m = m; - this->count = 1; - enter( *this->m ); } Index: src/libcfa/concurrency/monitor.c =================================================================== --- src/libcfa/concurrency/monitor.c (revision 9f1695b6330182a20c37121261ecfa8d045ebd62) +++ src/libcfa/concurrency/monitor.c (revision 17af7d185d75583696ef5e090868e66c99131d40) @@ -74,5 +74,4 @@ void enter(monitor_desc ** monitors, int count) { for(int i = 0; i < count; i++) { - // printf("%d\n", i); enter( monitors[i] ); } @@ -81,5 +80,4 @@ void leave(monitor_desc ** monitors, int count) { for(int i = count - 1; i >= 0; i--) { - // printf("%d\n", i); leave( monitors[i] ); } Index: src/libcfa/concurrency/thread =================================================================== --- src/libcfa/concurrency/thread (revision 9f1695b6330182a20c37121261ecfa8d045ebd62) +++ src/libcfa/concurrency/thread (revision 17af7d185d75583696ef5e090868e66c99131d40) @@ -33,13 +33,13 @@ }; -#define DECL_THREAD(X) thread_desc* get_thread(X* this) { return &this->t; } void main(X* this) +#define DECL_THREAD(X) thread_desc* get_thread(X* this) { return &this->__thrd; } void main(X* this) forall( dtype T | is_thread(T) ) static inline coroutine_desc* get_coroutine(T* this) { - return &get_thread(this)->c; + return &get_thread(this)->cor; } static inline coroutine_desc* get_coroutine(thread_desc* this) { - return &this->c; + return &this->cor; } Index: src/libcfa/concurrency/thread.c =================================================================== --- src/libcfa/concurrency/thread.c (revision 9f1695b6330182a20c37121261ecfa8d045ebd62) +++ src/libcfa/concurrency/thread.c (revision 17af7d185d75583696ef5e090868e66c99131d40) @@ -42,6 +42,6 @@ void ?{}(thread_desc* this) { - (&this->c){}; - this->c.name = "Anonymous Coroutine"; + (&this->cor){}; + this->cor.name = "Anonymous Coroutine"; (&this->terminated){}; this->next = NULL; @@ -49,5 +49,5 @@ void ^?{}(thread_desc* this) { - ^(&this->c){}; + ^(&this->cor){}; } @@ -120,5 +120,5 @@ extern "C" { void __thread_signal_termination( thread_desc * this ) { - this->c.state = Halted; + this->cor.state = Halted; LIB_DEBUG_PRINTF("Thread end : %p\n", this); signal( &this->terminated );