From d3f73121dbd11ef96be3d2fa93bacfe492b88658 Mon Sep 17 00:00:00 2001 From: Markus Deuling Date: Thu, 6 Dec 2007 16:33:00 +0000 Subject: * gdbarch.sh (stab_reg_to_regnum, dwarf_reg_to_regnum) ( dwarf2_reg_to_regnum, sdb_reg_to_regnum, ecoff_reg_to_regnum): Add gdbarch as parameter. * gdbarch.{c,h}: Regenerate. * xtensa-tdep.c (xtensa_reg_to_regnum): Add gdbarch as parameter. Replace current_gdbarch by gdbarch. * s390-tdep.c (s390_dwarf_reg_to_regnum): Likewise. * rs6000-tdep.c (rs6000_stab_reg_to_regnum) (rs6000_dwarf2_reg_to_regnum): Likewise. * mips-tdep.c (mips_stab_reg_to_regnum) (mips_dwarf_dwarf2_ecoff_reg_to_regnum): Likewise. * mep-tdep.c (mep_debug_reg_to_regnum): Likewise. * m32c-tdep.c (m32c_debug_info_reg_to_regnum): Likewise. * i386-tdep.c (i386_dbx_reg_to_regnum) (i386_svr4_reg_to_regnum): Likewise * h8300-tdep.c (h8300s_dbg_reg_to_regnum) (h8300_dbg_reg_to_regnum): Likewise. * amd64-tdep.c (amd64_dwarf_reg_to_regnum): Likewise. * arch-utils.c (no_op_reg_to_regnum): Likewise. * arch-utils.h (no_op_reg_to_regnum): Likewise. * arm-tdep.c (arm_dwarf_reg_to_regnum): Likewise. * cris-tdep.c (cris_dwarf2_reg_to_regnum): Likewise. * hppa-tdep.c (hppa64_dwarf_reg_to_regnum): Likewise. * ia64-tdep.c (ia64_dwarf_reg_to_regnum): Likewise. * m68k-tdep.c (m68k_dwarf_reg_to_regnum): Likewise. --- gdb/mips-tdep.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'gdb/mips-tdep.c') diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 8be42fe..d1f360d 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -5040,23 +5040,22 @@ mips_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) [1 * gdbarch_num_regs .. 2 * gdbarch_num_regs) REGNUM. */ static int -mips_stab_reg_to_regnum (int num) +mips_stab_reg_to_regnum (struct gdbarch *gdbarch, int num) { int regnum; if (num >= 0 && num < 32) regnum = num; else if (num >= 38 && num < 70) - regnum = num + mips_regnum (current_gdbarch)->fp0 - 38; + regnum = num + mips_regnum (gdbarch)->fp0 - 38; else if (num == 70) - regnum = mips_regnum (current_gdbarch)->hi; + regnum = mips_regnum (gdbarch)->hi; else if (num == 71) - regnum = mips_regnum (current_gdbarch)->lo; + regnum = mips_regnum (gdbarch)->lo; else /* This will hopefully (eventually) provoke a warning. Should we be calling complaint() here? */ - return gdbarch_num_regs (current_gdbarch) - + gdbarch_num_pseudo_regs (current_gdbarch); - return gdbarch_num_regs (current_gdbarch) + regnum; + return gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch); + return gdbarch_num_regs (gdbarch) + regnum; } @@ -5064,23 +5063,22 @@ mips_stab_reg_to_regnum (int num) gdbarch_num_regs .. 2 * gdbarch_num_regs) REGNUM. */ static int -mips_dwarf_dwarf2_ecoff_reg_to_regnum (int num) +mips_dwarf_dwarf2_ecoff_reg_to_regnum (struct gdbarch *gdbarch, int num) { int regnum; if (num >= 0 && num < 32) regnum = num; else if (num >= 32 && num < 64) - regnum = num + mips_regnum (current_gdbarch)->fp0 - 32; + regnum = num + mips_regnum (gdbarch)->fp0 - 32; else if (num == 64) - regnum = mips_regnum (current_gdbarch)->hi; + regnum = mips_regnum (gdbarch)->hi; else if (num == 65) - regnum = mips_regnum (current_gdbarch)->lo; + regnum = mips_regnum (gdbarch)->lo; else /* This will hopefully (eventually) provoke a warning. Should we be calling complaint() here? */ - return gdbarch_num_regs (current_gdbarch) - + gdbarch_num_pseudo_regs (current_gdbarch); - return gdbarch_num_regs (current_gdbarch) + regnum; + return gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch); + return gdbarch_num_regs (gdbarch) + regnum; } static int -- cgit v1.1