Changeset 298ed08 for src/libcfa/concurrency/invoke.h

Timestamp:

Feb 9, 2018, 4:45:50 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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:

43c6dc82

Parents:

826a67c (diff), bede27b (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.h (modified) (3 diffs)

src/libcfa/concurrency/invoke.h

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jan 23 14:55:46 2018
-// Update Count     : 3
+// Last Modified On : Fri Feb  9 14:41:55 2018
+// Update Count     : 6
 //
 
@@ -202 +202 @@
         void CtxSwitch( void * from, void * to ) asm ("CtxSwitch");
 
-        #if   defined( __x86_64__ )
+        #if   defined( __i386 )
+        #define CtxGet( ctx ) __asm__ ( \
+                        "movl %%esp,%0\n"   \
+                        "movl %%ebp,%1\n"   \
+                : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+        #elif defined( __x86_64 )
         #define CtxGet( ctx ) __asm__ ( \
                         "movq %%rsp,%0\n"   \
                         "movq %%rbp,%1\n"   \
-                : "=rm" (ctx.SP), "=rm" (ctx.FP) )
-        #elif defined( __i386__ )
-        #define CtxGet( ctx ) __asm__ ( \
-                        "movl %%esp,%0\n"   \
-                        "movl %%ebp,%1\n"   \
                 : "=rm" (ctx.SP), "=rm" (ctx.FP) )
         #elif defined( __ARM_ARCH )
@@ -217 +217 @@
                         "mov %1,%%r11\n"   \
                 : "=rm" (ctx.SP), "=rm" (ctx.FP) )
+        #else
+                #error unknown hardware architecture
         #endif