diff options
| author | Mark Kettenis <kettenis@gnu.org> | 2004-08-06 20:54:16 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@gnu.org> | 2004-08-06 20:54:16 +0000 |
| commit | 5bed01d167addbd9bde76400834cdd2d03169037 (patch) | |
| tree | 8c6baaf359fcb3a0d3c5d362dfe66d81c6439fe3 /gdb/i386nbsd-tdep.c | |
| parent | be1bb6efc350d5e79e2ecdaa6c1c85ee168c3eec (diff) | |
| download | gdb-5bed01d167addbd9bde76400834cdd2d03169037.tar.gz | |
* 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.
(i386nbsd_sigtramp_p): Adjust for changed signature of
i386nbsd_sigtramp_offset.
Diffstat (limited to 'gdb/i386nbsd-tdep.c')
| -rw-r--r-- | gdb/i386nbsd-tdep.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c index 212127355cf..da7d8c62622 100644 --- a/gdb/i386nbsd-tdep.c +++ b/gdb/i386nbsd-tdep.c @@ -132,13 +132,14 @@ static const unsigned char sigtramp_retcode[] = }; static LONGEST -i386nbsd_sigtramp_offset (CORE_ADDR pc) +i386nbsd_sigtramp_offset (struct frame_info *next_frame) { + CORE_ADDR pc = frame_pc_unwind (next_frame); unsigned char ret[sizeof(sigtramp_retcode)], insn; LONGEST off; int i; - if (deprecated_read_memory_nobpt (pc, &insn, 1) != 0) + if (!safe_frame_unwind_memory (next_frame, pc, &insn, 1)) return -1; switch (insn) @@ -150,7 +151,7 @@ i386nbsd_sigtramp_offset (CORE_ADDR pc) case RETCODE_INSN2: /* INSN2 and INSN3 are the same. Read at the location of PC+1 to determine if we're actually looking at INSN2 or INSN3. */ - if (deprecated_read_memory_nobpt (pc + 1, &insn, 1) != 0) + if (!safe_frame_unwind_memory (next_frame, pc + 1, &insn, 1)) return -1; if (insn == RETCODE_INSN3) @@ -173,7 +174,7 @@ i386nbsd_sigtramp_offset (CORE_ADDR pc) pc -= off; - if (deprecated_read_memory_nobpt (pc, (char *) ret, sizeof (ret)) != 0) + if (!safe_frame_unwind_memory (next_frame, pc, ret, sizeof (ret))) return -1; if (memcmp (ret, sigtramp_retcode, sizeof (ret)) == 0) @@ -193,7 +194,7 @@ i386nbsd_sigtramp_p (struct frame_info *next_frame) find_pc_partial_function (pc, &name, NULL, NULL); return (nbsd_pc_in_sigtramp (pc, name) - || i386nbsd_sigtramp_offset (pc) >= 0); + || i386nbsd_sigtramp_offset (next_frame) >= 0); } /* From <machine/signal.h>. */ |