Changeset 258e6ad5

Timestamp:

Jan 23, 2018, 6:04:34 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:

ccbf683

Parents:

b6838214

Message:

fix ARM context-switch build

File:

• src/libcfa/concurrency/preemption.c (modified) (2 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 : Tue Jan 23 13:56:32 2018
-// Update Count     : 6
+// Last Modified On : Tue Jan 23 17:59:30 2018
+// Update Count     : 7
 //
 
@@ -299 +299 @@
 // 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); )
-
-        // Check if it is safe to preempt here
+#else
+        __cfaabi_dbg_debug_do( last_interrupt = (void *)(cxt->uc_mcontext.gregs[CFA_REG_IP]); )
+#endif
+
+                // Check if it is safe to preempt here
         if( !preemption_ready() ) { return; }