Changeset 1564c4b in mainline for uspace/lib/c/arch/ia32

Timestamp:

2011-06-08T19:39:52Z (14 years ago)

Author:

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

Branches:

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

Children:

2af29ed

Parents:

e686889c (diff), 0eff68e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

Location:

uspace/lib/c/arch/ia32

Files:

• Makefile.common (modified) (1 diff)
• Makefile.inc (modified) (2 diffs)
• _link.ld.in (modified) (4 diffs)
• include/config.h (modified) (1 diff)
• include/ddi.h (modified) (1 diff)
• include/faddr.h (modified) (1 diff)
• include/fibril.h (modified) (2 diffs)
• include/rtld/dynamic.h (added)
• include/rtld/elf_dyn.h (added)
• src/entryjmp.s (moved) (moved from uspace/srv/loader/arch/ia32/ia32.s ) (1 diff)
• src/rtld/dynamic.c (added)
• src/rtld/reloc.c (added)
• src/stacktrace.c (modified) (1 diff)
• src/syscall.S (modified) (3 diffs)
• src/tls.c (modified) (2 diffs)

uspace/lib/c/arch/ia32/Makefile.common

@@ -28 +28 @@
 
 CLANG_ARCH = i386
-GCC_CFLAGS += -march=pentium
+GCC_CFLAGS += -march=pentium -fno-omit-frame-pointer
 
 ENDIANESS = LE

uspace/lib/c/arch/ia32/Makefile.inc

@@ -29 +29 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entryjmp.s \
         arch/$(UARCH)/src/thread_entry.s \
         arch/$(UARCH)/src/syscall.S \
@@ -35 +36 @@
         arch/$(UARCH)/src/setjmp.S \
         arch/$(UARCH)/src/stacktrace.c \
-        arch/$(UARCH)/src/stacktrace_asm.S
+        arch/$(UARCH)/src/stacktrace_asm.S \
+        arch/$(UARCH)/src/rtld/dynamic.c \
+        arch/$(UARCH)/src/rtld/reloc.c
 
 .PRECIOUS: arch/$(UARCH)/src/entry.o

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

@@ +1 @@
+#ifndef SHLIB
 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
+#endif
 
 PHDRS {
+#if defined(LOADER) || defined(DLEXE)
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
+#if defined(SHLIB) || defined(DLEXE)
+        dynamic PT_DYNAMIC;
+#endif
         debug PT_NOTE;
 }
 
 SECTIONS {
+#if defined(LOADER) || defined(DLEXE)
+        .interp : {
+                *(.interp);
+        } :interp
+#endif
+#ifdef LOADER
+        . = 0x70001000 + SIZEOF_HEADERS;
+#else
         . = 0x1000 + SIZEOF_HEADERS;
-        
+#endif
         .init : {
                 *(.init);
@@ -19 +37 @@
                 *(.rodata .rodata.*);
         } :text
+
+#if defined(SHLIB) || defined(DLEXE)
+        .rel.plt : {
+                *(.rel.plt);
+        }
+        /* 
+         *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+         * without alignment gap or DT_REL will be broken
+         */
+        .rel.dyn : {
+                *(.rel.*);
+        } :text
         
+        .plt : {
+                *(.plt);
+        } :text
+        
+        .dynsym : {
+                *(.dynsym);
+        } :text
+        
+        .dynstr : {
+                *(.dynstr);
+        } :text
+        
+        .hash : {
+                *(.hash);
+        } :text
+#endif
         . = . + 0x1000;
+        
+#if defined(SHLIB) || defined(DLEXE)
+        .dynamic : {
+                *(.dynamic);
+        } :data :dynamic
+#endif
         
         .data : {
@@ -26 +78 @@
         } :data
         
+#if defined(SHLIB) || defined(DLEXE)
+        .data.rel : {
+                *(.data.rel .data.rel.*);
+        } :data
+
+        .got : {
+                *(.got);
+        } :data
+        .got.plt : {
+                *(.got.plt);
+        } :data
+#endif
+        
+#ifndef DLEXE
         .tdata : {
                 _tdata_start = .;
@@ -37 +103 @@
         
         _tls_alignment = ALIGNOF(.tdata);
+#endif
         
         .bss : {
+                *(.dynbss);
                 *(COMMON);
                 *(.bss);

uspace/lib/c/arch/ia32/include/config.h

@@ -36 +36 @@
 #define LIBC_ia32_CONFIG_H_
 
-#define PAGE_WIDTH      12
-#define PAGE_SIZE       (1 << PAGE_WIDTH)
+#define PAGE_WIDTH  12
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
+
+#define USER_ADDRESS_SPACE_START_ARCH  UINT32_C(0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH    UINT32_C(0x7fffffff)
 
 #endif

uspace/lib/c/arch/ia32/include/ddi.h

@@ -37 +37 @@
 #include <libarch/types.h>
 
-#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
+#define IO_SPACE_BOUNDARY  ((void *) (64 * 1024))
 
 static inline uint8_t pio_read_8(ioport8_t *port)

uspace/lib/c/arch/ia32/include/faddr.h

@@ -38 +38 @@
 #include <libarch/types.h>
 
-#define FADDR(fptr)             ((uintptr_t) (fptr))
+#define FADDR(fptr)  ((uintptr_t) (fptr))
 
 #endif

uspace/lib/c/arch/ia32/include/fibril.h

@@ -42 +42 @@
  * panic sooner or later
  */
-#define SP_DELTA     (12)
+#define SP_DELTA  12
 
 #define context_set(c, _pc, stack, size, ptls) \
@@ -51 +51 @@
                 (c)->ebp = 0; \
         } while (0)
-        
-/* We include only registers that must be preserved
+
+/*
+ * We include only registers that must be preserved
  * during function call
  */

uspace/lib/c/arch/ia32/src/entryjmp.s

@@ -27 +27 @@
 #
 
-.globl program_run
+.globl entry_point_jmp
 
-## void program_run(void *entry_point, void *pcb);
+## void entry_point_jmp(void *entry_point, void *pcb);
 #
-# Jump to a program entry point
-program_run:
+# Jump to program entry point
+entry_point_jmp:
         # Use standard ia32 prologue not to confuse anybody
         push %ebp

uspace/lib/c/arch/ia32/src/stacktrace.c

@@ -35 +35 @@
  */
 
+#include <libarch/config.h>
 #include <sys/types.h>
 #include <bool.h>
-
 #include <stacktrace.h>
 
-#define FRAME_OFFSET_FP_PREV    0
-#define FRAME_OFFSET_RA         4
+#define FRAME_OFFSET_FP_PREV  0
+#define FRAME_OFFSET_RA       4
 
 bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp)
 {
         (void) st;
-        return fp != 0;
+        return (fp != 0) && (fp <= USER_ADDRESS_SPACE_END_ARCH);
 }
 

uspace/lib/c/arch/ia32/src/syscall.S

@@ -32 +32 @@
 __syscall_fast_func:
         .long __syscall_slow
+        .size __syscall_fast_func, . - __syscall_fast_func
 
 .text
@@ -71 +72 @@
  */
 .global __syscall_fast
+        .type __syscall_fast, @function
+
 __syscall_fast:
         pushl %ebx
@@ -95 +98 @@
         popl %ebx
         ret
+
+        .size __syscall_fast, . - __syscall_fast

uspace/lib/c/arch/ia32/src/tls.c

@@ -37 +37 @@
 #include <tls.h>
 #include <sys/types.h>
+#include <align.h>
 
 tcb_t * __alloc_tls(void **data, size_t size)
@@ -48 +49 @@
 }
 
+/*
+ * Rtld TLS support
+ */
+
+typedef struct {
+        unsigned long int ti_module;
+        unsigned long int ti_offset;
+} tls_index;
+
+void __attribute__ ((__regparm__ (1)))
+    *___tls_get_addr(tls_index *ti);
+
+void __attribute__ ((__regparm__ (1)))
+    *___tls_get_addr(tls_index *ti)
+{
+        size_t tls_size;
+        uint8_t *tls;
+
+        /* Calculate size of TLS block */
+        tls_size = ALIGN_UP(&_tbss_end - &_tdata_start, &_tls_alignment);
+
+        /* The TLS block is just before TCB */
+        tls = (uint8_t *)__tcb_get() - tls_size;
+
+        return tls + ti->ti_offset;
+}
+
 /** @}
  */