Changes in libcfa/src/concurrency/invoke.h [63364d8:76e069f]

File:

• libcfa/src/concurrency/invoke.h (modified) (6 diffs)

libcfa/src/concurrency/invoke.h

@@ -50 +50 @@
 
                 extern thread_local struct KernelThreadData {
+                        struct coroutine_desc * volatile this_coroutine;
                         struct thread_desc    * volatile this_thread;
                         struct processor      * volatile this_processor;
@@ -60 +61 @@
                 } kernelTLS __attribute__ ((tls_model ( "initial-exec" )));
         }
+
+        static inline struct coroutine_desc * volatile active_coroutine() { return TL_GET( this_coroutine ); }
+        static inline struct thread_desc    * volatile active_thread   () { return TL_GET( this_thread    ); }
+        static inline struct processor      * volatile active_processor() { return TL_GET( this_processor ); } // UNSAFE
         #endif
 
-        struct __stack_context_t {
-                void * SP;
-                void * FP;
-        };
-
-        // low adresses  :           +----------------------+ <- start of allocation
-        //                           |  optional guard page |
-        //                           +----------------------+ <- __stack_t.limit
-        //                           |                      |
-        //                           |       /\ /\ /\       |
-        //                           |       || || ||       |
-        //                           |                      |
-        //                           |    program  stack    |
-        //                           |                      |
-        // __stack_info_t.storage -> +----------------------+ <- __stack_t.base
-        //                           |      __stack_t       |
-        // high adresses :           +----------------------+ <- end of allocation
-
-        struct __stack_t {
-                // stack grows towards stack limit
-                void * limit;
-
-                // base of stack
-                void * base;
-        };
-
-        struct __stack_info_t {
-                // pointer to stack
-                struct __stack_t * storage;
+        struct coStack_t {
+                size_t 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
         };
 
@@ -96 +80 @@
 
         struct coroutine_desc {
-                // context that is switch during a CtxSwitch
-                struct __stack_context_t context;
-
                 // stack information of the coroutine
-                struct __stack_info_t stack;
-
-                // textual name for coroutine/task
+                struct coStack_t stack;
+
+                // textual name for coroutine/task, initialized by uC++ generated code
                 const char * name;
+
+                // copy of global UNIX variable errno
+                int errno_;
 
                 // current execution status for coroutine
                 enum coroutine_state state;
-
                 // first coroutine to resume this one
                 struct coroutine_desc * starter;
@@ -161 +144 @@
         struct thread_desc {
                 // Core threading fields
-                // context that is switch during a CtxSwitch
-                struct __stack_context_t context;
-
-                // current execution status for coroutine
-                enum coroutine_state state;
-
-                //SKULLDUGGERY errno is not save in the thread data structure because returnToKernel appears to be the only function to require saving and restoring it
-
                 // coroutine body used to store context
                 struct coroutine_desc  self_cor;
@@ -195 +170 @@
                         struct thread_desc * prev;
                 } node;
-        };
-
-        #ifdef __cforall
-        extern "Cforall" {
-                static inline struct coroutine_desc * active_coroutine() { return TL_GET( this_thread )->curr_cor; }
-                static inline struct thread_desc    * active_thread   () { return TL_GET( this_thread    ); }
-                static inline struct processor      * active_processor() { return TL_GET( this_processor ); } // UNSAFE
-
+     };
+
+     #ifdef __cforall
+     extern "Cforall" {
                 static inline thread_desc * & get_next( thread_desc & this ) {
                         return this.next;
@@ -260 +231 @@
         // assembler routines that performs the context switch
         extern void CtxInvokeStub( void );
-        extern void CtxSwitch( struct __stack_context_t * from, struct __stack_context_t * to ) asm ("CtxSwitch");
-        // void CtxStore ( void * this ) asm ("CtxStore");
-        // void CtxRet   ( void * dst  ) asm ("CtxRet");
+        void CtxSwitch( void * from, void * to ) asm ("CtxSwitch");
+
+        #if   defined( __i386 )
+        #define CtxGet( ctx ) __asm__ ( \
+                        "movl %%esp,%0\n"   \
+                        "movl %%ebp,%1\n"   \
+                : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+        #elif defined( __x86_64 )
+        #define CtxGet( ctx ) __asm__ ( \
+                        "movq %%rsp,%0\n"   \
+                        "movq %%rbp,%1\n"   \
+                : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+        #elif defined( __ARM_ARCH )
+        #define CtxGet( ctx ) __asm__ ( \
+                        "mov %0,%%sp\n"   \
+                        "mov %1,%%r11\n"   \
+                : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+        #else
+                #error unknown hardware architecture
+        #endif
 
 #endif //_INVOKE_PRIVATE_H_