Changeset 298ed08 for src/libcfa/concurrency/preemption.c

Timestamp:

Feb 9, 2018, 4:45:50 PM (6 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/preemption.c (modified) (3 diffs)

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 : Thu Feb  8 17:01:56 2018
-// Update Count     : 13
+// Last Modified On : Fri Feb  9 16:38:13 2018
+// Update Count     : 14
 //
 
 #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