Changeset 2f19e03 for libcfa/src

Timestamp:

Jun 15, 2021, 12:28:48 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

b51e389c

Parents:

4aba055 (diff), 4f1b8f3f (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' into andrew-mmath, collecting updates.

Location:

libcfa/src

Files:

• Makefile.am (modified) (3 diffs)
• concurrency/kernel.cfa (modified) (2 diffs)
• concurrency/locks.hfa (modified) (3 diffs)
• device/cpu.cfa (added)
• device/cpu.hfa (added)
• exception.c (modified) (8 diffs)
• interpose.cfa (modified) (1 diff)
• startup.cfa (modified) (2 diffs)

libcfa/src/Makefile.am

@@ -69 +69 @@
         common.hfa \
         fstream.hfa \
-        strstream.hfa \
         heap.hfa \
         iostream.hfa \
@@ -78 +77 @@
         rational.hfa \
         stdlib.hfa \
+        strstream.hfa \
         time.hfa \
         bits/weakso_locks.hfa \
@@ -83 +83 @@
         containers/pair.hfa \
         containers/result.hfa \
-        containers/vector.hfa
+        containers/vector.hfa \
+        device/cpu.hfa
 
 libsrc = ${inst_headers_src} ${inst_headers_src:.hfa=.cfa} \

libcfa/src/concurrency/kernel.cfa

@@ -422 +422 @@
                 __cfactx_switch( &proc_cor->context, &thrd_dst->context );
                 // when __cfactx_switch returns we are back in the processor coroutine
+
+
 
                 /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_dst->canary );
@@ -522 +524 @@
 
         /* paranoid */ verify( ! __preemption_enabled() );
-        /* paranoid */ verifyf( ((uintptr_t)thrd_src->context.SP) < ((uintptr_t)__get_stack(thrd_src->curr_cor)->base ), "ERROR : Returning $thread %p has been corrupted.\n StackPointer too small.\n", thrd_src );
-        /* paranoid */ verifyf( ((uintptr_t)thrd_src->context.SP) > ((uintptr_t)__get_stack(thrd_src->curr_cor)->limit), "ERROR : Returning $thread %p has been corrupted.\n StackPointer too large.\n", thrd_src );
+        /* paranoid */ verifyf( ((uintptr_t)thrd_src->context.SP) < ((uintptr_t)__get_stack(thrd_src->curr_cor)->base ) || thrd_src->corctx_flag, "ERROR : Returning $thread %p has been corrupted.\n StackPointer too small.\n", thrd_src );
+        /* paranoid */ verifyf( ((uintptr_t)thrd_src->context.SP) > ((uintptr_t)__get_stack(thrd_src->curr_cor)->limit) || thrd_src->corctx_flag, "ERROR : Returning $thread %p has been corrupted.\n StackPointer too large.\n", thrd_src );
 }
 

libcfa/src/concurrency/locks.hfa

@@ -21 +21 @@
 #include "bits/weakso_locks.hfa"
 #include "containers/queueLockFree.hfa"
-
+#include "limits.hfa"
 #include "thread.hfa"
 
@@ -85 +85 @@
         bool tryP(BinaryBenaphore & this) {
                 ssize_t c = this.counter;
+                /* paranoid */ verify( c > MIN );
                 return (c >= 1) && __atomic_compare_exchange_n(&this.counter, &c, c-1, false, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);
         }
@@ -92 +93 @@
                 ssize_t c = 0;
                 for () {
+                        /* paranoid */ verify( this.counter < MAX );
                         if (__atomic_compare_exchange_n(&this.counter, &c, c+1, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
                                 if (c == 0) return true;

libcfa/src/exception.c

@@ -27 +27 @@
 #include "stdhdr/assert.h"
 #include "virtual.h"
-
-#if defined( __ARM_ARCH )
-#warning FIX ME: temporary hack to keep ARM build working
-#ifndef _URC_FATAL_PHASE1_ERROR
-#define _URC_FATAL_PHASE1_ERROR 3
-#endif // ! _URC_FATAL_PHASE1_ERROR
-#ifndef _URC_FATAL_PHASE2_ERROR
-#define _URC_FATAL_PHASE2_ERROR 2
-#endif // ! _URC_FATAL_PHASE2_ERROR
-#endif // __ARM_ARCH
-
 #include "lsda.h"
 
@@ -301 +290 @@
 }
 
-#if defined( __x86_64 ) || defined( __i386 )
+#if defined( __x86_64 ) || defined( __i386 ) || defined( __ARM_ARCH )
 // This is our personality routine. For every stack frame annotated with
 // ".cfi_personality 0x3,__gcfa_personality_v0" this function will be called twice when unwinding.
@@ -419 +408 @@
                                     _Unwind_GetCFA(unwind_context) + 24;
 #                               elif defined( __ARM_ARCH )
-#                                   warning FIX ME: check if anything needed for ARM
-                                    42;
+                                    _Unwind_GetCFA(unwind_context) + 40;
 #                               endif
                                 int (*matcher)(exception_t *) = *(int(**)(exception_t *))match_pos;
@@ -537 +525 @@
         // HEADER
         ".LFECFA1:\n"
+#if defined( __x86_64 ) || defined( __i386 )
         "       .globl  __gcfa_personality_v0\n"
+#else // defined( __ARM_ARCH )
+        "       .global __gcfa_personality_v0\n"
+#endif
         "       .section        .gcc_except_table,\"a\",@progbits\n"
         // TABLE HEADER (important field is the BODY length at the end)
@@ -569 +561 @@
         // No clue what this does specifically
         "       .section        .data.rel.local.CFA.ref.__gcfa_personality_v0,\"awG\",@progbits,CFA.ref.__gcfa_personality_v0,comdat\n"
+#if defined( __x86_64 ) || defined( __i386 )
         "       .align 8\n"
+#else // defined( __ARM_ARCH )
+        "       .align 3\n"
+#endif
         "       .type CFA.ref.__gcfa_personality_v0, @object\n"
         "       .size CFA.ref.__gcfa_personality_v0, 8\n"
@@ -575 +571 @@
 #if defined( __x86_64 )
         "       .quad __gcfa_personality_v0\n"
-#else // then __i386
+#elif defined( __i386 )
         "       .long __gcfa_personality_v0\n"
+#else // defined( __ARM_ARCH )
+        "       .xword __gcfa_personality_v0\n"
 #endif
 );
@@ -583 +581 @@
         // HEADER
         ".LFECFA1:\n"
+#if defined( __x86_64 ) || defined( __i386 )
         "       .globl  __gcfa_personality_v0\n"
+#else // defined( __ARM_ARCH )
+        "       .global __gcfa_personality_v0\n"
+#endif
         "       .section        .gcc_except_table,\"a\",@progbits\n"
         // TABLE HEADER (important field is the BODY length at the end)
@@ -612 +614 @@
 #pragma GCC pop_options
 
-#elif defined( __ARM_ARCH )
-_Unwind_Reason_Code __gcfa_personality_v0(
-                int version,
-                _Unwind_Action actions,
-                unsigned long long exception_class,
-                struct _Unwind_Exception * unwind_exception,
-                struct _Unwind_Context * unwind_context) {
-        return _URC_CONTINUE_UNWIND;
-}
-
-__attribute__((noinline))
-void __cfaehm_try_terminate(void (*try_block)(),
-                void (*catch_block)(int index, exception_t * except),
-                __attribute__((unused)) int (*match_block)(exception_t * except)) {
-}
 #else
         #error unsupported hardware architecture
-#endif // __x86_64 || __i386
+#endif // __x86_64 || __i386 || __ARM_ARCH

libcfa/src/interpose.cfa

@@ -95 +95 @@
 
 extern "C" {
-        void __cfaabi_interpose_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_CORE ) ));
         void __cfaabi_interpose_startup( void ) {
                 const char *version = 0p;

libcfa/src/startup.cfa

@@ -20 +20 @@
 
 extern "C" {
-    void __cfaabi_appready_startup( void ) __attribute__(( constructor( STARTUP_PRIORITY_APPREADY ) ));
-    void __cfaabi_appready_startup( void ) {
+        void __cfaabi_appready_startup( void ) __attribute__(( constructor( STARTUP_PRIORITY_APPREADY ) ));
+        void __cfaabi_appready_startup( void ) {
                 tzset();                                                                                // initialize time global variables
                 setlocale( LC_NUMERIC, getenv("LANG") );
@@ -28 +28 @@
                 heapAppStart();
                 #endif // __CFA_DEBUG__
-    } // __cfaabi_appready_startup
+        } // __cfaabi_appready_startup
 
-    void __cfaabi_appready_shutdown( void ) __attribute__(( destructor( STARTUP_PRIORITY_APPREADY ) ));
-    void __cfaabi_appready_shutdown( void ) {
+        void __cfaabi_appready_shutdown( void ) __attribute__(( destructor( STARTUP_PRIORITY_APPREADY ) ));
+        void __cfaabi_appready_shutdown( void ) {
                 #ifdef __CFA_DEBUG__
                 extern void heapAppStop();
                 heapAppStop();
                 #endif // __CFA_DEBUG__
-    } // __cfaabi_appready_shutdown
+        } // __cfaabi_appready_shutdown
 
-    void disable_interrupts() __attribute__(( weak )) {}
-    void enable_interrupts() __attribute__(( weak )) {}
+        void disable_interrupts() __attribute__(( weak )) {}
+        void enable_interrupts() __attribute__(( weak )) {}
+
+
+        extern void __cfaabi_interpose_startup( void );
+        extern void __cfaabi_device_startup   ( void );
+        extern void __cfaabi_device_shutdown  ( void );
+
+        void __cfaabi_core_startup( void ) __attribute__(( constructor( STARTUP_PRIORITY_CORE ) ));
+        void __cfaabi_core_startup( void ) {
+                __cfaabi_interpose_startup();
+                __cfaabi_device_startup();
+        } // __cfaabi_core_startup
+
+        void __cfaabi_core_shutdown( void ) __attribute__(( destructor( STARTUP_PRIORITY_CORE ) ));
+        void __cfaabi_core_shutdown( void ) {
+                __cfaabi_device_shutdown();
+        } // __cfaabi_core_shutdown
 } // extern "C"