This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[PATCH] Some undeprecation for amd64-linux-tdep.c
- From: Mark Kettenis <kettenis at chello dot nl>
- To: gdb-patches at sources dot redhat dot com
- Date: Sun, 22 Aug 2004 18:27:37 +0200 (CEST)
- Subject: [PATCH] Some undeprecation for amd64-linux-tdep.c
Committed,
Mark
Index: ChangeLog
from Mark Kettenis <kettenis@gnu.org>
* amd64-linux-tdep.c (amd64_linux_sigtramp_start): Change argument
from CORE_ADDR to struct frame_info *. Use
safe_frame_unwind_memory instead of deprecated_read_memory_nobpt.
(amd64_linux_sigtramp_p): Adjust for changed signature of
and64_linux_sigtramp_start
Index: amd64-linux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/amd64-linux-tdep.c,v
retrieving revision 1.6
diff -u -p -r1.6 amd64-linux-tdep.c
--- amd64-linux-tdep.c 20 Jul 2004 19:45:04 -0000 1.6
+++ amd64-linux-tdep.c 22 Aug 2004 16:26:27 -0000
@@ -86,8 +86,9 @@ static const unsigned char linux_sigtram
the routine. Otherwise, return 0. */
static CORE_ADDR
-amd64_linux_sigtramp_start (CORE_ADDR pc)
+amd64_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
@@ -97,7 +98,7 @@ amd64_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)
@@ -107,7 +108,7 @@ amd64_linux_sigtramp_start (CORE_ADDR pc
pc -= LINUX_SIGTRAMP_OFFSET1;
- 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;
}
@@ -135,7 +136,7 @@ amd64_linux_sigtramp_p (struct frame_inf
__sigaction, or __libc_sigaction (all aliases to the same
function). */
if (name == NULL || strstr (name, "sigaction") != NULL)
- return (amd64_linux_sigtramp_start (pc) != 0);
+ return (amd64_linux_sigtramp_start (next_frame) != 0);
return (strcmp ("__restore_rt", name) == 0);
}