In include:

[pf3gnuchains/gcc-fork.git] / gcc / varray.h

diff --git a/gcc/varray.h b/gcc/varray.h
index d08bfa9..1456ffe 100644 (file)
--- a/gcc/varray.h
+++ b/gcc/varray.h
@@ -76,6 +76,7 @@ typedef union varray_data_tag {
   struct reg_info_def   *reg[1];
   struct const_equiv_data const_equiv[1];
   struct basic_block_def *bb[1];
+  struct elt_list       *te[1];
 } varray_data;
 
 /* Virtual array of pointers header.  */
@@ -152,6 +153,9 @@ extern varray_type varray_init      PARAMS ((size_t, size_t, const char *));
 #define VARRAY_BB_INIT(va, num, name) \
   va = varray_init (num, sizeof (struct basic_block_def *), name)
 
+#define VARRAY_ELT_LIST_INIT(va, num, name) \
+  va = varray_init (num, sizeof (struct elt_list *), name)
+
 /* Free up memory allocated by the virtual array, but do not free any of the
    elements involved.  */
 #define VARRAY_FREE(vp) \
@@ -164,17 +168,19 @@ extern varray_type varray_grow    PARAMS ((varray_type, size_t));
 
 #define VARRAY_SIZE(VA)        ((VA)->num_elements)
 
+#define VARRAY_ACTIVE_SIZE(VA) ((VA)->elements_used)
+#define VARRAY_POP_ALL(VA)     ((VA)->elements_used = 0)
+
 /* Check for VARRAY_xxx macros being in bound.  */
 #if defined ENABLE_CHECKING && (GCC_VERSION >= 2007)
 extern void varray_check_failed PARAMS ((varray_type, size_t,
                                        const char *, int,
                                        const char *)) ATTRIBUTE_NORETURN;
-#define VARRAY_CHECK(VA, N, T)                                 \
+#define VARRAY_CHECK(VA, N, T) __extension__                   \
 (*({ varray_type _va = VA;                                     \
      size_t _n = N;                                            \
      if (_n >= _va->num_elements)                              \
-       varray_check_failed (_va, _n, __FILE__, __LINE__,       \
-                           __PRETTY_FUNCTION__);               \
+       varray_check_failed (_va, _n, __FILE__, __LINE__, __FUNCTION__);        \
      &_va->data.T[_n]; }))
 #else
 #define VARRAY_CHECK(VA, N, T) ((VA)->data.T[N])
@@ -219,6 +225,7 @@ extern void varray_check_failed PARAMS ((varray_type, size_t,
 #define VARRAY_REG(VA, N)              VARRAY_CHECK (VA, N, reg)
 #define VARRAY_CONST_EQUIV(VA, N)      VARRAY_CHECK (VA, N, const_equiv)
 #define VARRAY_BB(VA, N)               VARRAY_CHECK (VA, N, bb)
+#define VARRAY_ELT_LIST(VA, N)         VARRAY_CHECK (VA, N, te)
 
 /* Push a new element on the end of VA, extending it if necessary.  */
 #define VARRAY_PUSH_CHAR(VA, X)                VARRAY_PUSH (VA, c, X)
@@ -231,8 +238,8 @@ extern void varray_check_failed PARAMS ((varray_type, size_t,
 #define VARRAY_PUSH_ULONG(VA, X)       VARRAY_PUSH (VA, ul, X)
 #define VARRAY_PUSH_WIDE_INT(VA, X)    VARRAY_PUSH (VA, hint, X)
 #define VARRAY_PUSH_UWIDE_INT(VA, X)   VARRAY_PUSH (VA, uhint, X)
-#define VARRAY_PUSH_GENERIC_PTR(VA,N)  VARRAY_PUSH (VA, generic, X)
-#define VARRAY_PUSH_CHAR_PTR(VA,N)     VARRAY_PUSH (VA, cptr, X)
+#define VARRAY_PUSH_GENERIC_PTR(VA, X) VARRAY_PUSH (VA, generic, X)
+#define VARRAY_PUSH_CHAR_PTR(VA, X)    VARRAY_PUSH (VA, cptr, X)
 #define VARRAY_PUSH_RTX(VA, X)         VARRAY_PUSH (VA, rtx, X)
 #define VARRAY_PUSH_RTVEC(VA, X)       VARRAY_PUSH (VA, rtvec, X)
 #define VARRAY_PUSH_TREE(VA, X)                VARRAY_PUSH (VA, tree, X)