diff options
Diffstat (limited to 'gcc/regrename.c')
| -rw-r--r-- | gcc/regrename.c | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/gcc/regrename.c b/gcc/regrename.c index b4226bfd9ff..7168d4c9bc6 100644 --- a/gcc/regrename.c +++ b/gcc/regrename.c @@ -51,7 +51,7 @@ struct du_chain rtx insn; rtx *loc; - ENUM_BITFIELD(reg_class) class : 16; + ENUM_BITFIELD(reg_class) cl : 16; unsigned int need_caller_save_reg:1; unsigned int earlyclobber:1; }; @@ -270,13 +270,13 @@ regrename_optimize (void) { n_uses++; IOR_COMPL_HARD_REG_SET (this_unavailable, - reg_class_contents[last->class]); + reg_class_contents[last->cl]); } if (n_uses < 1) continue; IOR_COMPL_HARD_REG_SET (this_unavailable, - reg_class_contents[last->class]); + reg_class_contents[last->cl]); if (this->need_caller_save_reg) IOR_HARD_REG_SET (this_unavailable, call_used_reg_set); @@ -385,7 +385,7 @@ static struct du_chain *open_chains; static struct du_chain *closed_chains; static void -scan_rtx_reg (rtx insn, rtx *loc, enum reg_class class, +scan_rtx_reg (rtx insn, rtx *loc, enum reg_class cl, enum scan_actions action, enum op_type type, int earlyclobber) { struct du_chain **p; @@ -404,7 +404,7 @@ scan_rtx_reg (rtx insn, rtx *loc, enum reg_class class, this->next_chain = open_chains; this->loc = loc; this->insn = insn; - this->class = class; + this->cl = cl; this->need_caller_save_reg = 0; this->earlyclobber = earlyclobber; open_chains = this; @@ -451,14 +451,14 @@ scan_rtx_reg (rtx insn, rtx *loc, enum reg_class class, EXTRA_CONSTRAINTS to match registers. Which is arguably wrong, but there we are. Since we know not what this may be replaced with, terminate the chain. */ - if (class != NO_REGS) + if (cl != NO_REGS) { this = obstack_alloc (&rename_obstack, sizeof (struct du_chain)); this->next_use = 0; this->next_chain = (*p)->next_chain; this->loc = loc; this->insn = insn; - this->class = class; + this->cl = cl; this->need_caller_save_reg = 0; while (*p) p = &(*p)->next_use; @@ -502,11 +502,11 @@ scan_rtx_reg (rtx insn, rtx *loc, enum reg_class class, } } -/* Adapted from find_reloads_address_1. CLASS is INDEX_REG_CLASS or +/* Adapted from find_reloads_address_1. CL is INDEX_REG_CLASS or BASE_REG_CLASS depending on how the register is being considered. */ static void -scan_rtx_address (rtx insn, rtx *loc, enum reg_class class, +scan_rtx_address (rtx insn, rtx *loc, enum reg_class cl, enum scan_actions action, enum machine_mode mode) { rtx x = *loc; @@ -620,7 +620,7 @@ scan_rtx_address (rtx insn, rtx *loc, enum reg_class class, return; case REG: - scan_rtx_reg (insn, loc, class, action, OP_IN, 0); + scan_rtx_reg (insn, loc, cl, action, OP_IN, 0); return; default: @@ -631,15 +631,15 @@ scan_rtx_address (rtx insn, rtx *loc, enum reg_class class, for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) { if (fmt[i] == 'e') - scan_rtx_address (insn, &XEXP (x, i), class, action, mode); + scan_rtx_address (insn, &XEXP (x, i), cl, action, mode); else if (fmt[i] == 'E') for (j = XVECLEN (x, i) - 1; j >= 0; j--) - scan_rtx_address (insn, &XVECEXP (x, i, j), class, action, mode); + scan_rtx_address (insn, &XVECEXP (x, i, j), cl, action, mode); } } static void -scan_rtx (rtx insn, rtx *loc, enum reg_class class, +scan_rtx (rtx insn, rtx *loc, enum reg_class cl, enum scan_actions action, enum op_type type, int earlyclobber) { const char *fmt; @@ -661,7 +661,7 @@ scan_rtx (rtx insn, rtx *loc, enum reg_class class, return; case REG: - scan_rtx_reg (insn, loc, class, action, type, earlyclobber); + scan_rtx_reg (insn, loc, cl, action, type, earlyclobber); return; case MEM: @@ -671,20 +671,20 @@ scan_rtx (rtx insn, rtx *loc, enum reg_class class, return; case SET: - scan_rtx (insn, &SET_SRC (x), class, action, OP_IN, 0); - scan_rtx (insn, &SET_DEST (x), class, action, OP_OUT, 0); + scan_rtx (insn, &SET_SRC (x), cl, action, OP_IN, 0); + scan_rtx (insn, &SET_DEST (x), cl, action, OP_OUT, 0); return; case STRICT_LOW_PART: - scan_rtx (insn, &XEXP (x, 0), class, action, OP_INOUT, earlyclobber); + scan_rtx (insn, &XEXP (x, 0), cl, action, OP_INOUT, earlyclobber); return; case ZERO_EXTRACT: case SIGN_EXTRACT: - scan_rtx (insn, &XEXP (x, 0), class, action, + scan_rtx (insn, &XEXP (x, 0), cl, action, type == OP_IN ? OP_IN : OP_INOUT, earlyclobber); - scan_rtx (insn, &XEXP (x, 1), class, action, OP_IN, 0); - scan_rtx (insn, &XEXP (x, 2), class, action, OP_IN, 0); + scan_rtx (insn, &XEXP (x, 1), cl, action, OP_IN, 0); + scan_rtx (insn, &XEXP (x, 2), cl, action, OP_IN, 0); return; case POST_INC: @@ -697,13 +697,13 @@ scan_rtx (rtx insn, rtx *loc, enum reg_class class, abort (); case CLOBBER: - scan_rtx (insn, &SET_DEST (x), class, action, OP_OUT, 1); + scan_rtx (insn, &SET_DEST (x), cl, action, OP_OUT, 1); return; case EXPR_LIST: - scan_rtx (insn, &XEXP (x, 0), class, action, type, 0); + scan_rtx (insn, &XEXP (x, 0), cl, action, type, 0); if (XEXP (x, 1)) - scan_rtx (insn, &XEXP (x, 1), class, action, type, 0); + scan_rtx (insn, &XEXP (x, 1), cl, action, type, 0); return; default: @@ -714,10 +714,10 @@ scan_rtx (rtx insn, rtx *loc, enum reg_class class, for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) { if (fmt[i] == 'e') - scan_rtx (insn, &XEXP (x, i), class, action, type, 0); + scan_rtx (insn, &XEXP (x, i), cl, action, type, 0); else if (fmt[i] == 'E') for (j = XVECLEN (x, i) - 1; j >= 0; j--) - scan_rtx (insn, &XVECEXP (x, i, j), class, action, type, 0); + scan_rtx (insn, &XVECEXP (x, i, j), cl, action, type, 0); } } @@ -775,7 +775,7 @@ build_def_use (basic_block bb) { int matches = recog_op_alt[i][alt].matches; if (matches >= 0) - recog_op_alt[i][alt].class = recog_op_alt[matches][alt].class; + recog_op_alt[i][alt].cl = recog_op_alt[matches][alt].cl; if (matches >= 0 || recog_op_alt[i][alt].matched >= 0 || (predicated && recog_data.operand_type[i] == OP_OUT)) recog_data.operand_type[i] = OP_INOUT; @@ -850,7 +850,7 @@ build_def_use (basic_block bb) rtx *loc = (i < n_ops ? recog_data.operand_loc[opn] : recog_data.dup_loc[i - n_ops]); - enum reg_class class = recog_op_alt[opn][alt].class; + enum reg_class cl = recog_op_alt[opn][alt].cl; enum op_type type = recog_data.operand_type[opn]; /* Don't scan match_operand here, since we've no reg class @@ -860,9 +860,9 @@ build_def_use (basic_block bb) continue; if (recog_op_alt[opn][alt].is_address) - scan_rtx_address (insn, loc, class, mark_read, VOIDmode); + scan_rtx_address (insn, loc, cl, mark_read, VOIDmode); else - scan_rtx (insn, loc, class, mark_read, type, 0); + scan_rtx (insn, loc, cl, mark_read, type, 0); } /* Step 4: Close chains for registers that die here. @@ -924,13 +924,13 @@ build_def_use (basic_block bb) { rtx *loc = recog_data.operand_loc[i]; rtx op = *loc; - enum reg_class class = recog_op_alt[i][alt].class; + enum reg_class cl = recog_op_alt[i][alt].cl; if (REG_P (op) && REGNO (op) == ORIGINAL_REGNO (op)) continue; - scan_rtx (insn, loc, class, mark_write, OP_OUT, + scan_rtx (insn, loc, cl, mark_write, OP_OUT, recog_op_alt[i][alt].earlyclobber); } } @@ -941,10 +941,10 @@ build_def_use (basic_block bb) rtx *loc = (i < n_ops ? recog_data.operand_loc[opn] : recog_data.dup_loc[i - n_ops]); - enum reg_class class = recog_op_alt[opn][alt].class; + enum reg_class cl = recog_op_alt[opn][alt].cl; if (recog_data.operand_type[opn] == OP_OUT) - scan_rtx (insn, loc, class, mark_write, OP_OUT, + scan_rtx (insn, loc, cl, mark_write, OP_OUT, recog_op_alt[opn][alt].earlyclobber); } @@ -979,7 +979,7 @@ dump_def_use_chain (struct du_chain *chains) while (this) { fprintf (dump_file, " %d [%s]", INSN_UID (this->insn), - reg_class_names[this->class]); + reg_class_names[this->cl]); this = this->next_use; } fprintf (dump_file, "\n"); @@ -1312,11 +1312,11 @@ maybe_mode_change (enum machine_mode orig_mode, enum machine_mode copy_mode, } /* Find the oldest copy of the value contained in REGNO that is in - register class CLASS and has mode MODE. If found, return an rtx + register class CL and has mode MODE. If found, return an rtx of that oldest register, otherwise return NULL. */ static rtx -find_oldest_value_reg (enum reg_class class, rtx reg, struct value_data *vd) +find_oldest_value_reg (enum reg_class cl, rtx reg, struct value_data *vd) { unsigned int regno = REGNO (reg); enum machine_mode mode = GET_MODE (reg); @@ -1343,7 +1343,7 @@ find_oldest_value_reg (enum reg_class class, rtx reg, struct value_data *vd) unsigned int last; for (last = i; last < i + hard_regno_nregs[i][mode]; last++) - if (!TEST_HARD_REG_BIT (reg_class_contents[class], last)) + if (!TEST_HARD_REG_BIT (reg_class_contents[cl], last)) return NULL_RTX; new = maybe_mode_change (oldmode, vd->e[regno].mode, mode, i, regno); @@ -1359,13 +1359,13 @@ find_oldest_value_reg (enum reg_class class, rtx reg, struct value_data *vd) } /* If possible, replace the register at *LOC with the oldest register - in register class CLASS. Return true if successfully replaced. */ + in register class CL. Return true if successfully replaced. */ static bool -replace_oldest_value_reg (rtx *loc, enum reg_class class, rtx insn, +replace_oldest_value_reg (rtx *loc, enum reg_class cl, rtx insn, struct value_data *vd) { - rtx new = find_oldest_value_reg (class, *loc, vd); + rtx new = find_oldest_value_reg (cl, *loc, vd); if (new) { if (dump_file) @@ -1379,11 +1379,11 @@ replace_oldest_value_reg (rtx *loc, enum reg_class class, rtx insn, } /* Similar to replace_oldest_value_reg, but *LOC contains an address. - Adapted from find_reloads_address_1. CLASS is INDEX_REG_CLASS or + Adapted from find_reloads_address_1. CL is INDEX_REG_CLASS or BASE_REG_CLASS depending on how the register is being considered. */ static bool -replace_oldest_value_addr (rtx *loc, enum reg_class class, +replace_oldest_value_addr (rtx *loc, enum reg_class cl, enum machine_mode mode, rtx insn, struct value_data *vd) { @@ -1491,7 +1491,7 @@ replace_oldest_value_addr (rtx *loc, enum reg_class class, return replace_oldest_value_mem (x, insn, vd); case REG: - return replace_oldest_value_reg (loc, class, insn, vd); + return replace_oldest_value_reg (loc, cl, insn, vd); default: break; @@ -1501,11 +1501,11 @@ replace_oldest_value_addr (rtx *loc, enum reg_class class, for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) { if (fmt[i] == 'e') - changed |= replace_oldest_value_addr (&XEXP (x, i), class, mode, + changed |= replace_oldest_value_addr (&XEXP (x, i), cl, mode, insn, vd); else if (fmt[i] == 'E') for (j = XVECLEN (x, i) - 1; j >= 0; j--) - changed |= replace_oldest_value_addr (&XVECEXP (x, i, j), class, + changed |= replace_oldest_value_addr (&XVECEXP (x, i, j), cl, mode, insn, vd); } @@ -1562,7 +1562,7 @@ copyprop_hardreg_forward_1 (basic_block bb, struct value_data *vd) { int matches = recog_op_alt[i][alt].matches; if (matches >= 0) - recog_op_alt[i][alt].class = recog_op_alt[matches][alt].class; + recog_op_alt[i][alt].cl = recog_op_alt[matches][alt].cl; if (matches >= 0 || recog_op_alt[i][alt].matched >= 0 || (predicated && recog_data.operand_type[i] == OP_OUT)) recog_data.operand_type[i] = OP_INOUT; @@ -1669,12 +1669,12 @@ copyprop_hardreg_forward_1 (basic_block bb, struct value_data *vd) if (recog_op_alt[i][alt].is_address) replaced = replace_oldest_value_addr (recog_data.operand_loc[i], - recog_op_alt[i][alt].class, + recog_op_alt[i][alt].cl, VOIDmode, insn, vd); else if (REG_P (recog_data.operand[i])) replaced = replace_oldest_value_reg (recog_data.operand_loc[i], - recog_op_alt[i][alt].class, + recog_op_alt[i][alt].cl, insn, vd); else if (MEM_P (recog_data.operand[i])) replaced = replace_oldest_value_mem (recog_data.operand[i], |