diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2007-06-15 22:39:52 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@de.ibm.com> | 2007-06-15 22:39:52 +0000 |
| commit | 52f729a7241c0187f9ed31542d7e9a1ec98f63b7 (patch) | |
| tree | e657c6a68b7f22d5dcf8f4eea3de2a99d515d7ad /gdb/hppa-tdep.c | |
| parent | 0b1b3e423ad28731135cdd275522bdf3d2d17570 (diff) | |
| download | gdb-52f729a7241c0187f9ed31542d7e9a1ec98f63b7.zip gdb-52f729a7241c0187f9ed31542d7e9a1ec98f63b7.tar.gz gdb-52f729a7241c0187f9ed31542d7e9a1ec98f63b7.tar.bz2 | |
* gdbarch.sh (skip_trampoline_code): Add FRAME argument.
* gdbarch.c, gdbarch.h: Regenerate.
* arch-utils.c (generic_skip_trampoline_code): Add FRAME argument.
* arch-utils.h (generic_skip_trampoline_code): Likewise.
* infrun.c (handle_inferior_event): Pass current frame to
gdbarch_skip_trampoline_code and skip_language_trampoline.
* language.c (unk_lang_trampoline): Add FRAME argument.
(skip_language_trampoline): Add FRAME argument. Pass it to
skip_trampoline callback.
* language.h: Add forward declaration of struct frame_info.
(struct language_defn): Add FRAME argument to skip_trampoline.
(skip_language_trampoline): Add FRAME argument.
* cp-abi.c (cplus_skip_trampoline): Add FRAME argument. Pass it
to skip_trampoline callback.
* cp-abi.h: Add forward declaration of struct frame_info.
(cplus_skip_trampoline): Add FRAME argument.
(struct cp_abi_ops): Add FRAME argument to skip_trampoline callback.
* gnu-v3-abi.c (gnuv3_skip_trampoline): Add FRAME argument. Pass it
to gdbarch_skip_trampoline_code.
* objc-lang.c (objc_skip_trampoline): Add FRAME argument. Pass it
to gdbarch_skip_trampoline_code.
* minsyms.c (find_solib_trampoline_target): Add FRAME argument.
* symtab.h (find_solib_trampoline_target): Likewise.
* obsd-tdep.c (obsd_skip_solib_resolver): Pass current frame to
find_solib_trampoline_target.
* arm-tdep.c (arm_skip_stub): Add FRAME argument. Read registers
from FRAME instead of calling read_register.
* hppa-hpux-tdep.c (hppa_hpux_skip_trampoline_code): Add FRAME
argument. Read registers from FRAME instead of using read_register.
* hppa-tdep.c (hppa_skip_trampoline_code): Likewise.
* hppa-tdep.h (hppa_skip_trampoline_code): Add FRAME argument.
* i386-cygwin-tdep.c (i386_cygwin_skip_trampoline_code): Add FRAME
argument.
* m32c-tdep.c (m32c_skip_trampoline_code): Add FRAME argument.
* mips-tdep.c (mips_skip_trampoline_code): Add FRAME argument. Read
registers from FRAME instead of using read_signed_register.
* ppc-linux-tdep.c (ppc_linux_skip_trampoline_code): Add FRAME
argument.
(ppc64_standard_linkage_target): Likewise. Read registers from FRAME
instead of using read_register.
(ppc64_skip_trampoline_code): Add FRAME argument. Pass it to
ppc64_standard_linkage_target.
* rs6000-tdep.c (rs6000_skip_trampoline_code): Add FRAME argument.
Pass it to find_solib_trampoline_target. Read registers from FRAME
instead of using read_register.
* xstormy16-tdep.c (xstormy16_skip_trampoline_code): Add FRAME
argument.
Diffstat (limited to 'gdb/hppa-tdep.c')
| -rw-r--r-- | gdb/hppa-tdep.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index c46d977..1810a60 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -2941,7 +2941,7 @@ hppa_in_solib_call_trampoline (CORE_ADDR pc, char *name) systems: $$dyncall, import stubs and PLT stubs. */ CORE_ADDR -hppa_skip_trampoline_code (CORE_ADDR pc) +hppa_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) { unsigned int insn[HPPA_MAX_INSN_PATTERN_LEN]; int dp_rel; @@ -2949,7 +2949,7 @@ hppa_skip_trampoline_code (CORE_ADDR pc) /* $$dyncall handles both PLABELs and direct addresses. */ if (hppa_in_dyncall (pc)) { - pc = read_register (HPPA_R0_REGNUM + 22); + pc = get_frame_register_unsigned (frame, HPPA_R0_REGNUM + 22); /* PLABELs have bit 30 set; if it's a PLABEL, then dereference it. */ if (pc & 0x2) @@ -2965,9 +2965,9 @@ hppa_skip_trampoline_code (CORE_ADDR pc) pc = hppa_extract_21 (insn[0]) + hppa_extract_14 (insn[1]); if (dp_rel) - pc += read_register (HPPA_DP_REGNUM); + pc += get_frame_register_unsigned (frame, HPPA_DP_REGNUM); else - pc += read_register (HPPA_R0_REGNUM + 19); + pc += get_frame_register_unsigned (frame, HPPA_R0_REGNUM + 19); /* fallthrough */ } |