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

Timestamp:

Feb 12, 2018, 11:55:02 AM (7 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:

d56ca354, ee2938a

Parents:

827a190 (diff), 43c6dc82 (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:

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

src/libcfa/concurrency/invoke.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  6 23:00:57 2018
-// Update Count     : 3
+// Last Modified On : Fri Feb  9 16:37:42 2018
+// Update Count     : 5
 //
 
@@ -51 +51 @@
         //Final suspend, should never return
         __leave_coroutine();
-        abortf( "Resumed dead coroutine" );
+        __cabi_abort( "Resumed dead coroutine" );
 }
 
@@ -81 +81 @@
         //Final suspend, should never return
         __leave_thread_monitor( thrd );
-        abortf( "Resumed dead thread" );
+        __cabi_abort( "Resumed dead thread" );
 }
 
@@ -93 +93 @@
         struct coStack_t* stack = &get_coroutine( this )->stack;
 
-#if defined( __i386__ )
+#if defined( __i386 )
 
         struct FakeStack {
@@ -114 +114 @@
         ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7
 
-#elif defined( __x86_64__ )
+#elif defined( __x86_64 )
 
         struct FakeStack {
@@ -150 +150 @@
         fs->arg[0] = this;
         fs->arg[1] = invoke;
+
 #else
-        #error Only __i386__ and __x86_64__ is supported for threads in cfa
+        #error uknown hardware architecture
 #endif
 }