Changeset 331eacbe for libcfa/src

Timestamp:

Mar 5, 2020, 2:40:28 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

87f572e

Parents:

5452673 (diff), f9723e8 (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:

libcfa/src

Files:

• bits/containers.hfa (modified) (1 diff)
• concurrency/monitor.cfa (modified) (1 diff)
• exception.c (modified) (1 diff)
• interpose.cfa (modified) (6 diffs)

libcfa/src/bits/containers.hfa

@@ -169 +169 @@
                                 get_next( *head ) = 0p;
                                 verify(*this.tail == 1p);
+                                verify( get_next(*head) == 0p );
                                 return head;
                         }

libcfa/src/concurrency/monitor.cfa

@@ -534 +534 @@
         //Find the thread to run
         $thread * signallee = pop_head( this.blocked )->waiting_thread;
-        /* paranoid */ verify( signallee->next == 0p );
         __set_owner( monitors, count, signallee );
 

libcfa/src/exception.c

@@ -72 +72 @@
 // Used in the personality function, way down in termination.
 // struct _Unwind_Context * -> _Unwind_Reason_Code(*)(exception_t *)
+#if defined( __x86_64 )
 #define MATCHER_FROM_CONTEXT(ptr_to_context) \
         (*(_Unwind_Reason_Code(**)(exception_t *))(_Unwind_GetCFA(ptr_to_context) + 8))
-
+#elif defined( __i386 )
+#define MATCHER_FROM_CONTEXT(ptr_to_context) \
+        (*(_Unwind_Reason_Code(**)(exception_t *))(_Unwind_GetCFA(ptr_to_context) + 24))
+#endif
 
 // RESUMPTION ================================================================

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb 17 10:18:53 2020
-// Update Count     : 166
+// Last Modified On : Mon Mar  2 17:37:00 2020
+// Update Count     : 176
 //
 
@@ -143 +143 @@
 void abort( const char fmt[], ... ) __attribute__(( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
 void abort( bool signalAbort, const char fmt[], ... ) __attribute__(( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ ));
+void __abort( bool signalAbort, const char fmt[], va_list args ) __attribute__(( __nothrow__, __leaf__, __noreturn__ ));
 
 extern "C" {
@@ -152 +153 @@
                 va_list argp;
                 va_start( argp, fmt );
-                abort( false, fmt, argp );
+                __abort( false, fmt, argp );
                 va_end( argp );
         }
@@ -218 +219 @@
 }
 
-void abort( bool signalAbort, const char fmt[], ... ) {
+// Cannot forward va_list.
+void __abort( bool signalAbort, const char fmt[], va_list args ) {
         void * kernel_data = kernel_abort();                            // must be done here to lock down kernel
         int len;
@@ -228 +230 @@
 
         assert( fmt );
-        va_list args;
-        va_start( args, fmt );
-
         len = vsnprintf( abort_text, abort_text_size, fmt, args );
-        va_end( args );
         __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
 
@@ -248 +246 @@
         va_list args;
         va_start( args, fmt );
-        abort( false, fmt, args );
+        __abort( false, fmt, args );
+    // CONTROL NEVER REACHES HERE!
         va_end( args );
+}
+
+void abort( bool signalAbort, const char fmt[], ... ) {
+    va_list args;
+    va_start( args, fmt );
+    __abort( signalAbort, fmt, args );
+    // CONTROL NEVER REACHES HERE!
+    va_end( args );
 }