* rtl.def (VAR_LOCATION): Remove "i" field.
* rtl.h (rtx_def): Add u2.var_location_status.
(PAT_VAR_LOCATION_STATUS): Use it.
(gen_rtx_VAR_LOCATION): Declare.
* gengenrtl.c (excluded_rtx): Add VAR_LOCATION.
* emit-rtl.c (gen_rtx_VAR_LOCATION): New function.
* var-tracking.c (emit_note_insn_var_location): Remove casts.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210362
138bc75d-0d04-0410-961f-
82ee72b054a4
+2014-05-13 Richard Sandiford <rdsandiford@googlemail.com>
+
+ * rtl.def (VAR_LOCATION): Remove "i" field.
+ * rtl.h (rtx_def): Add u2.var_location_status.
+ (PAT_VAR_LOCATION_STATUS): Use it.
+ (gen_rtx_VAR_LOCATION): Declare.
+ * gengenrtl.c (excluded_rtx): Add VAR_LOCATION.
+ * emit-rtl.c (gen_rtx_VAR_LOCATION): New function.
+ * var-tracking.c (emit_note_insn_var_location): Remove casts.
+
2014-05-13 Richard Sandiford <rdsandiford@googlemail.com>
* rtl.def (scratch): Fix outdated comment and remove "0" field.
return gen_rtx_SUBREG (mode, reg,
subreg_lowpart_offset (mode, inmode));
}
+
+rtx
+gen_rtx_VAR_LOCATION (enum machine_mode mode, tree decl, rtx loc,
+ enum var_init_status status)
+{
+ rtx x = gen_rtx_fmt_te (VAR_LOCATION, mode, decl, loc);
+ PAT_VAR_LOCATION_STATUS (x) = status;
+ return x;
+}
\f
/* Create an rtvec and stores within it the RTXen passed in the arguments. */
static int
excluded_rtx (int idx)
{
- return ((strcmp (defs[idx].enumname, "CONST_DOUBLE") == 0)
- || (strcmp (defs[idx].enumname, "CONST_WIDE_INT") == 0)
- || (strcmp (defs[idx].enumname, "CONST_FIXED") == 0));
+ return (strcmp (defs[idx].enumname, "VAR_LOCATION") == 0
+ || strcmp (defs[idx].enumname, "CONST_DOUBLE") == 0
+ || strcmp (defs[idx].enumname, "CONST_WIDE_INT") == 0
+ || strcmp (defs[idx].enumname, "CONST_FIXED") == 0);
}
/* Place a list of all format specifiers we use into the array FORMAT. */
DEF_RTL_EXPR(FMA, "fma", "eee", RTX_TERNARY)
/* Information about the variable and its location. */
-/* Changed 'te' to 'tei'; the 'i' field is for recording
- initialization status of variables. */
-DEF_RTL_EXPR(VAR_LOCATION, "var_location", "tei", RTX_EXTRA)
+DEF_RTL_EXPR(VAR_LOCATION, "var_location", "te", RTX_EXTRA)
/* Used in VAR_LOCATION for a pointer to a decl that is no longer
addressable. */
/* The INSN_UID of an RTX_INSN-class code. */
int insn_uid;
+ /* The PAT_VAR_LOCATION_STATUS of a VAR_LOCATION. */
+ enum var_init_status var_location_status;
+
/* In a CONST_WIDE_INT (aka hwivec_def), this is the number of
HOST_WIDE_INTs in the hwivec_def. */
unsigned int num_elem;
can be unknown, uninitialized or initialized. See enumeration
type below. */
#define PAT_VAR_LOCATION_STATUS(PAT) \
- ((enum var_init_status) (XCINT ((PAT), 2, VAR_LOCATION)))
+ (RTL_FLAG_CHECK1 ("PAT_VAR_LOCATION_STATUS", PAT, VAR_LOCATION) \
+ ->u2.var_location_status)
/* Accessors for a NOTE_INSN_VAR_LOCATION. */
#define NOTE_VAR_LOCATION_DECL(NOTE) \
extern rtx gen_rtx_REG (enum machine_mode, unsigned);
extern rtx gen_rtx_SUBREG (enum machine_mode, rtx, int);
extern rtx gen_rtx_MEM (enum machine_mode, rtx);
+extern rtx gen_rtx_VAR_LOCATION (enum machine_mode, tree, rtx,
+ enum var_init_status);
#define GEN_INT(N) gen_rtx_CONST_INT (VOIDmode, (N))
note_vl = NULL_RTX;
if (!complete)
- note_vl = gen_rtx_VAR_LOCATION (VOIDmode, decl, NULL_RTX,
- (int) initialized);
+ note_vl = gen_rtx_VAR_LOCATION (VOIDmode, decl, NULL_RTX, initialized);
else if (n_var_parts == 1)
{
rtx expr_list;
else
expr_list = loc[0];
- note_vl = gen_rtx_VAR_LOCATION (VOIDmode, decl, expr_list,
- (int) initialized);
+ note_vl = gen_rtx_VAR_LOCATION (VOIDmode, decl, expr_list, initialized);
}
else if (n_var_parts)
{
parallel = gen_rtx_PARALLEL (VOIDmode,
gen_rtvec_v (n_var_parts, loc));
note_vl = gen_rtx_VAR_LOCATION (VOIDmode, decl,
- parallel, (int) initialized);
+ parallel, initialized);
}
if (where != EMIT_NOTE_BEFORE_INSN)