diff options
| author | Andrew Cagney <cagney@redhat.com> | 2004-04-02 19:44:25 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2004-04-02 19:44:25 +0000 |
| commit | 304396fba9a40662a849f6a116351f3b508bcd68 (patch) | |
| tree | e1e5608a9481a811d6ea51c5c2937b718cff7aca /gdb/tramp-frame.c | |
| parent | c5edf76a75a0f388a49b16f3e04bc1730e3fb709 (diff) | |
| download | gdb-304396fba9a40662a849f6a116351f3b508bcd68.zip gdb-304396fba9a40662a849f6a116351f3b508bcd68.tar.gz gdb-304396fba9a40662a849f6a116351f3b508bcd68.tar.bz2 | |
2004-04-02 Andrew Cagney <cagney@redhat.com>
* frame.c (safe_frame_unwind_memory): New function.
* frame.h (safe_frame_unwind_memory): Declare. Update description
of /safe_/ methods.
* tramp-frame.c (tramp_frame_start): Re-order parmeters, add
"next_frame". Use safe_frame_unwind_memory.
(tramp_frame_sniffer): Update call to tramp_frame_start.
Diffstat (limited to 'gdb/tramp-frame.c')
| -rw-r--r-- | gdb/tramp-frame.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gdb/tramp-frame.c b/gdb/tramp-frame.c index ee3635f..528603c 100644 --- a/gdb/tramp-frame.c +++ b/gdb/tramp-frame.c @@ -85,7 +85,8 @@ tramp_frame_prev_register (struct frame_info *next_frame, } static CORE_ADDR -tramp_frame_start (CORE_ADDR pc, const struct tramp_frame *tramp) +tramp_frame_start (const struct tramp_frame *tramp, + struct frame_info *next_frame, CORE_ADDR pc) { int ti; /* Search through the trampoline for one that matches the @@ -100,8 +101,9 @@ tramp_frame_start (CORE_ADDR pc, const struct tramp_frame *tramp) ULONGEST insn; if (tramp->insn[i] == TRAMP_SENTINEL_INSN) return func; - if (target_read_memory (func + i * tramp->insn_size, buf, - tramp->insn_size) != 0) + if (!safe_frame_unwind_memory (next_frame, + func + i * tramp->insn_size, + buf, tramp->insn_size)) break; insn = extract_unsigned_integer (buf, tramp->insn_size); if (tramp->insn[i] != insn) @@ -133,7 +135,7 @@ tramp_frame_sniffer (const struct frame_unwind *self, if (find_pc_section (pc) != NULL) return 0; /* Finally, check that the trampoline matches at PC. */ - func = tramp_frame_start (pc, tramp); + func = tramp_frame_start (tramp, next_frame, pc); if (func == 0) return 0; tramp_cache = FRAME_OBSTACK_ZALLOC (struct tramp_frame_cache); |