Changeset b2b44d8

Timestamp:

Feb 1, 2018, 9:25:57 AM (6 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:

05f4b85

Parents:

4ab3d68e

Message:

some arm cleanup

File:

• src/libcfa/concurrency/preemption.c (modified) (2 diffs)

src/libcfa/concurrency/preemption.c

@@ -49 +49 @@
 // Machine specific register name
 #if   defined(__x86_64__)
-#define CFA_REG_IP REG_RIP
+#define CFA_REG_IP gregs[REG_RIP]
 #elif defined(__i386__)
-#define CFA_REG_IP REG_EIP
+#define CFA_REG_IP gregs[REG_EIP]
 #elif defined(__ARM_ARCH__)
-#define CFA_REG_IP REG_R15
+#define CFA_REG_IP arm_pc
 #endif
 
@@ -284 +284 @@
 // Receives SIGUSR1 signal and causes the current thread to yield
 void sigHandler_ctxSwitch( __CFA_SIGPARMS__ ) {
-#if defined( __ARM_ARCH )
-        __cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.arm_pc); )
-#else
-        __cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.gregs[CFA_REG_IP]); )
-#endif
-
-                // Check if it is safe to preempt here
+        __cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.CFA_REG_IP); )
+
+        // Check if it is safe to preempt here
         if( !preemption_ready() ) { return; }