Changeset 8c01e1b for libcfa/src

Timestamp:

Apr 4, 2019, 5:28:47 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:

211228e0

Parents:

b2f6113

Message:

UserStack? flag on coroutines is now folded into the storage pointer

Location:

libcfa/src/concurrency

Files:

• coroutine.cfa (modified) (2 diffs)
• coroutine.hfa (modified) (1 diff)
• invoke.h (modified) (1 diff)
• kernel.cfa (modified) (2 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -68 +68 @@
 
 void ^?{}(__stack_info_t & this) {
-        if ( ! this.userStack && this.storage ) {
-                void * storage = (char*)(this.storage) - this.storage->size;
+        bool userStack = ((intptr_t)this.storage & 0x1) != 0;
+        if ( ! userStack && this.storage ) {
+                *((intptr_t*)&this.storage) &= (intptr_t)-1;
+                void * storage = this.storage->limit;
                 __cfaabi_dbg_debug_do(
                         storage = (char*)(storage) - __page_size;
@@ -200 +202 @@
         this->storage->limit = storage;
         this->storage->base  = (void*)((intptr_t)storage + size);
-        this->userStack = userStack;
+        *((intptr_t*)&this->storage) |= userStack ? 0x1 : 0x0;
 }
 

libcfa/src/concurrency/coroutine.hfa

@@ -102 +102 @@
         coroutine_desc * dst = get_coroutine(cor);
 
-        if( unlikely(!dst->stack.storage || !dst->stack.storage->base) ) {
+        if( unlikely(dst->context.SP == NULL) ) {
                 __stack_prepare(&dst->stack, 65000);
                 CtxStart(&cor, CtxInvokeCoroutine);

libcfa/src/concurrency/invoke.h

@@ -97 +97 @@
                 // pointer to stack
                 struct __stack_t * storage;
-
-                // whether or not the user allocated the stack
-                bool userStack;
         };
 

libcfa/src/concurrency/kernel.cfa

@@ -94 +94 @@
         context.errno_ = 0;
         stack.storage = info->storage;
-        stack.userStack = true;
         with(*stack.storage) {
                 size      = info->size;
@@ -100 +99 @@
                 base      = info->base;
         }
+        *((intptr_t*)&stack.storage) |= 0x1;
         name = "Main Thread";
         state = Start;