diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2009-12-19 00:40:15 +0000 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@linux-mips.org> | 2009-12-19 00:40:15 +0000 |
| commit | f19732033aae407a0a93a6a8be70aa1cdb05a322 (patch) | |
| tree | 64df1119ff27d02a334b2092d66f2131a08fde91 | |
| parent | 00f515dab69c7c12fc558402a9a701e28a787523 (diff) | |
| download | gdb-f19732033aae407a0a93a6a8be70aa1cdb05a322.zip gdb-f19732033aae407a0a93a6a8be70aa1cdb05a322.tar.gz gdb-f19732033aae407a0a93a6a8be70aa1cdb05a322.tar.bz2 | |
* arm-linux-tdep.c (ARM_OABI_SYSCALL_RESTART_SYSCALL): New macro.
(ARM_LDR_PC_SP_12): Likewise.
(arm_linux_restart_syscall_init): New function.
(arm_linux_restart_syscall_tramp_frame): New variable.
(arm_linux_init_abi): Install the
arm_linux_restart_syscall_tramp_frame unwinder.
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/arm-linux-tdep.c | 33 |
2 files changed, 42 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 16d3f66..9868c7a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2009-12-19 Maciej W. Rozycki <macro@codesourcery.com> + + * arm-linux-tdep.c (ARM_OABI_SYSCALL_RESTART_SYSCALL): New macro. + (ARM_LDR_PC_SP_12): Likewise. + (arm_linux_restart_syscall_init): New function. + (arm_linux_restart_syscall_tramp_frame): New variable. + (arm_linux_init_abi): Install the + arm_linux_restart_syscall_tramp_frame unwinder. + 2009-12-18 Doug Evans <dje@google.com> * gdb_proc_service.h (psaddr_t): Fix type. diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index 7bd74a0..6d3eb26 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -216,6 +216,11 @@ static const char arm_linux_thumb_le_breakpoint[] = {0x01, 0xde}; #define ARM_SET_R7_RT_SIGRETURN 0xe3a070ad #define ARM_EABI_SYSCALL 0xef000000 +/* OABI syscall restart trampoline, used for EABI executables too + whenever OABI support has been enabled in the kernel. */ +#define ARM_OABI_SYSCALL_RESTART_SYSCALL 0xef900000 +#define ARM_LDR_PC_SP_12 0xe49df00c + static void arm_linux_sigtramp_cache (struct frame_info *this_frame, struct trad_frame_cache *this_cache, @@ -325,6 +330,21 @@ arm_linux_rt_sigreturn_init (const struct tramp_frame *self, + ARM_SIGCONTEXT_R0); } +static void +arm_linux_restart_syscall_init (const struct tramp_frame *self, + struct frame_info *this_frame, + struct trad_frame_cache *this_cache, + CORE_ADDR func) +{ + CORE_ADDR sp = get_frame_register_unsigned (this_frame, ARM_SP_REGNUM); + + trad_frame_set_reg_addr (this_cache, ARM_PC_REGNUM, sp); + trad_frame_set_reg_value (this_cache, ARM_SP_REGNUM, sp + 12); + + /* Save a frame ID. */ + trad_frame_set_id (this_cache, frame_id_build (sp, func)); +} + static struct tramp_frame arm_linux_sigreturn_tramp_frame = { SIGTRAMP_FRAME, 4, @@ -367,6 +387,17 @@ static struct tramp_frame arm_eabi_linux_rt_sigreturn_tramp_frame = { arm_linux_rt_sigreturn_init }; +static struct tramp_frame arm_linux_restart_syscall_tramp_frame = { + NORMAL_FRAME, + 4, + { + { ARM_OABI_SYSCALL_RESTART_SYSCALL, -1 }, + { ARM_LDR_PC_SP_12, -1 }, + { TRAMP_SENTINEL_INSN } + }, + arm_linux_restart_syscall_init +}; + /* Core file and register set support. */ #define ARM_LINUX_SIZEOF_GREGSET (18 * INT_REGISTER_SIZE) @@ -860,6 +891,8 @@ arm_linux_init_abi (struct gdbarch_info info, &arm_eabi_linux_sigreturn_tramp_frame); tramp_frame_prepend_unwinder (gdbarch, &arm_eabi_linux_rt_sigreturn_tramp_frame); + tramp_frame_prepend_unwinder (gdbarch, + &arm_linux_restart_syscall_tramp_frame); /* Core file support. */ set_gdbarch_regset_from_core_section (gdbarch, |