diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/disasm.c | 4 | ||||
| -rw-r--r-- | gdb/gdbarch.c | 6 | ||||
| -rw-r--r-- | gdb/gdbarch.h | 6 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 2 |
5 files changed, 9 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cdca84c..4eebde2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2007-06-19 Markus Deuling <deuling@de.ibm.com> + * gdbarch.sh (TARGET_PRINT_INSN): Replace by gdbarch_print_insn. + * disasm.c (dump_insns, gdb_print_insn): Likewise. + * gdbarch.c, gdbarch.h: Regenerate. + +2007-06-19 Markus Deuling <deuling@de.ibm.com> + * gdbarch.sh (BELIEVE_PCC_PROMOTION): Replace by gdbarch_believe_pcc_promotion. * stabsread.c (define_symbol): Likewise. diff --git a/gdb/disasm.c b/gdb/disasm.c index 1c050c9..168d7ee 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -135,7 +135,7 @@ dump_insns (struct ui_out *uiout, struct disassemble_info * di, xfree (name); ui_file_rewind (stb->stream); - pc += TARGET_PRINT_INSN (pc, di); + pc += gdbarch_print_insn (current_gdbarch, pc, di); ui_out_field_stream (uiout, "inst", stb); ui_file_rewind (stb->stream); do_cleanups (ui_out_chain); @@ -393,5 +393,5 @@ int gdb_print_insn (CORE_ADDR memaddr, struct ui_file *stream) { struct disassemble_info di = gdb_disassemble_info (current_gdbarch, stream); - return TARGET_PRINT_INSN (memaddr, &di); + return gdbarch_print_insn (current_gdbarch, memaddr, &di); } diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 854306b..197d52e 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -865,12 +865,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: print_float_info = <0x%lx>\n", (long) current_gdbarch->print_float_info); -#ifdef TARGET_PRINT_INSN - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "TARGET_PRINT_INSN(vma, info)", - XSTRING (TARGET_PRINT_INSN (vma, info))); -#endif fprintf_unfiltered (file, "gdbarch_dump: print_insn = <0x%lx>\n", (long) current_gdbarch->print_insn); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 9235b11..1c73da2 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -566,12 +566,6 @@ extern void set_gdbarch_single_step_through_delay (struct gdbarch *gdbarch, gdba typedef int (gdbarch_print_insn_ftype) (bfd_vma vma, struct disassemble_info *info); extern int gdbarch_print_insn (struct gdbarch *gdbarch, bfd_vma vma, struct disassemble_info *info); extern void set_gdbarch_print_insn (struct gdbarch *gdbarch, gdbarch_print_insn_ftype *print_insn); -#if !defined (GDB_TM_FILE) && defined (TARGET_PRINT_INSN) -#error "Non multi-arch definition of TARGET_PRINT_INSN" -#endif -#if !defined (TARGET_PRINT_INSN) -#define TARGET_PRINT_INSN(vma, info) (gdbarch_print_insn (current_gdbarch, vma, info)) -#endif typedef CORE_ADDR (gdbarch_skip_trampoline_code_ftype) (struct frame_info *frame, CORE_ADDR pc); extern CORE_ADDR gdbarch_skip_trampoline_code (struct gdbarch *gdbarch, struct frame_info *frame, CORE_ADDR pc); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index c81f699..1f2338c 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -589,7 +589,7 @@ F:=:int:software_single_step:struct frame_info *frame:frame M::int:single_step_through_delay:struct frame_info *frame:frame # FIXME: cagney/2003-08-28: Need to find a better way of selecting the # disassembler. Perhaps objdump can handle it? -f:TARGET_PRINT_INSN:int:print_insn:bfd_vma vma, struct disassemble_info *info:vma, info::0: +f::int:print_insn:bfd_vma vma, struct disassemble_info *info:vma, info::0: f::CORE_ADDR:skip_trampoline_code:struct frame_info *frame, CORE_ADDR pc:frame, pc::generic_skip_trampoline_code::0 |