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

Timestamp:

Apr 4, 2019, 3:37:55 PM (7 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, stuck-waitfor-destruct

Children:

8c01e1b

Parents:

2fabdc02

Message:

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

File:

• libcfa/src/concurrency/invoke.c (modified) (4 diffs)

libcfa/src/concurrency/invoke.c

@@ -122 +122 @@
         void (*invoke)(void *)
 ) {
-        struct coStack_t* stack = &get_coroutine( this )->stack;
+        struct coroutine_desc * cor = get_coroutine( this );
+        struct __stack_t * stack = cor->stack.storage;
 
 #if defined( __i386 )
@@ -136 +137 @@
         };
 
-        ((struct machine_context_t *)stack->context)->SP = (char *)stack->base - sizeof( struct FakeStack );
-        ((struct machine_context_t *)stack->context)->FP = NULL;                // terminate stack with NULL fp
+        cor->context.SP = (char *)stack->base - sizeof( struct FakeStack );
+        cor->context.FP = NULL;         // terminate stack with NULL fp
 
-        ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->dummyReturn = NULL;
-        ((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
+        struct FakeStack *fs = (struct FakeStack *)cor->context.SP;
+
+        fs->dummyReturn = NULL;
+        fs->argument[0] = this;     // argument to invoke
+        fs->rturn = invoke;
+        fs->mxcr = 0x1F80; //Vol. 2A 3-520
+        fs->fcw = 0x037F;  //Vol. 1 8-7
 
 #elif defined( __x86_64 )
@@ -155 +158 @@
         };
 
-        ((struct machine_context_t *)stack->context)->SP = (char *)stack->base - sizeof( struct FakeStack );
-        ((struct machine_context_t *)stack->context)->FP = NULL;                // terminate stack with NULL fp
+        cor->context.SP = (char *)stack->base - sizeof( struct FakeStack );
+        cor->context.FP = NULL;         // terminate stack with NULL fp
 
-        ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->dummyReturn = NULL;
-        ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = CtxInvokeStub;
-        ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[0] = this;
-        ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = 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
+        struct FakeStack *fs = (struct FakeStack *)cor->context.SP;
+
+        fs->dummyReturn = NULL;
+        fs->rturn = CtxInvokeStub;
+        fs->fixedRegisters[0] = this;
+        fs->fixedRegisters[1] = invoke;
+        fs->mxcr = 0x1F80; //Vol. 2A 3-520
+        fs->fcw = 0x037F;  //Vol. 1 8-7
 
 #elif defined( __ARM_ARCH )
@@ -173 +178 @@
         };
 
-        ((struct machine_context_t *)stack->context)->SP = (char *)stack->base - sizeof( struct FakeStack );
-        ((struct machine_context_t *)stack->context)->FP = NULL;
+        cor->context.SP = (char *)stack->base - sizeof( struct FakeStack );
+        cor->context.FP = NULL;
 
-        struct FakeStack *fs = (struct FakeStack *)((struct machine_context_t *)stack->context)->SP;
+        struct FakeStack *fs = (struct FakeStack *)cor->context.SP;
 
         fs->intRegs[8] = CtxInvokeStub;