diff options
| author | Mark Kettenis <kettenis@gnu.org> | 2004-08-22 16:27:30 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@gnu.org> | 2004-08-22 16:27:30 +0000 |
| commit | 387c058c8766cd9ad3ca88213afca5951b2d16bf (patch) | |
| tree | 57361b6a7b026b8817da694755e4140e112354c6 /gdb | |
| parent | 277215a6d4e2b60375c21bb790c1c8b914cd3c86 (diff) | |
| download | gdb-387c058c8766cd9ad3ca88213afca5951b2d16bf.zip gdb-387c058c8766cd9ad3ca88213afca5951b2d16bf.tar.gz gdb-387c058c8766cd9ad3ca88213afca5951b2d16bf.tar.bz2 | |
* 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
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/amd64-linux-tdep.c | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bd49ec0..7f2cf88 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2004-08-22 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 + * gdb_ptrace.h: GNU/Linux. * config/alpha/nm-linux.h (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c index d8d77a4..2bca2e0 100644 --- a/gdb/amd64-linux-tdep.c +++ b/gdb/amd64-linux-tdep.c @@ -86,8 +86,9 @@ static const unsigned char linux_sigtramp_code[] = 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_info *next_frame) __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); } |