Changes in src/libcfa/concurrency/invoke.c [d9c44c3:5c81105]

File:

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

src/libcfa/concurrency/invoke.c

@@ -7 +7 @@
 #include "invoke.h"
 
-struct machine_context_t {
-        void *SP;
-        void *FP;
-        void *PC;
-};
-
-extern void coInvokeStub( void );
+#define __CFA_INVOKE_PRIVATE__
+#include "invoke.h"
 
 // magically invoke the "main" of the most derived class
 // Called from the kernel when starting a coroutine or task so must switch back to user mode.
-void __invokeCoroutine__F_P9scoVtablePv__1(struct coVtable *vtable, void* vthis)
+
+void invokeCoroutine(covptr_t* vthis)
 {
-      LIB_DEBUG_PRINTF("Invoke : Received %p (v %p)\n", vthis, vtable);
+      LIB_DEBUG_PRINTF("Invoke : Received %p (v %p)\n", vthis, *vthis);
 
-      struct coroutine* cor = vtable->this_coroutine(vthis);
+      struct coroutine* cor = get_coroutine( vthis );
 
       cor->state = Active;
 
-      vtable->main(vthis);
+      (*vthis)->main( get_object(vthis) );
 }
 
-void __startCoroutine__A0_1_0___this_coroutine__PFP10scoroutine_Pd0___co_main__PF_Pd0___vtable__PFP9scoVtable_Pd0__F_Pd0PF_P9scoVtablePv___1(
-      struct coroutine *(*this_coroutine)(void * ),
-      void (*co_main)(void *),
-      struct coVtable *(*get_vtable)(void *),
-      void *vthis,
-      void (*invoke)(struct coVtable *, void *)
-) {
-      LIB_DEBUG_PRINTF("StartCoroutine : Passing in %p (v %p) to %p\n", vthis, vtable, invoke);
 
-      struct coVtable * vtable = get_vtable( vthis );
-      struct coroutine* this = this_coroutine( vthis );
+void startCoroutine(covptr_t* vthis, void (*invoke)(covptr_t*)) {
+      LIB_DEBUG_PRINTF("StartCoroutine : Passing in %p (v %p) to %p\n", vthis, *vthis, invoke);
+
+      struct coroutine* this = get_coroutine( vthis );
       struct coStack_t* stack = &this->stack;
 
@@ -47 +37 @@
             void *rturn;                                      // where to go on return from uSwitch
             void *dummyReturn;                          // fake return compiler would have pushed on call to uInvoke
-            void *argument[2];                          // for 16-byte ABI, 16-byte alignment starts here
-            void *padding[2];                           // padding to force 16-byte alignment, as "base" is 16-byte aligned
+            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
         };
 
@@ -55 +45 @@
 
         ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->dummyReturn = NULL;
-        ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->argument[0] = vtable; // argument to invoke
-      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->argument[1] = vthis;  // argument to invoke
+        ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->argument = vthis;     // argument to invoke
         ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = invoke;
 
@@ -72 +61 @@
       ((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] = vtable;
-      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = vthis;
-      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[2] = invoke;
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[0] = vthis;
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = invoke;
 #else
       #error Only __i386__ and __x86_64__ is supported for threads in cfa