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

Timestamp:

2011-06-08T19:39:52Z (15 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/abs32le

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (modified) (1 diff)
• include/ddi.h (modified) (1 diff)
• src/entryjmp.c (moved) (moved from uspace/srv/loader/arch/abs32le/abs32le.c ) (1 diff)

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

@@ -29 +29 @@
 ARCH_SOURCES = \
         arch/$(UARCH)/src/entry.c \
+        arch/$(UARCH)/src/entryjmp.c \
         arch/$(UARCH)/src/thread_entry.c \
         arch/$(UARCH)/src/fibril.c \

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

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
 }
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x70001000 + SIZEOF_HEADERS;
+#else
         . = 0x1000 + SIZEOF_HEADERS;
-        
+#endif
         .text : {
                 *(.text .text.*);

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

@@ -33 +33 @@
 #define LIBC_abs32le_DDI_H_
 
+#include <sys/types.h>
+#include <libarch/types.h>
+
 static inline void pio_write_8(ioport8_t *port, uint8_t v)
 {

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

@@ -31 +31 @@
 
 #include <bool.h>
-#include "arch.h"
+#include <entry_point.h>
 
-void program_run(void *entry_point, void *pcb)
+/** Jump to program entry point. */
+void entry_point_jmp(void *entry_point, void *pcb)
 {
         while (true);