Changeset 381fdee for src/libcfa/concurrency

Timestamp:

Feb 9, 2018, 4:33:29 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

bede27b

Parents:

539cdfe

Message:

harmonize conditional hardware-architecture code, fix conflicit with ftype variable on ARM

Location:

src/libcfa/concurrency

Files:

• invoke.c (modified) (4 diffs)
• invoke.h (modified) (3 diffs)
• kernel.c (modified) (2 diffs)
• preemption.c (modified) (3 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 Jan 23 14:04:56 2018
-// Update Count     : 2
+// Last Modified On : Fri Feb  9 14:41:56 2018
+// Update Count     : 3
 //
 
@@ -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
 }

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
 

src/libcfa/concurrency/kernel.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  6 21:51:26 2018
-// Update Count     : 4
+// Last Modified On : Thu Feb  8 23:52:19 2018
+// Update Count     : 5
 //
 
 //C Includes
 #include <stddef.h>
-#define ftype `ftype`
 extern "C" {
 #include <stdio.h>
@@ -24 +23 @@
 #include <unistd.h>
 }
-#undef ftype
 
 //CFA Includes

src/libcfa/concurrency/preemption.c

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  6 15:00:36 2018
-// Update Count     : 10
+// Last Modified On : Fri Feb  9 14:42:34 2018
+// Update Count     : 25
 //
 
 #include "preemption.h"
 
-#define ftype `ftype`
 extern "C" {
 #include <errno.h>
@@ -23 +22 @@
 #include <unistd.h>
 }
-#undef ftype
 
 #include "bits/signal.h"
@@ -50 +48 @@
 
 // Machine specific register name
-#if   defined(__x86_64__)
+#if   defined( __i386 )
+#define CFA_REG_IP gregs[REG_EIP]
+#elif defined( __x86_64 )
 #define CFA_REG_IP gregs[REG_RIP]
-#elif defined(__i386__)
-#define CFA_REG_IP gregs[REG_EIP]
-#elif defined(__ARM_ARCH__)
+#elif defined( __ARM_ARCH )
 #define CFA_REG_IP arm_pc
+#else
+#error unknown hardware architecture
 #endif