Changeset 96f002c1

Timestamp:

Jun 14, 2021, 2:43:35 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d363634

Parents:

50871b4

Message:

Added new device folder and cpu file to libcfa

Location:

libcfa/src

Files:

• Makefile.am (modified) (3 diffs)
• device/cpu.cfa (added)
• device/cpu.hfa (added)
• 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/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"