Changeset 90478727 in mainline for uspace/lib/c/arch/amd64

Timestamp:

2012-08-12T11:46:44Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

41b764b7

Parents:

e1e4192 (diff), 371cb6c (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 changes

Location:

uspace/lib/c/arch/amd64

Files:

• _link.ld.in (modified) (1 diff)
• include/elf_linux.h (modified) (2 diffs)

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

@@ -15 +15 @@
 SECTIONS {
 #ifdef LOADER
+        . = 0x70001000 + SIZEOF_HEADERS;
+        
         .interp : {
                 *(.interp);
-        } :interp
-        
-        . = 0x70001000 + SIZEOF_HEADERS;
+        } :interp :text
 #else
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
+        
+        /* Make sure the code is aligned reasonably */
+        . = ALIGN(., 16);
+        
         .init : {
                 *(.init);

uspace/lib/c/arch/amd64/include/elf_linux.h

@@ -66 +66 @@
         uint64_t rsp;
         uint64_t ss;
+
+        /*
+         * The following registers need to be part of elf_regs_t.
+         * Unfortunately, we don't have any information about them in our
+         * istate_t.
+         */
+        uint64_t unused_fs_base;
+        uint64_t unused_gs_base;
+        uint64_t unused_ds;
+        uint64_t unused_es;
+        uint64_t unused_fs;
+        uint64_t unused_gs;
 } elf_regs_t;
 
@@ -91 +103 @@
         elf_regs->rsp = istate->rsp;
         elf_regs->ss = istate->ss;
+
+        /*
+         * Reset the registers for which there is not enough info in istate_t.
+         */
+        elf_regs->unused_fs_base = 0;
+        elf_regs->unused_gs_base = 0;
+        elf_regs->unused_ds = 0;
+        elf_regs->unused_es = 0;
+        elf_regs->unused_fs = 0;
+        elf_regs->unused_gs = 0;
 }