Changeset c4049e6 in mainline for uspace/lib/c

Timestamp:

2018-07-05T21:41:20Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9283830

Parents:

9396c52

git-author:

Dzejrou <dzejrou@…> (2018-03-15 10:40:53)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:20)

Message:

c+cpp: added support for global static constructors destructors

Location:

uspace/lib/c

Files:

• arch/amd64/_link.ld.in (modified) (1 diff)
• generic/elf/elf_load.c (modified) (1 diff)
• generic/elf/elf_mod.c (modified) (1 diff)
• generic/libc.c (modified) (3 diffs)
• include/loader/pcb.h (modified) (2 diffs)

uspace/lib/c/arch/amd64/_link.ld.in

@@ -55 +55 @@
         } :data
 
+    __dso_handle = .;
+
+        .init_array : {
+                PROVIDE_HIDDEN (__init_array_start = .);
+                KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
+                KEEP (*(.init_array .ctors))
+                PROVIDE_HIDDEN (__init_array_end = .);
+        }
+
+        .fini_array : {
+                PROVIDE_HIDDEN (__fini_array_start = .);
+                KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
+                KEEP (*(.fini_array .dtors))
+                PROVIDE_HIDDEN (__fini_array_end = .);
+        }
+
         _end = .;
 

uspace/lib/c/generic/elf/elf_load.c

@@ -112 +112 @@
         pcb->dynamic = info->finfo.dynamic;
         pcb->rtld_runtime = info->env;
+        pcb->cpp_data = info->finfo.cpp_data;
 }
 

uspace/lib/c/generic/elf/elf_mod.c

@@ -198 +198 @@
         size_t phdr_len = header->e_phnum * header->e_phentsize;
 
+        elf->info->interp = NULL;
+        elf->info->dynamic = NULL;
+        elf->info->cpp_data.ctors_count = 0;
+        elf->info->cpp_data.dtors_count = 0;
+
         if (phdr_len > sizeof(phdr)) {
                 DPRINTF("more than %d program headers\n", phdr_cap);

uspace/lib/c/generic/libc.c

@@ -61 +61 @@
 #endif
 
+static bool env_setup = false;
 
-static bool env_setup = false;
+/**
+ * Used for C++ constructors/destructors
+ * and the GCC constructor/destructor extension.
+ */
+typedef void (*init_array_entry_t)();
+extern init_array_entry_t __init_array_start[];
+extern init_array_entry_t __init_array_end[];
+typedef void (*fini_array_entry_t)();
+extern fini_array_entry_t __fini_array_start[];
+extern fini_array_entry_t __fini_array_end[];
 
 void __libc_main(void *pcb_ptr)
@@ -115 +125 @@
 
         /*
+         * C++ Static constructor calls.
+         */
+        ptrdiff_t init_array_entries = (__init_array_end - __init_array_start);
+
+        for (int i = init_array_entries - 1; i > 0; --i)
+                __init_array_start[i]();
+
+        /*
          * Run main() and set task return value
          * according the result
@@ -124 +142 @@
 void __libc_exit(int status)
 {
+        /*
+         * GCC extension __attribute__((destructor)),
+         * C++ destructors are added to __cxa_finalize call
+         * when the respective constructor is called.
+         */
+        ptrdiff_t fini_array_entries = (__fini_array_end - __fini_array_start);
+
+        for (int i = 0; i < fini_array_entries; ++i)
+                __fini_array_start[i]();
+
         if (env_setup) {
                 __stdio_done();

uspace/lib/c/include/loader/pcb.h

@@ -36 +36 @@
 #ifndef LIBC_PCB_H_
 #define LIBC_PCB_H_
-
 
 typedef void (*entry_point_t)(void);
@@ -76 +75 @@
         /** Pointer to dynamic linker state structure (rtld_t). */
         void *rtld_runtime;
+        /** C++ related data. */
+        cpp_data_t cpp_data;
 } pcb_t;