Changeset 80d9e49 for src/libcfa/concurrency/invoke.c

Timestamp:

Dec 7, 2016, 2:47:53 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

550a3385

Parents:

a68caae

Message:

Coroutines no longer require virtual pointers or any code beyond the get_coroutine routine

File:

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

src/libcfa/concurrency/invoke.c

@@ -13 +13 @@
 // Called from the kernel when starting a coroutine or task so must switch back to user mode.
 
-void invokeCoroutine(covptr_t* vthis)
-{
-      LIB_DEBUG_PRINTF("Invoke : Received %p (v %p)\n", vthis, *vthis);
+extern void __suspend__F___1(void);
 
-      struct coroutine* cor = get_coroutine( vthis );
+void invokeCoroutine(
+      void (*main)(void *), 
+      struct coroutine *(*get_coroutine)(void *), 
+      void *this
+) {
+      LIB_DEBUG_PRINTF("Invoke : Received %p (main %p, get_c %p)\n", this, main, get_coroutine);
+
+      struct coroutine* cor = get_coroutine( this );
+
+      if(cor->state == Primed) {
+            __suspend__F___1();
+      }
 
       cor->state = Active;
 
-      (*vthis)->main( get_object(vthis) );
+      main( this );
 }
 
 
-void startCoroutine(covptr_t* vthis, void (*invoke)(covptr_t*)) {
-      LIB_DEBUG_PRINTF("StartCoroutine : Passing in %p (v %p) to %p\n", vthis, *vthis, invoke);
+void startCoroutine(
+      void (*main)(void *), 
+      struct coroutine *(*get_coroutine)(void *), 
+      void *this, 
+      void (*invoke)(void *)
+) {
+      LIB_DEBUG_PRINTF("StartCoroutine : Passing in %p (main %p, get_c %p) to %p\n", this, main, get_coroutine, invoke);
 
-      struct coroutine* this = get_coroutine( vthis );
-      struct coStack_t* stack = &this->stack;
+      struct coStack_t* stack = &get_coroutine( this )->stack;
 
 #if defined( __i386__ )
@@ -37 +50 @@
             void *rturn;                                      // where to go on return from uSwitch
             void *dummyReturn;                          // fake return compiler would have pushed on call to uInvoke
-            void *argument;                             // for 16-byte ABI, 16-byte alignment starts here
-            void *padding[3];                           // padding to force 16-byte alignment, as "base" is 16-byte aligned
+            void *argument[3];                          // for 16-byte ABI, 16-byte alignment starts here
+            void *padding;                              // padding to force 16-byte alignment, as "base" is 16-byte aligned
         };
 
@@ -45 +58 @@
 
         ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->dummyReturn = NULL;
-        ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->argument = vthis;     // argument to invoke
+        ((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;
 
@@ -61 +74 @@
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->dummyReturn = NULL;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = coInvokeStub;
-      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[0] = vthis;
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[0] = this;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = invoke;
 #else