diff options
Diffstat (limited to 'gcc/dwarf2out.cc')
| -rw-r--r-- | gcc/dwarf2out.cc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc index 9e2fa96..e418360 100644 --- a/gcc/dwarf2out.cc +++ b/gcc/dwarf2out.cc @@ -3850,7 +3850,7 @@ static int decl_quals (const_tree); static dw_die_ref modified_type_die (tree, int, bool, dw_die_ref); static dw_die_ref generic_parameter_die (tree, tree, bool, dw_die_ref); static dw_die_ref template_parameter_pack_die (tree, tree, dw_die_ref); -static unsigned int dbx_reg_number (const_rtx); +static unsigned int debugger_reg_number (const_rtx); static void add_loc_descr_op_piece (dw_loc_descr_ref *, int); static dw_loc_descr_ref reg_loc_descriptor (rtx, enum var_init_status); static dw_loc_descr_ref one_reg_loc_descriptor (unsigned int, @@ -14169,10 +14169,10 @@ template_parameter_pack_die (tree parm_pack, return die; } -/* Return the DBX register number described by a given RTL node. */ +/* Return the debugger register number described by a given RTL node. */ static unsigned int -dbx_reg_number (const_rtx rtl) +debugger_reg_number (const_rtx rtl) { unsigned regno = REGNO (rtl); @@ -14187,7 +14187,7 @@ dbx_reg_number (const_rtx rtl) } #endif - regno = DBX_REGISTER_NUMBER (regno); + regno = DEBUGGER_REGNO (regno); gcc_assert (regno != INVALID_REGNUM); return regno; } @@ -14250,10 +14250,10 @@ reg_loc_descriptor (rtx rtl, enum var_init_status initialized) return multiple_reg_loc_descriptor (rtl, regs, initialized); else { - unsigned int dbx_regnum = dbx_reg_number (rtl); - if (dbx_regnum == IGNORED_DWARF_REGNUM) + unsigned int debugger_regnum = debugger_reg_number (rtl); + if (debugger_regnum == IGNORED_DWARF_REGNUM) return 0; - return one_reg_loc_descriptor (dbx_regnum, initialized); + return one_reg_loc_descriptor (debugger_regnum, initialized); } } @@ -14302,7 +14302,7 @@ multiple_reg_loc_descriptor (rtx rtl, rtx regs, } #endif - gcc_assert ((unsigned) DBX_REGISTER_NUMBER (reg) == dbx_reg_number (rtl)); + gcc_assert ((unsigned) DEBUGGER_REGNO (reg) == debugger_reg_number (rtl)); nregs = REG_NREGS (rtl); /* At present we only track constant-sized pieces. */ @@ -14315,7 +14315,7 @@ multiple_reg_loc_descriptor (rtx rtl, rtx regs, { dw_loc_descr_ref t; - t = one_reg_loc_descriptor (DBX_REGISTER_NUMBER (reg), + t = one_reg_loc_descriptor (DEBUGGER_REGNO (reg), VAR_INIT_STATUS_INITIALIZED); add_loc_descr (&loc_result, t); add_loc_descr_op_piece (&loc_result, size); @@ -14337,7 +14337,7 @@ multiple_reg_loc_descriptor (rtx rtl, rtx regs, { dw_loc_descr_ref t; - t = one_reg_loc_descriptor (dbx_reg_number (XVECEXP (regs, 0, i)), + t = one_reg_loc_descriptor (debugger_reg_number (XVECEXP (regs, 0, i)), VAR_INIT_STATUS_INITIALIZED); add_loc_descr (&loc_result, t); add_loc_descr_op_piece (&loc_result, size); @@ -15995,7 +15995,7 @@ mem_loc_descriptor (rtx rtl, machine_mode mode, )) { dw_die_ref type_die; - unsigned int dbx_regnum; + unsigned int debugger_regnum; if (dwarf_strict && dwarf_version < 5) break; @@ -16005,11 +16005,11 @@ mem_loc_descriptor (rtx rtl, machine_mode mode, if (type_die == NULL) break; - dbx_regnum = dbx_reg_number (rtl); - if (dbx_regnum == IGNORED_DWARF_REGNUM) + debugger_regnum = debugger_reg_number (rtl); + if (debugger_regnum == IGNORED_DWARF_REGNUM) break; mem_loc_result = new_loc_descr (dwarf_OP (DW_OP_regval_type), - dbx_regnum, 0); + debugger_regnum, 0); mem_loc_result->dw_loc_oprnd2.val_class = dw_val_class_die_ref; mem_loc_result->dw_loc_oprnd2.v.val_die_ref.die = type_die; mem_loc_result->dw_loc_oprnd2.v.val_die_ref.external = 0; @@ -16280,10 +16280,10 @@ mem_loc_descriptor (rtx rtl, machine_mode mode, VOIDmode, VAR_INIT_STATUS_INITIALIZED); else { - unsigned int dbx_regnum = dbx_reg_number (ENTRY_VALUE_EXP (rtl)); - if (dbx_regnum == IGNORED_DWARF_REGNUM) + unsigned int debugger_regnum = debugger_reg_number (ENTRY_VALUE_EXP (rtl)); + if (debugger_regnum == IGNORED_DWARF_REGNUM) return NULL; - op0 = one_reg_loc_descriptor (dbx_regnum, + op0 = one_reg_loc_descriptor (debugger_regnum, VAR_INIT_STATUS_INITIALIZED); } } |