From d9f393b8cf3d6f32ff32a18336ce12950d65dbd6 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Fri, 6 Aug 2004 20:58:28 +0000 Subject: [PATCH] * i386-linux-tdep.c (i386_linux_sigtramp_start) (i386_linux_rt_sigtramp_start): Change argument from CORE_ADDR to struct frame_info *. Use safe_frame_unwind_memory instead of deprecated_read_memory_nobpt. (i386_linux_sigtramp_p, i386_linux_sigcontext_addr): Adjust for changed signature of i386_linux_sigtramp_start and i386_linux_rt_sigtramp_start. --- gdb/ChangeLog | 8 ++++++++ gdb/i386-linux-tdep.c | 31 +++++++++++++++++-------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 30d060ad5c..2cd4a13e29 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2004-08-05 Mark Kettenis + * i386-linux-tdep.c (i386_linux_sigtramp_start) + (i386_linux_rt_sigtramp_start): Change argument from CORE_ADDR to + struct frame_info *. Use safe_frame_unwind_memory instead of + deprecated_read_memory_nobpt. + (i386_linux_sigtramp_p, i386_linux_sigcontext_addr): Adjust for + changed signature of i386_linux_sigtramp_start and + i386_linux_rt_sigtramp_start. + * i386nbsd-tdep.c (i386nbsd_sigtramp_offset): Change argument from CORE_ADDR to struct frame_info *. Use safe_frame_unwind_memory instead of deprecated_read_memory_nobpt. diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index 2733b5f4df..f42f6b7bdd 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -115,12 +115,13 @@ static const unsigned char linux_sigtramp_code[] = #define LINUX_SIGTRAMP_LEN (sizeof linux_sigtramp_code) -/* If PC is in a sigtramp routine, return the address of the start of - the routine. Otherwise, return 0. */ +/* If NEXT_FRAME unwinds into a sigtramp routine, return the address + of the start of the routine. Otherwise, return 0. */ static CORE_ADDR -i386_linux_sigtramp_start (CORE_ADDR pc) +i386_linux_sigtramp_start (struct frame_info *next_frame) { + CORE_ADDR pc = frame_pc_unwind (next_frame); unsigned char buf[LINUX_SIGTRAMP_LEN]; /* We only recognize a signal trampoline if PC is at the start of @@ -130,7 +131,7 @@ i386_linux_sigtramp_start (CORE_ADDR pc) PC is not at the start of the instruction sequence, there will be a few trailing readable bytes on the stack. */ - if (deprecated_read_memory_nobpt (pc, (char *) buf, LINUX_SIGTRAMP_LEN) != 0) + if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_SIGTRAMP_LEN)) return 0; if (buf[0] != LINUX_SIGTRAMP_INSN0) @@ -151,7 +152,7 @@ i386_linux_sigtramp_start (CORE_ADDR pc) pc -= adjust; - if (deprecated_read_memory_nobpt (pc, (char *) buf, LINUX_SIGTRAMP_LEN) != 0) + if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_SIGTRAMP_LEN)) return 0; } @@ -182,12 +183,13 @@ static const unsigned char linux_rt_sigtramp_code[] = #define LINUX_RT_SIGTRAMP_LEN (sizeof linux_rt_sigtramp_code) -/* If PC is in a RT sigtramp routine, return the address of the start - of the routine. Otherwise, return 0. */ +/* If NEXT_FRAME unwinds into an RT sigtramp routine, return the + address of the start of the routine. Otherwise, return 0. */ static CORE_ADDR -i386_linux_rt_sigtramp_start (CORE_ADDR pc) +i386_linux_rt_sigtramp_start (struct frame_info *next_frame) { + CORE_ADDR pc = frame_pc_unwind (next_frame); unsigned char buf[LINUX_RT_SIGTRAMP_LEN]; /* We only recognize a signal trampoline if PC is at the start of @@ -197,7 +199,7 @@ i386_linux_rt_sigtramp_start (CORE_ADDR pc) PC is not at the start of the instruction sequence, there will be a few trailing readable bytes on the stack. */ - if (deprecated_read_memory_nobpt (pc, (char *) buf, LINUX_RT_SIGTRAMP_LEN) != 0) + if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_RT_SIGTRAMP_LEN)) return 0; if (buf[0] != LINUX_RT_SIGTRAMP_INSN0) @@ -207,7 +209,8 @@ i386_linux_rt_sigtramp_start (CORE_ADDR pc) pc -= LINUX_RT_SIGTRAMP_OFFSET1; - if (deprecated_read_memory_nobpt (pc, (char *) buf, LINUX_RT_SIGTRAMP_LEN) != 0) + if (!safe_frame_unwind_memory (next_frame, pc, buf, + LINUX_RT_SIGTRAMP_LEN)) return 0; } @@ -234,8 +237,8 @@ i386_linux_sigtramp_p (struct frame_info *next_frame) be part of the preceding function. This should always be sigaction, __sigaction, or __libc_sigaction (all aliases to the same function). */ if (name == NULL || strstr (name, "sigaction") != NULL) - return (i386_linux_sigtramp_start (pc) != 0 - || i386_linux_rt_sigtramp_start (pc) != 0); + return (i386_linux_sigtramp_start (next_frame) != 0 + || i386_linux_rt_sigtramp_start (next_frame) != 0); return (strcmp ("__restore", name) == 0 || strcmp ("__restore_rt", name) == 0); @@ -257,7 +260,7 @@ i386_linux_sigcontext_addr (struct frame_info *next_frame) frame_unwind_register (next_frame, I386_ESP_REGNUM, buf); sp = extract_unsigned_integer (buf, 4); - pc = i386_linux_sigtramp_start (frame_pc_unwind (next_frame)); + pc = i386_linux_sigtramp_start (next_frame); if (pc) { /* The sigcontext structure lives on the stack, right after @@ -271,7 +274,7 @@ i386_linux_sigcontext_addr (struct frame_info *next_frame) return sp; } - pc = i386_linux_rt_sigtramp_start (frame_pc_unwind (next_frame)); + pc = i386_linux_rt_sigtramp_start (next_frame); if (pc) { CORE_ADDR ucontext_addr; -- 2.11.0