Changeset b2f6113 for libcfa/src/concurrency/invoke.h

Timestamp:

Apr 4, 2019, 3:37:55 PM (6 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8c01e1b

Parents:

2fabdc02

Message:

Swapped memory storage for context and stack information inside the coroutine implementation

File:

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

libcfa/src/concurrency/invoke.h

@@ -62 +62 @@
         #endif
 
-        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
+        struct __stack_context_t {
+                void * SP;
+
+                void * FP;
+                // copy of global UNIX variable errno
+                int errno_;
+        };
+
+        // 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 {
+                // size of stack
+                size_t size;
+
+                // stack grows towards stack limit
+                void * limit;
+
+                // base of stack
+                void * base;
+        };
+
+        struct __stack_info_t {
+                // pointer to stack
+                struct __stack_t * storage;
+
+                // whether or not the user allocated the stack
+                bool userStack;
         };
 
@@ -75 +105 @@
 
         struct coroutine_desc {
+                // context that is switch during a CtxSwitch
+                struct __stack_context_t context;
+
                 // stack information of the coroutine
-                struct coStack_t stack;
+                struct __stack_info_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;
@@ -230 +261 @@
         // assembler routines that performs the context switch
         extern void CtxInvokeStub( void );
-        void CtxSwitch( void * from, void * to ) asm ("CtxSwitch");
+        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");