aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Malcolm <dmalcolm@redhat.com>2014-08-27 20:30:51 +0000
committerDavid Malcolm <dmalcolm@gcc.gnu.org>2014-08-27 20:30:51 +0000
commit38e60c554d650d2c1fdefea2ba4f70ebf1d31298 (patch)
tree11494656a8b241d4f92fd8d40071e2c4c83d9ade
parent30db48d9d22e04e7270ba5b204fa74f4c8f9f5e3 (diff)
downloadgcc-38e60c554d650d2c1fdefea2ba4f70ebf1d31298.zip
gcc-38e60c554d650d2c1fdefea2ba4f70ebf1d31298.tar.gz
gcc-38e60c554d650d2c1fdefea2ba4f70ebf1d31298.tar.bz2
Introduce rtx_expr_list subclass of rtx_def
gcc/ 2014-08-27 David Malcolm <dmalcolm@redhat.com> * coretypes.h (class rtx_expr_list): Add forward declaration. * emit-rtl.c (gen_rtx_EXPR_LIST): New. * gengenrtl.c (special_rtx): Add EXPR_LIST. * rtl.h (class rtx_expr_list): New subclass of rtx_def, adding invariant: GET_CODE (X) == EXPR_LIST. (is_a_helper <rtx_expr_list *>::test): New. (rtx_expr_list::next): New. (rtx_expr_list::element): New. (gen_rtx_EXPR_LIST): New. From-SVN: r214601
-rw-r--r--gcc/ChangeLog12
-rw-r--r--gcc/coretypes.h1
-rw-r--r--gcc/emit-rtl.c7
-rw-r--r--gcc/gengenrtl.c3
-rw-r--r--gcc/rtl.h36
5 files changed, 58 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0aae07f..dbdae27 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,17 @@
2014-08-27 David Malcolm <dmalcolm@redhat.com>
+ * coretypes.h (class rtx_expr_list): Add forward declaration.
+ * emit-rtl.c (gen_rtx_EXPR_LIST): New.
+ * gengenrtl.c (special_rtx): Add EXPR_LIST.
+ * rtl.h (class rtx_expr_list): New subclass of rtx_def, adding
+ invariant: GET_CODE (X) == EXPR_LIST.
+ (is_a_helper <rtx_expr_list *>::test): New.
+ (rtx_expr_list::next): New.
+ (rtx_expr_list::element): New.
+ (gen_rtx_EXPR_LIST): New.
+
+2014-08-27 David Malcolm <dmalcolm@redhat.com>
+
* varasm.c (mark_constants): Convert a GET_CODE check into a
dyn_cast, strengthening local "seq" from rtx to rtx_sequence *.
Use methods of rtx_sequence to clarify the code.
diff --git a/gcc/coretypes.h b/gcc/coretypes.h
index d5d4885..9951f10 100644
--- a/gcc/coretypes.h
+++ b/gcc/coretypes.h
@@ -60,6 +60,7 @@ typedef const struct rtx_def *const_rtx;
hierarchy, along with the relevant invariant.
Where possible, keep this list in the same order as in rtl.def. */
class rtx_def;
+ class rtx_expr_list; /* GET_CODE (X) == EXPR_LIST */
class rtx_insn_list; /* GET_CODE (X) == INSN_LIST */
class rtx_sequence; /* GET_CODE (X) == SEQUENCE */
class rtx_insn;
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index cffb8db..f5ec8b4 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -409,6 +409,13 @@ gen_raw_REG (enum machine_mode mode, int regno)
functions do the raw handling. If you add to this list, modify
special_rtx in gengenrtl.c as well. */
+rtx_expr_list *
+gen_rtx_EXPR_LIST (enum machine_mode mode, rtx expr, rtx expr_list)
+{
+ return as_a <rtx_expr_list *> (gen_rtx_fmt_ee (EXPR_LIST, mode, expr,
+ expr_list));
+}
+
rtx_insn_list *
gen_rtx_INSN_LIST (enum machine_mode mode, rtx insn, rtx insn_list)
{
diff --git a/gcc/gengenrtl.c b/gcc/gengenrtl.c
index cd29341..885dd20 100644
--- a/gcc/gengenrtl.c
+++ b/gcc/gengenrtl.c
@@ -123,7 +123,8 @@ special_format (const char *fmt)
static int
special_rtx (int idx)
{
- return (strcmp (defs[idx].enumname, "INSN_LIST") == 0
+ return (strcmp (defs[idx].enumname, "EXPR_LIST") == 0
+ || strcmp (defs[idx].enumname, "INSN_LIST") == 0
|| strcmp (defs[idx].enumname, "CONST_INT") == 0
|| strcmp (defs[idx].enumname, "REG") == 0
|| strcmp (defs[idx].enumname, "SUBREG") == 0
diff --git a/gcc/rtl.h b/gcc/rtl.h
index fe8201d..4f8533d 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -402,6 +402,28 @@ struct GTY((desc("0"), tag("0"),
} GTY ((special ("rtx_def"), desc ("GET_CODE (&%0)"))) u;
};
+/* A node for constructing singly-linked lists of rtx. */
+
+class GTY(()) rtx_expr_list : public rtx_def
+{
+ /* No extra fields, but adds invariant: (GET_CODE (X) == EXPR_LIST). */
+
+public:
+ /* Get next in list. */
+ rtx_expr_list *next () const;
+
+ /* Get at the underlying rtx. */
+ rtx element () const;
+};
+
+template <>
+template <>
+inline bool
+is_a_helper <rtx_expr_list *>::test (rtx rt)
+{
+ return rt->code == EXPR_LIST;
+}
+
class GTY(()) rtx_insn_list : public rtx_def
{
/* No extra fields, but adds invariant: (GET_CODE (X) == INSN_LIST).
@@ -1233,6 +1255,19 @@ extern void rtl_check_failed_flag (const char *, const_rtx, const char *,
#define XC2EXP(RTX, N, C1, C2) (RTL_CHECKC2 (RTX, N, C1, C2).rt_rtx)
+/* Methods of rtx_expr_list. */
+
+inline rtx_expr_list *rtx_expr_list::next () const
+{
+ rtx tmp = XEXP (this, 1);
+ return safe_as_a <rtx_expr_list *> (tmp);
+}
+
+inline rtx rtx_expr_list::element () const
+{
+ return XEXP (this, 0);
+}
+
/* Methods of rtx_insn_list. */
inline rtx_insn_list *rtx_insn_list::next () const
@@ -3048,6 +3083,7 @@ get_mem_attrs (const_rtx x)
generation functions included above do the raw handling. If you
add to this list, modify special_rtx in gengenrtl.c as well. */
+extern rtx_expr_list *gen_rtx_EXPR_LIST (enum machine_mode, rtx, rtx);
extern rtx_insn_list *gen_rtx_INSN_LIST (enum machine_mode, rtx, rtx);
extern rtx gen_rtx_CONST_INT (enum machine_mode, HOST_WIDE_INT);
extern rtx gen_rtx_CONST_VECTOR (enum machine_mode, rtvec);