diff options
| -rw-r--r-- | gdb/ChangeLog | 12 | ||||
| -rw-r--r-- | gdb/config/mips/tm-mips.h | 8 | ||||
| -rw-r--r-- | gdb/mips-tdep.c | 6 | ||||
| -rw-r--r-- | gdb/printcmd.c | 23 |
4 files changed, 11 insertions, 38 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9dcab9b..73958b7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2002-11-21 Andrew Cagney <cagney@redhat.com> + + * mips-tdep.c (mips_dump_tdep): Delete references to + GDB_TARGET_UNMASK_DISAS_PC and GDB_TARGET_MASK_DISAS_PC. + * config/mips/tm-mips.h (GDB_TARGET_MASK_DISAS_PC): Delete macro. + (GDB_TARGET_UNMASK_DISAS_PC): Delete macro. + * printcmd.c (build_address_symbolic): Delete calls to + GDB_TARGET_UNMASK_DISAS_PC and GDB_TARGET_MASK_DISAS_PC. + (address_info): Ditto. + Fix PR gdb/773. + 2002-11-19 Klee Dienes <kdienes@apple.com> Adam Fedor <fedor@gnu.org> @@ -63,7 +74,6 @@ * gdb/parser-defs.h: (struct objc_class_str): New structure for parsing ObjC classes. ->>>>>>> 1.3477 2002-11-18 Andrew Cagney <ac131313@redhat.com> * stack.c (frame_relative_level): Copy function from here ... diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h index ded8e10..d5a9297 100644 --- a/gdb/config/mips/tm-mips.h +++ b/gdb/config/mips/tm-mips.h @@ -39,14 +39,6 @@ struct value; #include "coff/sym.h" /* Needed for PDR below. */ #include "coff/symconst.h" -/* PC should be masked to remove possible MIPS16 flag */ -#if !defined (GDB_TARGET_MASK_DISAS_PC) -#define GDB_TARGET_MASK_DISAS_PC(addr) UNMAKE_MIPS16_ADDR(addr) -#endif -#if !defined (GDB_TARGET_UNMASK_DISAS_PC) -#define GDB_TARGET_UNMASK_DISAS_PC(addr) MAKE_MIPS16_ADDR(addr) -#endif - /* Return non-zero if PC points to an instruction which will cause a step to execute both the instruction at PC and an instruction at PC+4. */ extern int mips_step_skips_delay (CORE_ADDR); diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 73d06a4..f2c94f7 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -6215,12 +6215,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file) "mips_dump_tdep: GDB_TARGET_IS_MIPS64 = %d\n", GDB_TARGET_IS_MIPS64); fprintf_unfiltered (file, - "mips_dump_tdep: GDB_TARGET_MASK_DISAS_PC # %s\n", - XSTRING (GDB_TARGET_MASK_DISAS_PC (PC))); - fprintf_unfiltered (file, - "mips_dump_tdep: GDB_TARGET_UNMASK_DISAS_PC # %s\n", - XSTRING (GDB_TARGET_UNMASK_DISAS_PC (PC))); - fprintf_unfiltered (file, "mips_dump_tdep: GEN_REG_SAVE_MASK = %d\n", GEN_REG_SAVE_MASK); fprintf_unfiltered (file, diff --git a/gdb/printcmd.c b/gdb/printcmd.c index 43bce2f..05b5e71 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -624,15 +624,6 @@ build_address_symbolic (CORE_ADDR addr, /* IN */ } } - /* On some targets, add in extra "flag" bits to PC for - disassembly. This should ensure that "rounding errors" in - symbol addresses that are masked for disassembly favour the - the correct symbol. */ - -#ifdef GDB_TARGET_UNMASK_DISAS_PC - addr = GDB_TARGET_UNMASK_DISAS_PC (addr); -#endif - /* First try to find the address in the symbol table, then in the minsyms. Take the closest one. */ @@ -672,14 +663,6 @@ build_address_symbolic (CORE_ADDR addr, /* IN */ if (symbol == NULL && msymbol == NULL) return 1; - /* On some targets, mask out extra "flag" bits from PC for handsome - disassembly. */ - -#ifdef GDB_TARGET_MASK_DISAS_PC - name_location = GDB_TARGET_MASK_DISAS_PC (name_location); - addr = GDB_TARGET_MASK_DISAS_PC (addr); -#endif - /* If the nearest symbol is too far away, don't print anything symbolic. */ /* For when CORE_ADDR is larger than unsigned int, we do math in @@ -1236,14 +1219,8 @@ address_info (char *exp, int from_tty) case LOC_BLOCK: printf_filtered ("a function at address "); -#ifdef GDB_TARGET_MASK_DISAS_PC - print_address_numeric - (load_addr = GDB_TARGET_MASK_DISAS_PC (BLOCK_START (SYMBOL_BLOCK_VALUE (sym))), - 1, gdb_stdout); -#else print_address_numeric (load_addr = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)), 1, gdb_stdout); -#endif if (section_is_overlay (section)) { load_addr = overlay_unmapped_address (load_addr, section); |