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/m68k-tdep.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gdb/m68k-tdep.c') diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 39b70c59347..0fd40bf04be 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -527,7 +527,7 @@ m68k_push_dummy_call (struct gdbarch *gdbarch, struct value *function, /* Convert a dwarf or dwarf2 regnumber to a GDB regnum. */ static int -m68k_dwarf_reg_to_regnum (int num) +m68k_dwarf_reg_to_regnum (struct gdbarch *gdbarch, int num) { if (num < 8) /* d0..7 */ @@ -535,15 +535,14 @@ m68k_dwarf_reg_to_regnum (int num) else if (num < 16) /* a0..7 */ return (num - 8) + M68K_A0_REGNUM; - else if (num < 24 && gdbarch_tdep (current_gdbarch)->fpregs_present) + else if (num < 24 && gdbarch_tdep (gdbarch)->fpregs_present) /* fp0..7 */ return (num - 16) + M68K_FP0_REGNUM; else if (num == 25) /* pc */ return M68K_PC_REGNUM; else - return gdbarch_num_regs (current_gdbarch) - + gdbarch_num_pseudo_regs (current_gdbarch); + return gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch); } -- cgit v1.2.1