gcc/

	* rtl.def (scratch): Fix outdated comment and remove "0" field.
	* gengtype.c (adjust_field_rtx_def): Update accordingly.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210361 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 33727d64c8c8ac392bb502c8c4d92468f3aa01d5..7a06499092d20f1f4e8fddb56edd61feb731884f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-13  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * rtl.def (scratch): Fix outdated comment and remove "0" field.
+       * gengtype.c (adjust_field_rtx_def): Update accordingly.
+
 2014-05-13  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * rtl.def (DEBUG_INSN, INSN, JUMP_INSN, CALL_INSN, JUMP_TABLE_DATA)

diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index 5fdb65fa1c77733c80a9d639db20074c7680a2e1..26e0c58515827a27fa13bcda456c2d6e59c23e98 100644 (file)
--- 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 f1924126e2780c2c0766ffb7ace7f4aa13ee8c42..dda556daf699cf2e37c4f0ca1d03c8561f54f7fc 100644 (file)
--- 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.   */