Changeset d56ca354 for src/libcfa

Timestamp:

Feb 12, 2018, 11:57:55 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:

fd062a66

Parents:

c40e7c5 (diff), cfe2f0a (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

Location:

src/libcfa

Files:

• Makefile.am (modified) (2 diffs)
• bits/debug.c (modified) (4 diffs)
• bits/debug.h (modified) (2 diffs)
• bits/defs.h (modified) (2 diffs)
• concurrency/coroutine.c (modified) (5 diffs)
• concurrency/invoke.c (modified) (6 diffs)
• concurrency/invoke.h (modified) (3 diffs)
• concurrency/kernel.c (modified) (2 diffs)
• concurrency/monitor.c (modified) (31 diffs)
• concurrency/preemption.c (modified) (15 diffs)
• exception.c (modified) (3 diffs)
• interpose.c (modified) (11 diffs)
• stdhdr/sys/ucontext.h (added)

src/libcfa/Makefile.am

@@ -10 +10 @@
 ## Author           : Peter A. Buhr
 ## Created On       : Sun May 31 08:54:01 2015
-## Last Modified By : Andrew Beach
-## Last Modified On : Wed Jul 26 14:15:00 2017
-## Update Count     : 221
+## Last Modified By : Peter A. Buhr
+## Last Modified On : Fri Feb  9 15:51:24 2018
+## Update Count     : 223
 ###############################################################################
 
@@ -92 +92 @@
 libcfa_d_a_CFLAGS = -debug -O0 #No need for __CFA_DEBUG__ since we pass -debug
 
-stdhdr = ${shell echo stdhdr/*}
+stdhdr = ${shell find stdhdr -type f -printf "%p "}
 
 cfa_includedir = $(CFA_INCDIR)

src/libcfa/bits/debug.c

@@ -11 +11 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 0
+// Update Count     : 1
 //
 
@@ -47 +47 @@
         void __cfaabi_dbg_bits_release() __attribute__((__weak__)) {}
 
-        void __cfaabi_dbg_bits_print_safe  ( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) )) {
+        void __cfaabi_dbg_bits_print_safe  ( const char fmt[], ... ) __attribute__(( format(printf, 1, 2) )) {
                 va_list args;
 
@@ -60 +60 @@
         }
 
-        void __cfaabi_dbg_bits_print_nolock( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) )) {
+        void __cfaabi_dbg_bits_print_nolock( const char fmt[], ... ) __attribute__(( format(printf, 1, 2) )) {
                 va_list args;
 
@@ -76 +76 @@
         }
 
-        void __cfaabi_dbg_bits_print_buffer( char in_buffer[], int in_buffer_size, const char fmt[], ... ) __attribute__(( format (printf, 3, 4) )) {
+        void __cfaabi_dbg_bits_print_buffer( char in_buffer[], int in_buffer_size, const char fmt[], ... ) __attribute__(( format(printf, 3, 4) )) {
                 va_list args;
 

src/libcfa/bits/debug.h

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 10:02:24 2017
-// Update Count     : 1
+// Last Modified On : Thu Feb  8 12:35:19 2018
+// Update Count     : 2
 //
 
@@ -41 +41 @@
       extern void __cfaabi_dbg_bits_acquire();
       extern void __cfaabi_dbg_bits_release();
-      extern void __cfaabi_dbg_bits_print_safe  ( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) ));
-      extern void __cfaabi_dbg_bits_print_nolock( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) ));
+      extern void __cfaabi_dbg_bits_print_safe  ( const char fmt[], ... ) __attribute__(( format(printf, 1, 2) ));
+      extern void __cfaabi_dbg_bits_print_nolock( const char fmt[], ... ) __attribute__(( format(printf, 1, 2) ));
       extern void __cfaabi_dbg_bits_print_vararg( const char fmt[], va_list arg );
-      extern void __cfaabi_dbg_bits_print_buffer( char buffer[], int buffer_size, const char fmt[], ... ) __attribute__(( format (printf, 3, 4) ));
+      extern void __cfaabi_dbg_bits_print_buffer( char buffer[], int buffer_size, const char fmt[], ... ) __attribute__(( format(printf, 3, 4) ));
 #ifdef __cforall
 }

src/libcfa/bits/defs.h

@@ -10 +10 @@
 // Created On       : Thu Nov  9 13:24:10 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jan  2 09:17:06 2018
-// Update Count     : 2
+// Last Modified On : Thu Feb  8 16:22:41 2018
+// Update Count     : 8
 //
 
@@ -34 +34 @@
 
 #ifdef __cforall
-#ifndef __NO_ABORT_OVERLOAD
-void abort ( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__));
-#endif
+void abort ( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
 extern "C" {
 #endif
-void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__));
+void __cabi_abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
 #ifdef __cforall
 }

src/libcfa/concurrency/coroutine.c

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:34:57 2017
-// Update Count     : 1
+// Last Modified On : Thu Feb  8 16:10:31 2018
+// Update Count     : 4
 //
 
@@ -77 +77 @@
                 __cfaabi_dbg_debug_do(
                         if ( mprotect( this.storage, pageSize, PROT_READ | PROT_WRITE ) == -1 ) {
-                                abortf( "(coStack_t *)%p.^?{}() : internal error, mprotect failure, error(%d) %s.", &this, errno, strerror( errno ) );
+                                abort( "(coStack_t *)%p.^?{}() : internal error, mprotect failure, error(%d) %s.", &this, errno, strerror( errno ) );
                         }
                 );
@@ -99 +99 @@
 // Wrapper for co
 void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
-        // THREAD_GETMEM( This )->disableInterrupts();
+        disable_interrupts();
 
         // set state of current coroutine to inactive
@@ -115 +115 @@
         src->state = Active;
 
-        // THREAD_GETMEM( This )->enableInterrupts();
+        enable_interrupts( __cfaabi_dbg_ctx );
 } //ctxSwitchDirect
 
@@ -135 +135 @@
                 __cfaabi_dbg_debug_do(
                         if ( mprotect( storage, pageSize, PROT_NONE ) == -1 ) {
-                                abortf( "(uMachContext &)%p.createContext() : internal error, mprotect failure, error(%d) %s.", this, (int)errno, strerror( (int)errno ) );
+                                abort( "(uMachContext &)%p.createContext() : internal error, mprotect failure, error(%d) %s.", this, (int)errno, strerror( (int)errno ) );
                         } // if
                 );
 
                 if ( (intptr_t)storage == 0 ) {
-                        abortf( "Attempt to allocate %d bytes of storage for coroutine or task execution-state but insufficient memory available.", size );
+                        abort( "Attempt to allocate %zd bytes of storage for coroutine or task execution-state but insufficient memory available.", size );
                 } // if
 

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 Feb  6 23:00:57 2018
-// Update Count     : 3
+// Last Modified On : Fri Feb  9 16:37:42 2018
+// Update Count     : 5
 //
 
@@ -51 +51 @@
         //Final suspend, should never return
         __leave_coroutine();
-        abortf( "Resumed dead coroutine" );
+        __cabi_abort( "Resumed dead coroutine" );
 }
 
@@ -81 +81 @@
         //Final suspend, should never return
         __leave_thread_monitor( thrd );
-        abortf( "Resumed dead thread" );
+        __cabi_abort( "Resumed dead thread" );
 }
 
@@ -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/monitor.c

@@ -10 +10 @@
 // Created On       : Thd Feb 23 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 31 14:59:05 2017
-// Update Count     : 3
+// Last Modified On : Thu Feb  8 16:12:20 2018
+// Update Count     : 4
 //
 
@@ -87 +87 @@
                 thread_desc * thrd = this_thread;
 
-                __cfaabi_dbg_print_safe("Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
+                __cfaabi_dbg_print_safe( "Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
 
                 if( !this->owner ) {
@@ -93 +93 @@
                         set_owner( this, thrd );
 
-                        __cfaabi_dbg_print_safe("Kernel :  mon is free \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  mon is free \n" );
                 }
                 else if( this->owner == thrd) {
@@ -99 +99 @@
                         this->recursion += 1;
 
-                        __cfaabi_dbg_print_safe("Kernel :  mon already owned \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  mon already owned \n" );
                 }
                 else if( is_accepted( this, group) ) {
@@ -108 +108 @@
                         reset_mask( this );
 
-                        __cfaabi_dbg_print_safe("Kernel :  mon accepts \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  mon accepts \n" );
                 }
                 else {
-                        __cfaabi_dbg_print_safe("Kernel :  blocking \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  blocking \n" );
 
                         // Some one else has the monitor, wait in line for it
@@ -118 +118 @@
                         BlockInternal( &this->lock );
 
-                        __cfaabi_dbg_print_safe("Kernel : %10p Entered  mon %p\n", thrd, this);
+                        __cfaabi_dbg_print_safe( "Kernel : %10p Entered  mon %p\n", thrd, this);
 
                         // BlockInternal will unlock spinlock, no need to unlock ourselves
@@ -124 +124 @@
                 }
 
-                __cfaabi_dbg_print_safe("Kernel : %10p Entered  mon %p\n", thrd, this);
+                __cfaabi_dbg_print_safe( "Kernel : %10p Entered  mon %p\n", thrd, this);
 
                 // Release the lock and leave
@@ -136 +136 @@
                 thread_desc * thrd = this_thread;
 
-                __cfaabi_dbg_print_safe("Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);
+                __cfaabi_dbg_print_safe( "Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);
 
 
                 if( !this->owner ) {
-                        __cfaabi_dbg_print_safe("Kernel : Destroying free mon %p\n", this);
+                        __cfaabi_dbg_print_safe( "Kernel : Destroying free mon %p\n", this);
 
                         // No one has the monitor, just take it
@@ -151 +151 @@
                         // We already have the monitor... but where about to destroy it so the nesting will fail
                         // Abort!
-                        abortf("Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex.");
+                        abort( "Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex." );
                 }
 
@@ -158 +158 @@
                 __monitor_group_t group = { &this, 1, func };
                 if( is_accepted( this, group) ) {
-                        __cfaabi_dbg_print_safe("Kernel :  mon accepts dtor, block and signal it \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  mon accepts dtor, block and signal it \n" );
 
                         // Wake the thread that is waiting for this
@@ -177 +177 @@
                 }
                 else {
-                        __cfaabi_dbg_print_safe("Kernel :  blocking \n");
+                        __cfaabi_dbg_print_safe( "Kernel :  blocking \n" );
 
                         wait_ctx( this_thread, 0 )
@@ -190 +190 @@
                 }
 
-                __cfaabi_dbg_print_safe("Kernel : Destroying %p\n", this);
+                __cfaabi_dbg_print_safe( "Kernel : Destroying %p\n", this);
 
         }
@@ -199 +199 @@
                 lock( this->lock __cfaabi_dbg_ctx2 );
 
-                __cfaabi_dbg_print_safe("Kernel : %10p Leaving mon %p (%p)\n", this_thread, this, this->owner);
+                __cfaabi_dbg_print_safe( "Kernel : %10p Leaving mon %p (%p)\n", this_thread, this, this->owner);
 
                 verifyf( this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", this_thread, this->owner, this->recursion, this );
@@ -209 +209 @@
                 // it means we don't need to do anything
                 if( this->recursion != 0) {
-                        __cfaabi_dbg_print_safe("Kernel :  recursion still %d\n", this->recursion);
+                        __cfaabi_dbg_print_safe( "Kernel :  recursion still %d\n", this->recursion);
                         unlock( this->lock );
                         return;
@@ -228 +228 @@
                 __cfaabi_dbg_debug_do(
                         if( this_thread != this->owner ) {
-                                abortf("Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner);
+                                abort( "Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner);
                         }
                         if( this->recursion != 1 ) {
-                                abortf("Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1);
+                                abort( "Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1);
                         }
                 )
@@ -256 +256 @@
                 // If we haven't left the last level of recursion
                 // it must mean there is an error
-                if( this->recursion != 0) { abortf("Thread internal monitor has unbalanced recursion"); }
+                if( this->recursion != 0) { abort( "Thread internal monitor has unbalanced recursion" ); }
 
                 // Fetch the next thread, can be null
@@ -302 +302 @@
         (this_thread->monitors){m, count, func};
 
-        // __cfaabi_dbg_print_safe("MGUARD : enter %d\n", count);
+        // __cfaabi_dbg_print_safe( "MGUARD : enter %d\n", count);
 
         // Enter the monitors in order
@@ -308 +308 @@
         enter( group );
 
-        // __cfaabi_dbg_print_safe("MGUARD : entered\n");
+        // __cfaabi_dbg_print_safe( "MGUARD : entered\n" );
 }
 
@@ -314 +314 @@
 // Dtor for monitor guard
 void ^?{}( monitor_guard_t & this ) {
-        // __cfaabi_dbg_print_safe("MGUARD : leaving %d\n", this.count);
+        // __cfaabi_dbg_print_safe( "MGUARD : leaving %d\n", this.count);
 
         // Leave the monitors in order
         leave( this.m, this.count );
 
-        // __cfaabi_dbg_print_safe("MGUARD : left\n");
+        // __cfaabi_dbg_print_safe( "MGUARD : left\n" );
 
         // Restore thread context
@@ -427 +427 @@
                 thread_desc * this_thrd = this_thread;
                 if ( this.monitor_count != this_thrd->monitors.size ) {
-                        abortf( "Signal on condition %p made with different number of monitor(s), expected %i got %i", &this, this.monitor_count, this_thrd->monitors.size );
+                        abort( "Signal on condition %p made with different number of monitor(s), expected %i got %i", &this, this.monitor_count, this_thrd->monitors.size );
                 }
 
                 for(int i = 0; i < this.monitor_count; i++) {
                         if ( this.monitors[i] != this_thrd->monitors[i] ) {
-                                abortf( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors[i] );
+                                abort( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors[i] );
                         }
                 }
@@ -534 +534 @@
         if(actual_count == 0) return;
 
-        __cfaabi_dbg_print_buffer_local( "Kernel : waitfor internal proceeding\n");
+        __cfaabi_dbg_print_buffer_local( "Kernel : waitfor internal proceeding\n" );
 
         // Create storage for monitor context
@@ -551 +551 @@
                         __acceptable_t& accepted = mask[index];
                         if( accepted.is_dtor ) {
-                                __cfaabi_dbg_print_buffer_local( "Kernel : dtor already there\n");
+                                __cfaabi_dbg_print_buffer_local( "Kernel : dtor already there\n" );
                                 verifyf( accepted.size == 1,  "ERROR: Accepted dtor has more than 1 mutex parameter." );
 
@@ -563 +563 @@
                         }
                         else {
-                                __cfaabi_dbg_print_buffer_local( "Kernel : thread present, baton-passing\n");
+                                __cfaabi_dbg_print_buffer_local( "Kernel : thread present, baton-passing\n" );
 
                                 // Create the node specific to this wait operation
@@ -577 +577 @@
                                         }
                                 #endif
-                                __cfaabi_dbg_print_buffer_local( "\n");
+                                __cfaabi_dbg_print_buffer_local( "\n" );
 
                                 // Set the owners to be the next thread
@@ -588 +588 @@
                                 monitor_restore;
 
-                                __cfaabi_dbg_print_buffer_local( "Kernel : thread present, returned\n");
+                                __cfaabi_dbg_print_buffer_local( "Kernel : thread present, returned\n" );
                         }
 
@@ -598 +598 @@
 
         if( duration == 0 ) {
-                __cfaabi_dbg_print_buffer_local( "Kernel : non-blocking, exiting\n");
+                __cfaabi_dbg_print_buffer_local( "Kernel : non-blocking, exiting\n" );
 
                 unlock_all( locks, count );
@@ -607 +607 @@
 
 
-        verifyf( duration < 0, "Timeout on waitfor statments not supported yet.");
-
-        __cfaabi_dbg_print_buffer_local( "Kernel : blocking waitfor\n");
+        verifyf( duration < 0, "Timeout on waitfor statments not supported yet." );
+
+        __cfaabi_dbg_print_buffer_local( "Kernel : blocking waitfor\n" );
 
         // Create the node specific to this wait operation
@@ -631 +631 @@
         monitor_restore;
 
-        __cfaabi_dbg_print_buffer_local( "Kernel : exiting\n");
+        __cfaabi_dbg_print_buffer_local( "Kernel : exiting\n" );
 
         __cfaabi_dbg_print_buffer_local( "Kernel : accepted %d\n", *mask.accepted);
@@ -640 +640 @@
 
 static inline void set_owner( monitor_desc * this, thread_desc * owner ) {
-        // __cfaabi_dbg_print_safe("Kernal :   Setting owner of %p to %p ( was %p)\n", this, owner, this->owner );
+        // __cfaabi_dbg_print_safe( "Kernal :   Setting owner of %p to %p ( was %p)\n", this, owner, this->owner );
 
         //Pass the monitor appropriately
@@ -672 +672 @@
 static inline thread_desc * next_thread( monitor_desc * this ) {
         //Check the signaller stack
-        __cfaabi_dbg_print_safe("Kernel :  mon %p AS-stack top %p\n", this, this->signal_stack.top);
+        __cfaabi_dbg_print_safe( "Kernel :  mon %p AS-stack top %p\n", this, this->signal_stack.top);
         __condition_criterion_t * urgent = pop( this->signal_stack );
         if( urgent ) {
@@ -814 +814 @@
         thread_desc * thrd = this_thread;
         if( !this.monitors ) {
-                // __cfaabi_dbg_print_safe("Branding\n");
+                // __cfaabi_dbg_print_safe( "Branding\n" );
                 assertf( thrd->monitors.data != NULL, "No current monitor to brand condition %p", thrd->monitors.data );
                 this.monitor_count = thrd->monitors.size;

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 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
 
@@ -197 +197 @@
 
         if ( pthread_sigmask( SIG_UNBLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+            abort( "internal error, pthread_sigmask" );
         }
 }
@@ -208 +208 @@
 
         if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+            abort( "internal error, pthread_sigmask" );
         }
 }
@@ -247 +247 @@
 // Called from kernel_startup
 void kernel_start_preemption() {
-        __cfaabi_dbg_print_safe("Kernel : Starting preemption\n");
+        __cfaabi_dbg_print_safe( "Kernel : Starting preemption\n" );
 
         // Start with preemption disabled until ready
@@ -268 +268 @@
 // Called from kernel_shutdown
 void kernel_stop_preemption() {
-        __cfaabi_dbg_print_safe("Kernel : Preemption stopping\n");
+        __cfaabi_dbg_print_safe( "Kernel : Preemption stopping\n" );
 
         // Block all signals since we are already shutting down
@@ -284 +284 @@
         // Preemption is now fully stopped
 
-        __cfaabi_dbg_print_safe("Kernel : Preemption stopped\n");
+        __cfaabi_dbg_print_safe( "Kernel : Preemption stopped\n" );
 }
 
@@ -322 +322 @@
                 case PREEMPT_TERMINATE: verify(this_processor->do_terminate);
                 default:
-                        abortf( "internal error, signal value is %d", sfp->si_value.sival_int );
+                        abort( "internal error, signal value is %d", sfp->si_value.sival_int );
         }
 
@@ -328 +328 @@
         if( !preemption_ready() ) { return; }
 
-        __cfaabi_dbg_print_buffer_decl(" KERNEL: preempting core %p (%p).\n", this_processor, this_thread);
+        __cfaabi_dbg_print_buffer_decl( " KERNEL: preempting core %p (%p).\n", this_processor, this_thread);
 
         preemption_in_progress = true;                      // Sync flag : prevent recursive calls to the signal handler
@@ -348 +348 @@
 
         if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
-            abortf( "internal error, pthread_sigmask" );
+            abort( "internal error, pthread_sigmask" );
         }
 
@@ -365 +365 @@
                                         continue;
                         case EINVAL :
-                                        abortf("Timeout was invalid.");
+                                        abort( "Timeout was invalid." );
                                 default:
-                                        abortf("Unhandled error %d", err);
+                                        abort( "Unhandled error %d", err);
                         }
                 }
@@ -374 +374 @@
                 assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, info.si_code, info.si_value.sival_int);
 
-                // __cfaabi_dbg_print_safe("Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int );
+                // __cfaabi_dbg_print_safe( "Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int );
                 // Switch on the code (a.k.a. the sender) to
                 switch( info.si_code )
@@ -382 +382 @@
                 case SI_TIMER:
                 case SI_KERNEL:
-                        // __cfaabi_dbg_print_safe("Kernel : Preemption thread tick\n");
+                        // __cfaabi_dbg_print_safe( "Kernel : Preemption thread tick\n" );
                         lock( event_kernel->lock __cfaabi_dbg_ctx2 );
                         tick_preemption();
@@ -396 +396 @@
 
 EXIT:
-        __cfaabi_dbg_print_safe("Kernel : Preemption thread stopping\n");
+        __cfaabi_dbg_print_safe( "Kernel : Preemption thread stopping\n" );
         return NULL;
 }

src/libcfa/exception.c

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Mon Jun 26 15:13:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 17 15:45:00 2017
-// Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Feb  9 14:41:55 2018
+// Update Count     : 8
 //
 
@@ -453 +453 @@
 // match, which is no way generic.  Some more works need to be done if we want to have a single call to the try routine.
 
-#if defined( __x86_64__ ) || defined( __i386__ )
+#if defined( __i386 ) || defined( __x86_64 )
 asm (
         //HEADER
@@ -476 +476 @@
 //      "       .section        .note.GNU-stack,\"x\",@progbits\n"
 );
-#endif // __x86_64__ || __i386__
+#endif // __i386 || __x86_64

src/libcfa/interpose.c

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  7 09:05:18 2018
-// Update Count     : 59
+// Last Modified On : Thu Feb  8 16:18:09 2018
+// Update Count     : 75
 //
 
@@ -28 +28 @@
 }
 
-#define __NO_ABORT_OVERLOAD // no abort overload avoid ambiguities
 #include "bits/debug.h"
 #include "bits/defs.h"
@@ -51 +50 @@
                         error = dlerror();
                         if ( error ) {
-                                abortf( "interpose_symbol : failed to open libc, %s\n", error );
+                                abort( "interpose_symbol : failed to open libc, %s\n", error );
                         }
                 #endif
@@ -69 +68 @@
 
         error = dlerror();
-        if ( error ) abortf( "interpose_symbol : internal error, %s\n", error );
+        if ( error ) abort( "interpose_symbol : internal error, %s\n", error );
 
         return originalFunc.fptr;
@@ -98 +97 @@
 
 struct {
-        __typeof__( exit  ) exit  __attribute__(( noreturn ));
-        __typeof__( abort ) abort __attribute__(( noreturn ));
+        void (* exit)( int ) __attribute__ (( __noreturn__ ));
+        void (* abort)( void ) __attribute__ (( __noreturn__ ));
 } __cabi_libc;
 
@@ -123 +122 @@
 
 // Forward declare abort after the __typeof__ call to avoid ambiguities
-void abort ( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__));
+void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ ));
+void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
 
 extern "C" {
-        void abort( void ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
-                abortf( NULL );
-        }
-
-        void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
+        void abort( void ) __attribute__ (( __nothrow__, __leaf__, __noreturn__ )) {
+                abort( NULL );
+        }
+
+        void __cabi_abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
                 va_list argp;
                 va_start( argp, fmt );
@@ -137 +137 @@
         }
 
-        void exit( int __status ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
-                __cabi_libc.exit(__status);
-        }
-}
-
-void * kernel_abort    ( void ) __attribute__ ((__nothrow__, __leaf__, __weak__)) { return NULL; }
-void   kernel_abort_msg( void * data, char * buffer, int size ) __attribute__ ((__nothrow__, __leaf__, __weak__)) {}
-int kernel_abort_lastframe( void ) __attribute__ ((__nothrow__, __leaf__, __weak__)) { return 4; }
+        void exit( int status ) __attribute__ (( __nothrow__, __leaf__, __noreturn__ )) {
+                __cabi_libc.exit( status );
+        }
+}
+
+void * kernel_abort    ( void ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) { return NULL; }
+void   kernel_abort_msg( void * data, char * buffer, int size ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) {}
+int kernel_abort_lastframe( void ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) { return 4; }
 
 enum { abort_text_size = 1024 };
@@ -150 +150 @@
 static int abort_lastframe;
 
-void abort( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
+void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ )) {
+    va_list args;
+    va_start( args, fmt );
+    vfprintf( stderr, fmt, args );
+    va_end( args );
+        __cabi_libc.exit( status );
+}
+
+void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
         void * kernel_data = kernel_abort();                    // must be done here to lock down kernel
         int len;
@@ -226 +234 @@
 
 void sigHandler_segv( __CFA_SIGPARMS__ ) {
-        abortf( "Addressing invalid memory at location %p\n"
+        abort( "Addressing invalid memory at location %p\n"
                         "Possible cause is reading outside the address space or writing to a protected area within the address space with an invalid pointer or subscript.\n",
                         sfp->si_addr );
@@ -232 +240 @@
 
 void sigHandler_ill( __CFA_SIGPARMS__ ) {
-        abortf( "Executing illegal instruction at location %p.\n"
+        abort( "Executing illegal instruction at location %p.\n"
                         "Possible cause is stack corruption.\n",
                         sfp->si_addr );
@@ -248 +256 @@
           default: msg = "unknown";
         } // choose
-        abortf( "Computation error %s at location %p.\n", msg, sfp->si_addr );
+        abort( "Computation error %s at location %p.\n", msg, sfp->si_addr );
 }