Changes in / [cc344be:281806b]

Files:

• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• src/benchmark/Makefile.am (modified) (3 diffs)
• src/benchmark/Makefile.in (modified) (3 diffs)
• src/libcfa/concurrency/preemption.c (modified) (2 diffs)

configure

@@ -678 +678 @@
 CFA_INCDIR
 CFA_PREFIX
-DOendif
-DOifskipcompile
 BUILD_CONCURRENCY_FALSE
 BUILD_CONCURRENCY_TRUE
@@ -3344 +3342 @@
 
 
-DOifskipcompile='ifeq ($(skipcompile),yes)
-else'
-
-
-
-DOendif='endif'
-
-
-
 if test "x$prefix" = "xNONE"; then
         cfa_prefix=${ac_default_prefix}

configure.ac

@@ -130 +130 @@
 AM_CONDITIONAL([BUILD_NO_LIB], [test "x$build_release$build_debug" = "xnono"])
 AM_CONDITIONAL([BUILD_CONCURRENCY], [test "x$build_threading" = "xyes"])
-
-DOifskipcompile='ifeq ($(skipcompile),yes)
-else'
-AC_SUBST([DOifskipcompile])
-AM_SUBST_NOTMAKE([DOifskipcompile])
-
-DOendif='endif'
-AC_SUBST([DOendif])
-AM_SUBST_NOTMAKE([DOendif])
 
 if test "x$prefix" = "xNONE"; then

src/benchmark/Makefile.am

@@ -23 +23 @@
 STATS    = ${TOOLSDIR}stat.py
 repeats  = 30
-skipcompile = no
 TIME_FORMAT = "%E"
 PRINT_FORMAT = %20s: #Comments needed for spacing
@@ -44 +43 @@
 %.runquiet :
         @+make $(basename $@)
-        @taskset -c 1 ./a.out
+        @./a.out
         @rm -f a.out
 
@@ -60 +59 @@
         @echo -e '\t"githash": "'${githash}'",'
         @echo -e '\t"arch": "'   ${arch}   '",'
-@DOifskipcompile@
         @echo -e '\t"compile": {'
         @+make compile TIME_FORMAT='%e,' PRINT_FORMAT='\t\t\"%s\" :'
         @echo -e '\t\t"dummy" : {}'
         @echo -e '\t},'
-@DOendif@
         @echo -e '\t"ctxswitch": {'
         @echo -en '\t\t"coroutine":'

src/benchmark/Makefile.in

@@ -253 +253 @@
 STATS = ${TOOLSDIR}stat.py
 repeats = 30
-skipcompile = no
 TIME_FORMAT = "%E"
 PRINT_FORMAT = %20s: #Comments needed for spacing
@@ -460 +459 @@
 %.runquiet :
         @+make $(basename $@)
-        @taskset -c 1 ./a.out
+        @./a.out
         @rm -f a.out
 
@@ -474 +473 @@
         @echo -e '\t"githash": "'${githash}'",'
         @echo -e '\t"arch": "'   ${arch}   '",'
-@DOifskipcompile@
         @echo -e '\t"compile": {'
         @+make compile TIME_FORMAT='%e,' PRINT_FORMAT='\t\t\"%s\" :'
         @echo -e '\t\t"dummy" : {}'
         @echo -e '\t},'
-@DOendif@
         @echo -e '\t"ctxswitch": {'
         @echo -en '\t\t"coroutine":'

src/libcfa/concurrency/preemption.c

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