From feb09dd93d0760c10dd9b381f49482fd67f80e1f Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Tue, 13 May 2014 10:38:57 +0000 Subject: [PATCH] rtl.def (scratch): Fix outdated comment and remove "0" field. gcc/ * rtl.def (scratch): Fix outdated comment and remove "0" field. * gengtype.c (adjust_field_rtx_def): Update accordingly. From-SVN: r210361 --- gcc/ChangeLog | 5 +++++ gcc/gengtype.c | 2 -- gcc/rtl.def | 7 +++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 33727d6..7a06499 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2014-05-13 Richard Sandiford + * rtl.def (scratch): Fix outdated comment and remove "0" field. + * gengtype.c (adjust_field_rtx_def): Update accordingly. + +2014-05-13 Richard Sandiford + * rtl.def (DEBUG_INSN, INSN, JUMP_INSN, CALL_INSN, JUMP_TABLE_DATA) (BARRIER, CODE_LABEL, NOTE): Remove first "i" field. * rtl.h (rtx_def): Add insn_uid to u2 field. diff --git a/gcc/gengtype.c b/gcc/gengtype.c index 5fdb65f..26e0c58 100644 --- a/gcc/gengtype.c +++ b/gcc/gengtype.c @@ -1249,8 +1249,6 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt)) t = tree_tp, subname = "rt_tree"; else if (i == REG && aindex == 1) t = reg_attrs_tp, subname = "rt_reg"; - else if (i == SCRATCH && aindex == 0) - t = scalar_tp, subname = "rt_int"; else if (i == SYMBOL_REF && aindex == 1) t = scalar_tp, subname = "rt_int"; else if (i == SYMBOL_REF && aindex == 2) diff --git a/gcc/rtl.def b/gcc/rtl.def index f192412..dda556d 100644 --- a/gcc/rtl.def +++ b/gcc/rtl.def @@ -384,11 +384,10 @@ DEF_RTL_EXPR(PC, "pc", "", RTX_OBJ) DEF_RTL_EXPR(REG, "reg", "i0", RTX_OBJ) /* A scratch register. This represents a register used only within a - single insn. It will be turned into a REG during register allocation + single insn. It will be replaced by a REG during register allocation or reload unless the constraint indicates that the register won't be - needed, in which case it can remain a SCRATCH. This code is - marked as having one operand so it can be turned into a REG. */ -DEF_RTL_EXPR(SCRATCH, "scratch", "0", RTX_OBJ) + needed, in which case it can remain a SCRATCH. */ +DEF_RTL_EXPR(SCRATCH, "scratch", "", RTX_OBJ) /* A reference to a part of another value. The first operand is the complete value and the second is the byte offset of the selected part. */ -- 2.7.4