2014-08-28 Richard Sandiford <rdsandiford@googlemail.com>
+ * combine.c (record_truncated_value): Turn from being a for_each_rtx
+ callback to a function that takes an rtx and returns a bool
+ (record_truncated_values): Use FOR_EACH_SUBRTX_VAR instead of
+ for_each_rtx.
+
+2014-08-28 Richard Sandiford <rdsandiford@googlemail.com>
+
* combine.c: Include rtl-iter.h.
(unmentioned_reg_p_1): Delete.
(unmentioned_reg_p): Use FOR_EACH_SUBRTX rather than for_each_rtx.
static void mark_used_regs_combine (rtx);
static void record_promoted_value (rtx_insn *, rtx);
static bool unmentioned_reg_p (rtx, rtx);
-static int record_truncated_value (rtx *, void *);
static void record_truncated_values (rtx *, void *);
static bool reg_truncated_to_mode (enum machine_mode, const_rtx);
static rtx gen_lowpart_or_truncate (enum machine_mode, rtx);
return false;
}
-/* Callback for for_each_rtx. If *P is a hard reg or a subreg record the mode
- that the register is accessed in. For non-TRULY_NOOP_TRUNCATION targets we
- might be able to turn a truncate into a subreg using this information.
- Return -1 if traversing *P is complete or 0 otherwise. */
+/* If X is a hard reg or a subreg record the mode that the register is
+ accessed in. For non-TRULY_NOOP_TRUNCATION targets we might be able
+ to turn a truncate into a subreg using this information. Return true
+ if traversing X is complete. */
-static int
-record_truncated_value (rtx *p, void *data ATTRIBUTE_UNUSED)
+static bool
+record_truncated_value (rtx x)
{
- rtx x = *p;
enum machine_mode truncated_mode;
reg_stat_type *rsp;
truncated_mode = GET_MODE (x);
if (GET_MODE_SIZE (original_mode) <= GET_MODE_SIZE (truncated_mode))
- return -1;
+ return true;
if (TRULY_NOOP_TRUNCATION_MODES_P (truncated_mode, original_mode))
- return -1;
+ return true;
x = SUBREG_REG (x);
}
else if (REG_P (x) && REGNO (x) < FIRST_PSEUDO_REGISTER)
truncated_mode = GET_MODE (x);
else
- return 0;
+ return false;
rsp = ®_stat[REGNO (x)];
if (rsp->truncated_to_mode == 0
rsp->truncation_label = label_tick;
}
- return -1;
+ return true;
}
/* Callback for note_uses. Find hardregs and subregs of pseudos and
SUBREGs. */
static void
-record_truncated_values (rtx *x, void *data ATTRIBUTE_UNUSED)
+record_truncated_values (rtx *loc, void *data ATTRIBUTE_UNUSED)
{
- for_each_rtx (x, record_truncated_value, NULL);
+ subrtx_var_iterator::array_type array;
+ FOR_EACH_SUBRTX_VAR (iter, array, *loc, NONCONST)
+ if (record_truncated_value (*iter))
+ iter.skip_subrtxes ();
}
/* Scan X for promoted SUBREGs. For each one found,