diff options
| author | Jean Pihet <[email protected]> | 2014-03-28 15:13:10 +0100 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2014-03-30 13:07:55 +0200 |
| commit | 077082fdefc2057fb9dc455e63c37c432a28b045 (patch) | |
| tree | e82e447877c731cdf0698ec4727350ee929a4507 /backends | |
| parent | 87955c4cb75e85871259325fd5decc2d51d9a57c (diff) | |
backends: add ARM compatible mode to AARCH64
Add the initial register setup for AARCH64 running ARM code (so
called compat mode). This makes 'eu-stack -p' happy on ARM binaries
while running on a AARCH64 kernel.
Signed-off-by: Jean Pihet <[email protected]>
Signed-off-by: Mark Wielaard <[email protected]>
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/ChangeLog | 5 | ||||
| -rw-r--r-- | backends/arm_initreg.c | 34 |
2 files changed, 37 insertions, 2 deletions
diff --git a/backends/ChangeLog b/backends/ChangeLog index 958b34cb..38a433d8 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,8 @@ +2014-03-28 Jean Pihet <[email protected]> + + * arm_initreg.c (arm_set_initial_registers_tid): Handle compat mode. + ARM compatible code running on AARCH64. + 2014-03-19 Mark Wielaard <[email protected]> * aarch64_reloc.def: AARCH64_ABS32 and AARCH64_ABS64 are also valid diff --git a/backends/arm_initreg.c b/backends/arm_initreg.c index c03146eb..5837383a 100644 --- a/backends/arm_initreg.c +++ b/backends/arm_initreg.c @@ -36,6 +36,12 @@ # include <sys/ptrace.h> #endif +#ifdef __aarch64__ +# include <linux/uio.h> +# include <sys/user.h> +# include <sys/ptrace.h> +#endif + #define BACKEND arm_ #include "libebl_CPU.h" @@ -44,15 +50,39 @@ arm_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), ebl_tid_registers_t *setfunc __attribute__ ((unused)), void *arg __attribute__ ((unused))) { -#if ! defined __arm__ +#if !defined __arm__ && !defined __aarch64__ return false; -#else +#else /* __arm__ || __aarch64__ */ +#if defined __arm__ struct user_regs user_regs; if (ptrace (PTRACE_GETREGS, tid, NULL, &user_regs) != 0) return false; + Dwarf_Word dwarf_regs[16]; + /* R0..R12 SP LR PC */ for (int i = 0; i < 16; i++) dwarf_regs[i] = user_regs.uregs[i]; + return setfunc (0, 16, dwarf_regs, arg); +#elif defined __aarch64__ + /* Compat mode: arm compatible code running on aarch64 */ + int i; + struct user_pt_regs gregs; + struct iovec iovec; + iovec.iov_base = &gregs; + iovec.iov_len = sizeof (gregs); + if (ptrace (PTRACE_GETREGSET, tid, NT_PRSTATUS, &iovec) != 0) + return false; + + Dwarf_Word dwarf_regs[16]; + /* R0..R12 SP LR PC, encoded as 32 bit quantities */ + uint32_t *u32_ptr = (uint32_t *) &gregs.regs[0]; + for (i = 0; i < 16; i++) + dwarf_regs[i] = u32_ptr[i]; + + return setfunc (0, 16, dwarf_regs, arg); +#else +# error "source file error, it cannot happen" +#endif #endif } |