Changeset 04e6f93 for libcfa/src/concurrency/invoke.c

Timestamp:

Feb 27, 2020, 4:04:25 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a037f85

Parents:

41efd33 (diff), 930b504 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

libcfa/src/concurrency/invoke.c

@@ -29 +29 @@
 // Called from the kernel when starting a coroutine or task so must switch back to user mode.
 
-extern void __leave_coroutine ( struct coroutine_desc * );
-extern struct coroutine_desc * __finish_coroutine(void);
-extern void __leave_thread_monitor();
+extern struct $coroutine * __cfactx_cor_finish(void);
+extern void __cfactx_cor_leave ( struct $coroutine * );
+extern void __cfactx_thrd_leave();
+
 extern void disable_interrupts() OPTIONAL_THREAD;
 extern void enable_interrupts( __cfaabi_dbg_ctx_param );
 
-void CtxInvokeCoroutine(
+void __cfactx_invoke_coroutine(
         void (*main)(void *),
         void *this
 ) {
         // Finish setting up the coroutine by setting its state
-        struct coroutine_desc * cor = __finish_coroutine();
+        struct $coroutine * cor = __cfactx_cor_finish();
 
         // Call the main of the coroutine
@@ -46 +47 @@
 
         //Final suspend, should never return
-        __leave_coroutine( cor );
+        __cfactx_cor_leave( cor );
         __cabi_abort( "Resumed dead coroutine" );
 }
 
-static _Unwind_Reason_Code _CtxCoroutine_UnwindStop(
+static _Unwind_Reason_Code __cfactx_coroutine_unwindstop(
         __attribute((__unused__)) int version,
         _Unwind_Action actions,
@@ -61 +62 @@
                 // We finished unwinding the coroutine,
                 // leave it
-                __leave_coroutine( param );
+                __cfactx_cor_leave( param );
                 __cabi_abort( "Resumed dead coroutine" );
         }
@@ -69 +70 @@
 }
 
-void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct coroutine_desc * cor) __attribute__ ((__noreturn__));
-void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct coroutine_desc * cor) {
-        _Unwind_Reason_Code ret = _Unwind_ForcedUnwind( storage, _CtxCoroutine_UnwindStop, cor );
+void __cfactx_coroutine_unwind(struct _Unwind_Exception * storage, struct $coroutine * cor) __attribute__ ((__noreturn__));
+void __cfactx_coroutine_unwind(struct _Unwind_Exception * storage, struct $coroutine * cor) {
+        _Unwind_Reason_Code ret = _Unwind_ForcedUnwind( storage, __cfactx_coroutine_unwindstop, cor );
         printf("UNWIND ERROR %d after force unwind\n", ret);
         abort();
 }
 
-void CtxInvokeThread(
+void __cfactx_invoke_thread(
         void (*main)(void *),
         void *this
@@ -93 +94 @@
         // The order of these 4 operations is very important
         //Final suspend, should never return
-        __leave_thread_monitor();
+        __cfactx_thrd_leave();
         __cabi_abort( "Resumed dead thread" );
 }
 
-void CtxStart(
+void __cfactx_start(
         void (*main)(void *),
-        struct coroutine_desc * cor,
+        struct $coroutine * cor,
         void *this,
         void (*invoke)(void *)
@@ -139 +140 @@
 
         fs->dummyReturn = NULL;
-        fs->rturn = CtxInvokeStub;
+        fs->rturn = __cfactx_invoke_stub;
         fs->fixedRegisters[0] = main;
         fs->fixedRegisters[1] = this;
@@ -157 +158 @@
         struct FakeStack *fs = (struct FakeStack *)cor->context.SP;
 
-        fs->intRegs[8] = CtxInvokeStub;
+        fs->intRegs[8] = __cfactx_invoke_stub;
         fs->arg[0] = this;
         fs->arg[1] = invoke;