Changeset a69d42e in mainline

Timestamp:

2018-04-10T20:17:41Z (6 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:

9c514be

Parents:

1abcf1d

Message:

Define _end, and use it instead of the address of __entry in C code.

Location:

uspace/lib/c

Files:

• arch/abs32le/_link.ld.in (modified) (1 diff)
• arch/abs32le/include/libarch/entry.h (deleted)
• arch/abs32le/src/entry.c (modified) (1 diff)
• arch/amd64/_link.ld.in (modified) (1 diff)
• arch/arm32/_link.ld.in (modified) (1 diff)
• arch/ia32/_link.ld.in (modified) (1 diff)
• arch/ia64/_link.ld.in (modified) (1 diff)
• arch/mips32/_link.ld.in (modified) (1 diff)
• arch/ppc32/_link.ld.in (modified) (1 diff)
• arch/riscv64/_link.ld.in (modified) (1 diff)
• arch/riscv64/include/libarch/entry.h (deleted)
• arch/riscv64/src/entry.c (modified) (1 diff)
• arch/sparc64/_link.ld.in (modified) (1 diff)
• generic/as.c (modified) (1 diff)
• generic/async.c (modified) (2 diffs)
• generic/ddi.c (modified) (2 diffs)
• generic/private/libc.h (modified) (1 diff)

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

@@ -53 +53 @@
         } :data
 
+        _end = .;
+
         /DISCARD/ : {
                 *(*);

uspace/lib/c/arch/abs32le/src/entry.c

@@ -30 +30 @@
  */
 
-#include <libarch/entry.h>
 #include "../../../generic/private/libc.h"
 #include <stddef.h>
+
+extern void __entry(void);
+
+/* Normally, the entry point is defined in assembly for the architecture. */
 
 void __entry(void)

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

@@ -53 +53 @@
         } :data
 
+        _end = .;
+
 #ifdef CONFIG_LINE_DEBUG
         .comment 0 : { *(.comment); } :debug

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

@@ -51 +51 @@
         } :data
 
+        _end = .;
+
         /DISCARD/ : {
                 *(*);

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

@@ -112 +112 @@
         } :data
 
+        _end = .;
+
 #ifdef CONFIG_LINE_DEBUG
         .comment 0 : { *(.comment); } :debug

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

@@ -60 +60 @@
         } :data
 
+        _end = .;
+
         /DISCARD/ : {
                 *(*);

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

@@ -58 +58 @@
         } :data
 
+        _end = .;
+
         /DISCARD/ : {
                 *(*);

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

@@ -50 +50 @@
         } :data
 
+        _end = .;
+
 #ifdef CONFIG_LINE_DEBUG
         .comment 0 : { *(.comment); } :debug

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

@@ -49 +49 @@
         } :data
 
+        _end = .;
+
 #ifdef CONFIG_LINE_DEBUG
         .comment 0 : { *(.comment); } :debug

uspace/lib/c/arch/riscv64/src/entry.c

@@ -30 +30 @@
  */
 
-#include <libarch/entry.h>
 #include "../../../generic/private/libc.h"
+
+extern void __entry(void);
+
+// FIXME: Implement properly.
 
 void __entry(void)

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

@@ -54 +54 @@
         } :data
 
+        _end = .;
+
 #ifdef CONFIG_LINE_DEBUG
         .comment 0 : { *(.comment); } :debug

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) __entry,
+            (sysarg_t) size, (sysarg_t) flags, (sysarg_t) _end,
             (sysarg_t) pager_info);
 }

uspace/lib/c/generic/async.c

@@ -2677 +2677 @@
     unsigned int flags)
 {
+        // FIXME: The source has no business deciding destination address.
         return ipc_answer_3(chandle, EOK, (sysarg_t) src, (sysarg_t) flags,
-            (sysarg_t) __entry);
+            (sysarg_t) _end);
 }
 
@@ -2747 +2748 @@
 errno_t async_share_out_finalize(cap_call_handle_t chandle, void **dst)
 {
-        return ipc_answer_2(chandle, EOK, (sysarg_t) __entry, (sysarg_t) dst);
+        return ipc_answer_2(chandle, EOK, (sysarg_t) _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) __entry);
+            pages, flags, (sysarg_t) virt, (sysarg_t) _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) __entry);
+            (sysarg_t) phys, (sysarg_t) virt, (sysarg_t) _end);
 }
 

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

@@ -36 +36 @@
 #define LIBC_PRIVATE_LIBC_H_
 
-extern void __entry(void);
+extern unsigned char _end[];
 extern void __main(void *) __attribute__((noreturn));
 extern int main(int, char *[]);