Patchwork [1/2] ppc64-linux-user: Properly interpret the entry function descriptor.

login
register
mail settings
Submitter Richard Henderson
Date Oct. 26, 2011, 4:59 p.m.
Message ID <1319648358-18812-2-git-send-email-rth@twiddle.net>
Download mbox | patch
Permalink /patch/121949/
State New
Headers show

Comments

Richard Henderson - Oct. 26, 2011, 4:59 p.m.
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 <rth@twiddle.net>
---
 linux-user/elfload.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Alexander Graf - Oct. 30, 2011, 4:47 p.m.
On 26.10.2011, at 18:59, Richard Henderson wrote:

> 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 <rth@twiddle.net>

Acked-by: Alexander Graf <agraf@suse.de>


Alex

Patch

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