Changeset 72cf064 in mainline for uspace/lib/c/arch/amd64/include/elf_linux.h

Timestamp:

2012-08-13T17:17:04Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (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

File:

• uspace/lib/c/arch/amd64/include/elf_linux.h (modified) (2 diffs)

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;
 }