[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/10] ppc64-linux-user: Properly interpret the entr
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PATCH 09/10] ppc64-linux-user: Properly interpret the entry function descriptor. |
Date: |
Thu, 27 Oct 2011 15:02:55 +0300 |
From: Richard Henderson <address@hidden>
Don't confuse the load address with the load bias. They're equal
for ET_DYN objects (i.e. ld.so) but different for ET_EXEC objects
(i.e. statically linked).
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/elfload.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 8677bba..a413976 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -618,8 +618,8 @@ static inline void init_thread(struct target_pt_regs
*_regs, struct image_info *
{
_regs->gpr[1] = infop->start_stack;
#if defined(TARGET_PPC64) && !defined(TARGET_ABI32)
- _regs->gpr[2] = ldq_raw(infop->entry + 8) + infop->load_addr;
- infop->entry = ldq_raw(infop->entry) + infop->load_addr;
+ _regs->gpr[2] = ldq_raw(infop->entry + 8) + infop->load_bias;
+ infop->entry = ldq_raw(infop->entry) + infop->load_bias;
#endif
_regs->nip = infop->entry;
}
@@ -1884,11 +1884,11 @@ int load_elf_binary(struct linux_binprm * bprm, struct
target_pt_regs * regs,
info->start_stack = bprm->p;
/* If we have an interpreter, set that as the program's entry point.
- Copy the load_addr as well, to help PPC64 interpret the entry
+ Copy the load_bias as well, to help PPC64 interpret the entry
point as a function descriptor. Do this after creating elf tables
so that we copy the original program entry point into the AUXV. */
if (elf_interpreter) {
- info->load_addr = interp_info.load_addr;
+ info->load_bias = interp_info.load_bias;
info->entry = interp_info.entry;
free(elf_interpreter);
}
--
1.7.5.4
- [Qemu-devel] [PATCH 00/10] Linux-user patches for 1.0, riku . voipio, 2011/10/27
- [Qemu-devel] [PATCH 10/10] ppc64-linux-user: Fix syscall return type., riku . voipio, 2011/10/27
- [Qemu-devel] [PATCH 07/10] sparc-linux-user: Fixup sending SIGSEGV, riku . voipio, 2011/10/27
- [Qemu-devel] [PATCH 04/10] linux-user: fix openat, riku . voipio, 2011/10/27
- [Qemu-devel] [PATCH 02/10] linux-user: fix rlimit syscalls on sparc(64), riku . voipio, 2011/10/27
- [Qemu-devel] [PATCH 08/10] sparc-linux-user: Add some missing syscall numbers, riku . voipio, 2011/10/27
- [Qemu-devel] [PATCH 09/10] ppc64-linux-user: Properly interpret the entry function descriptor.,
riku . voipio <=
- [Qemu-devel] [PATCH 05/10] linux-user: implement reboot syscall, riku . voipio, 2011/10/27
- [Qemu-devel] [PATCH 01/10] linux-user: fix TARGET_RLIM_INFINITY declaration, riku . voipio, 2011/10/27
- [Qemu-devel] [PATCH 03/10] linux-user: fix abi_(u)long, target_ulong mismatch, riku . voipio, 2011/10/27
- [Qemu-devel] [PATCH 06/10] sparc-linux-user: Handle SIGILL., riku . voipio, 2011/10/27