From 0bb57b3183d1564e0166c7a235ad182fe360c378 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 31 Oct 2004 00:07:29 +0000 Subject: [PATCH] 2004-10-30 Andrew Cagney Suggested by Mark Kettenis. * config/mips/tm-mips.h (struct mips_extra_func_info): Delete fields frame_adjust and high_addr. * mips-mdebug-tdep.c (PROC_HIGH_ADDR, PROC_FRAME_ADJUST): Delete. (non_heuristic_proc_desc): Delete references. --- gdb/ChangeLog | 6 ++++++ gdb/config/mips/tm-mips.h | 2 -- gdb/mips-mdebug-tdep.c | 8 +------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2d55764ea3..25bfdd64c1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2004-10-30 Andrew Cagney + Suggested by Mark Kettenis. + * config/mips/tm-mips.h (struct mips_extra_func_info): Delete + fields frame_adjust and high_addr. + * mips-mdebug-tdep.c (PROC_HIGH_ADDR, PROC_FRAME_ADJUST): Delete. + (non_heuristic_proc_desc): Delete references. + * mips-tdep.h (MIPS_PRID_REGNUM): Add. * config/mips/tm-mips.h (PRID_REGNUM): Delete. * mips-tdep.c: Update. diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h index 8f840c3ad7..40f2fd1d27 100644 --- a/gdb/config/mips/tm-mips.h +++ b/gdb/config/mips/tm-mips.h @@ -58,8 +58,6 @@ extern void ecoff_relocate_efi (struct symbol *, CORE_ADDR); typedef struct mips_extra_func_info { long numargs; /* number of args to procedure (was iopt) */ - bfd_vma high_addr; /* upper address bound */ - long frame_adjust; /* offset of FP from SP (used on MIPS16) */ PDR pdr; /* Procedure descriptor record */ } *mips_extra_func_info_t; diff --git a/gdb/mips-mdebug-tdep.c b/gdb/mips-mdebug-tdep.c index efb105d7df..b7d9545074 100644 --- a/gdb/mips-mdebug-tdep.c +++ b/gdb/mips-mdebug-tdep.c @@ -37,10 +37,8 @@ #include "mips-mdebug-tdep.h" #define PROC_LOW_ADDR(proc) ((proc)->pdr.adr) /* least address */ -#define PROC_HIGH_ADDR(proc) ((proc)->high_addr) /* upper address bound */ #define PROC_FRAME_OFFSET(proc) ((proc)->pdr.frameoffset) #define PROC_FRAME_REG(proc) ((proc)->pdr.framereg) -#define PROC_FRAME_ADJUST(proc) ((proc)->frame_adjust) #define PROC_REG_MASK(proc) ((proc)->pdr.regmask) #define PROC_FREG_MASK(proc) ((proc)->pdr.fregmask) #define PROC_REG_OFFSET(proc) ((proc)->pdr.regoffset) @@ -215,14 +213,10 @@ non_heuristic_proc_desc (CORE_ADDR pc, CORE_ADDR *addrptr) sizeof (struct mips_extra_func_info)); PROC_LOW_ADDR (proc_desc) = pdr_pc; - /* Only used for dummy frames. */ - PROC_HIGH_ADDR (proc_desc) = 0; - PROC_FRAME_OFFSET (proc_desc) = bfd_get_32 (sec->objfile->obfd, ptr + 20); PROC_FRAME_REG (proc_desc) = bfd_get_32 (sec->objfile->obfd, ptr + 24); - PROC_FRAME_ADJUST (proc_desc) = 0; PROC_REG_MASK (proc_desc) = bfd_get_32 (sec->objfile->obfd, ptr + 4); PROC_FREG_MASK (proc_desc) = bfd_get_32 (sec->objfile->obfd, @@ -301,7 +295,7 @@ mips_mdebug_frame_cache (struct frame_info *next_frame, void **this_cache) /* Extract the frame's base. */ cache->base = (frame_unwind_register_signed (next_frame, NUM_REGS + PROC_FRAME_REG (proc_desc)) - + PROC_FRAME_OFFSET (proc_desc) - PROC_FRAME_ADJUST (proc_desc)); + + PROC_FRAME_OFFSET (proc_desc)); kernel_trap = PROC_REG_MASK (proc_desc) & 1; gen_mask = kernel_trap ? 0xFFFFFFFF : PROC_REG_MASK (proc_desc);