Changeset 2eadda9 in mainline for uspace/lib/c/generic

Timestamp:

2018-07-11T17:45:30Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

99d3123

Parents:

c2c4127

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-11 17:08:12)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-11 17:45:30)

Message:

Remove undefined references to main program from shared libc.

Location:

uspace/lib/c/generic

Files:

• as.c (modified) (1 diff)
• async/server.c (modified) (2 diffs)
• crt/entry.c (added)
• ddi.c (modified) (2 diffs)
• elf/elf_mod.c (modified) (1 diff)
• libc.c (modified) (6 diffs)
• private/libc.h (modified) (2 diffs)
• rtld/module.c (modified) (2 diffs)
• tls.c (modified) (4 diffs)

uspace/lib/c/generic/as.c

@@ -60 +60 @@
 {
         return (void *) __SYSCALL5(SYS_AS_AREA_CREATE, (sysarg_t) base,
-            (sysarg_t) size, (sysarg_t) flags, (sysarg_t) _end,
+            (sysarg_t) size, (sysarg_t) flags, (sysarg_t) __progsymbols.end,
             (sysarg_t) pager_info);
 }

uspace/lib/c/generic/async/server.c

@@ -1397 +1397 @@
         // FIXME: The source has no business deciding destination address.
         return ipc_answer_3(call->cap_handle, EOK, (sysarg_t) src, (sysarg_t) flags,
-            (sysarg_t) _end);
+            (sysarg_t) __progsymbols.end);
 }
 
@@ -1449 +1449 @@
         assert(call);
 
-        return ipc_answer_2(call->cap_handle, EOK, (sysarg_t) _end,
+        return ipc_answer_2(call->cap_handle, EOK, (sysarg_t) __progsymbols.end,
             (sysarg_t) dst);
 }

uspace/lib/c/generic/ddi.c

@@ -72 +72 @@
 {
         return (errno_t) __SYSCALL5(SYS_PHYSMEM_MAP, (sysarg_t) phys,
-            pages, flags, (sysarg_t) virt, (sysarg_t) _end);
+            pages, flags, (sysarg_t) virt, (sysarg_t) __progsymbols.end);
 }
 
@@ -145 +145 @@
         return (errno_t) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size,
             (sysarg_t) map_flags, (sysarg_t) flags | DMAMEM_FLAGS_ANONYMOUS,
-            (sysarg_t) phys, (sysarg_t) virt, (sysarg_t) _end);
+            (sysarg_t) phys, (sysarg_t) virt, (sysarg_t) __progsymbols.end);
 }
 

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

@@ -356 +356 @@
                     (void *)((uint8_t *)entry->p_vaddr + elf->bias);
 
+                if (entry->p_filesz == 0) {
+                        DPRINTF("Zero-sized ELF interp string.\n");
+                        return EE_INVALID;
+                }
                 if (elf->info->interp[entry->p_filesz - 1] != '\0') {
                         DPRINTF("Unterminated ELF interp string.\n");

uspace/lib/c/generic/libc.c

@@ -61 +61 @@
 #endif
 
+progsymbols_t __progsymbols;
+
 static bool env_setup = false;
 
@@ -116 +118 @@
          * 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]();
+        if (__progsymbols.preinit_array) {
+                for (int i = __progsymbols.preinit_array_len - 1; i >= 0; --i)
+                        __progsymbols.preinit_array[i]();
+        }
+
+        if (__progsymbols.init_array) {
+                for (int i = __progsymbols.init_array_len - 1; i >= 0; --i)
+                        __progsymbols.init_array[i]();
+        }
 
         /*
@@ -125 +133 @@
          * according the result
          */
-        int retval = main(argc, argv);
+        int retval = __progsymbols.main(argc, argv);
         exit(retval);
 }
@@ -136 +144 @@
          * 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]();
+        for (int i = 0; i < __progsymbols.fini_array_len; ++i)
+                __progsymbols.fini_array[i]();
 
         if (env_setup) {
@@ -148 +155 @@
 
         __SYSCALL1(SYS_TASK_EXIT, false);
-
-        /* Unreachable */
-        while (true)
-                ;
+        __builtin_unreachable();
 }
 
@@ -157 +161 @@
 {
         __SYSCALL1(SYS_TASK_EXIT, true);
-
-        /* Unreachable */
-        while (true)
-                ;
+        __builtin_unreachable();
 }
 

uspace/lib/c/generic/private/libc.h

@@ -36 +36 @@
 #define LIBC_PRIVATE_LIBC_H_
 
+#include <types/common.h>
+
+/* Type of the main C function. */
+typedef int (*main_fn_t)(int, char **);
+
 /**
  * Used for C++ constructors/destructors
@@ -43 +48 @@
 typedef void (*fini_array_entry_t)();
 
-extern init_array_entry_t __init_array_start[];
-extern init_array_entry_t __init_array_end[];
-extern fini_array_entry_t __fini_array_start[];
-extern fini_array_entry_t __fini_array_end[];
+typedef struct {
+        main_fn_t main;
+        const void *elfstart;
+        const void *end;
+        init_array_entry_t *preinit_array;
+        int preinit_array_len;
+        init_array_entry_t *init_array;
+        int init_array_len;
+        fini_array_entry_t *fini_array;
+        int fini_array_len;
+} progsymbols_t;
 
-extern unsigned char _end[];
+extern progsymbols_t __progsymbols;
 extern void __libc_main(void *) __attribute__((noreturn));
 extern void __libc_exit(int) __attribute__((noreturn));
 extern void __libc_abort(void) __attribute__((noreturn));
-extern int main(int, char *[]);
 
 #endif

uspace/lib/c/generic/rtld/module.c

@@ -51 +51 @@
 #include <rtld/module.h>
 
+#include "../private/libc.h"
+
 /** Create module for static executable.
  *
@@ -73 +75 @@
 
         const elf_segment_header_t *tls =
-            elf_get_phdr(__executable_start, PT_TLS);
+            elf_get_phdr(__progsymbols.elfstart, PT_TLS);
 
         if (tls) {
-                uintptr_t bias = elf_get_bias(__executable_start);
+                uintptr_t bias = elf_get_bias(__progsymbols.elfstart);
                 module->tdata = (void *) (tls->p_vaddr + bias);
                 module->tdata_size = tls->p_filesz;

uspace/lib/c/generic/tls.c

@@ -45 +45 @@
 #include <elf/elf.h>
 
+#include "private/libc.h"
+
 #ifdef CONFIG_RTLD
 #include <rtld/rtld.h>
@@ -61 +63 @@
 
         const elf_segment_header_t *tls =
-            elf_get_phdr(__executable_start, PT_TLS);
+            elf_get_phdr(__progsymbols.elfstart, PT_TLS);
 
         if (tls == NULL)
@@ -88 +90 @@
 
         const elf_segment_header_t *tls =
-            elf_get_phdr(__executable_start, PT_TLS);
+            elf_get_phdr(__progsymbols.elfstart, PT_TLS);
         if (tls == NULL)
                 return NULL;
 
-        uintptr_t bias = elf_get_bias(__executable_start);
+        uintptr_t bias = elf_get_bias(__progsymbols.elfstart);
         size_t align = max(tls->p_align, _Alignof(tcb_t));
 
@@ -128 +130 @@
 #endif
         const elf_segment_header_t *tls =
-            elf_get_phdr(__executable_start, PT_TLS);
+            elf_get_phdr(__progsymbols.elfstart, PT_TLS);
 
         assert(tls != NULL);