Changeset 7dd98b6 for libcfa/src

Timestamp:

Nov 3, 2021, 11:47:32 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

a1574e2

Parents:

3eb540fb

Message:

Moved cfa_main_returned to libcfa so it works when the main is written in C.

Location:

libcfa/src

Files:

• concurrency/kernel/startup.cfa (modified) (2 diffs)
• heap.cfa (modified) (1 diff)
• interpose.cfa (modified) (2 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -100 +100 @@
 // Other Forward Declarations
 extern void __wake_proc(processor *);
+extern int cfa_main_returned;                                                   // from interpose.cfa
 
 //-----------------------------------------------------------------------------
@@ -268 +269 @@
 
 static void __kernel_shutdown(void) {
+        if(!cfa_main_returned) return;
         /* paranoid */ verify( __preemption_enabled() );
         disable_interrupts();

libcfa/src/heap.cfa

@@ -102 +102 @@
 } // prtUnfreed
 
-extern int cfa_main_returned;                                                   // from bootloader.cf
+extern int cfa_main_returned;                                                   // from interpose.cfa
 extern "C" {
         void heapAppStart() {                                                           // called by __cfaabi_appready_startup

libcfa/src/interpose.cfa

@@ -94 +94 @@
 } __cabi_libc;
 
+int cfa_main_returned;
+
 extern "C" {
         void __cfaabi_interpose_startup( void ) {
                 const char *version = 0p;
+                cfa_main_returned = 0;
 
                 preload_libgcc();
@@ -313 +316 @@
 
 void sigHandler_term( __CFA_SIGPARMS__ ) {
+        write( STDERR_FILENO, "Handler Term\n", sizeof("Handler Term\n") - 1 );
         abort( true, "Application interrupted by signal: %s.\n", strsignal( sig ) );
 }