X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fvarray.h;h=371e4e70bcb7f71df132c73760deb690ecaa9067;hb=5d4b6e9c06cae8242813f303f804f31222500c65;hp=7351c2af4c4beb5c9b2140229d8228b651901c1d;hpb=7a8d80c6832ce2b822f4530ef0c5767a43aad3e5;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/varray.h b/gcc/varray.h index 7351c2af4c4..371e4e70bcb 100644 --- a/gcc/varray.h +++ b/gcc/varray.h @@ -1,5 +1,6 @@ /* Virtual array support. - Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004 + Free Software Foundation, Inc. Contributed by Cygnus Solutions. This file is part of GCC. @@ -49,14 +50,14 @@ struct const_equiv_data GTY(()) { pseudos that contain pointers into the replacement area allocated for this inline instance. These pseudos are then marked as being equivalent to the appropriate address and substituted if valid. */ - struct rtx_def *rtx; + rtx rtx; /* Record the valid age for each entry. The entry is invalid if its age is less than const_age. */ unsigned age; }; -/* Enum indicating what the varray contains. +/* Enum indicating what the varray contains. If this is changed, `element' in varray.c needs to be updated. */ enum varray_data_enum { @@ -71,6 +72,7 @@ enum varray_data_enum { VARRAY_DATA_HINT, VARRAY_DATA_UHINT, VARRAY_DATA_GENERIC, + VARRAY_DATA_GENERIC_NOGC, VARRAY_DATA_CPTR, VARRAY_DATA_RTX, VARRAY_DATA_RTVEC, @@ -80,6 +82,8 @@ enum varray_data_enum { VARRAY_DATA_CONST_EQUIV, VARRAY_DATA_BB, VARRAY_DATA_TE, + VARRAY_DATA_EDGE, + VARRAY_DATA_TREE_PTR, NUM_VARRAY_DATA }; @@ -105,26 +109,32 @@ typedef union varray_data_tag GTY (()) { tag ("VARRAY_DATA_HINT"))) hint[1]; unsigned HOST_WIDE_INT GTY ((length ("%0.num_elements"), tag ("VARRAY_DATA_UHINT"))) uhint[1]; - PTR GTY ((length ("%0.num_elements"), use_param (""), + PTR GTY ((length ("%0.num_elements"), use_param, tag ("VARRAY_DATA_GENERIC"))) generic[1]; + PTR GTY ((length ("%0.num_elements"), skip (""), + tag ("VARRAY_DATA_GENERIC_NOGC"))) generic_nogc[1]; char *GTY ((length ("%0.num_elements"), tag ("VARRAY_DATA_CPTR"))) cptr[1]; - struct rtx_def *GTY ((length ("%0.num_elements"), + rtx GTY ((length ("%0.num_elements"), tag ("VARRAY_DATA_RTX"))) rtx[1]; - struct rtvec_def *GTY ((length ("%0.num_elements"), + rtvec GTY ((length ("%0.num_elements"), tag ("VARRAY_DATA_RTVEC"))) rtvec[1]; - union tree_node *GTY ((length ("%0.num_elements"), + tree GTY ((length ("%0.num_elements"), tag ("VARRAY_DATA_TREE"))) tree[1]; struct bitmap_head_def *GTY ((length ("%0.num_elements"), tag ("VARRAY_DATA_BITMAP"))) bitmap[1]; - struct reg_info_def *GTY ((length ("%0.num_elements"), skip (""), + struct reg_info_def *GTY ((length ("%0.num_elements"), skip, tag ("VARRAY_DATA_REG"))) reg[1]; struct const_equiv_data GTY ((length ("%0.num_elements"), - tag ("VARRAY_DATA_CONST_EQUIV"))) const_equiv[1]; - struct basic_block_def *GTY ((length ("%0.num_elements"), skip (""), + tag ("VARRAY_DATA_CONST_EQUIV"))) const_equiv[1]; + struct basic_block_def *GTY ((length ("%0.num_elements"), skip, tag ("VARRAY_DATA_BB"))) bb[1]; struct elt_list *GTY ((length ("%0.num_elements"), tag ("VARRAY_DATA_TE"))) te[1]; + struct edge_def *GTY ((length ("%0.num_elements"), + tag ("VARRAY_DATA_EDGE"))) e[1]; + tree *GTY ((length ("%0.num_elements"), skip (""), + tag ("VARRAY_DATA_TREE_PTR"))) tp[1]; } varray_data; /* Virtual array of pointers header. */ @@ -134,15 +144,14 @@ struct varray_head_tag GTY(()) { using VARRAY_PUSH/VARRAY_POP. */ enum varray_data_enum type; /* The kind of elements in the varray. */ const char *name; /* name of the varray for reporting errors */ - varray_data GTY ((desc ("%0.type"))) data; /* The data elements follow, + varray_data GTY ((desc ("%0.type"))) data; /* The data elements follow, must be last. */ }; typedef struct varray_head_tag *varray_type; /* Allocate a virtual array with NUM elements, each of which is SIZE bytes long, named NAME. Array elements are zeroed. */ -extern varray_type varray_init PARAMS ((size_t, enum varray_data_enum, - const char *)); +extern varray_type varray_init (size_t, enum varray_data_enum, const char *); #define VARRAY_CHAR_INIT(va, num, name) \ va = varray_init (num, VARRAY_DATA_C, name) @@ -177,6 +186,9 @@ extern varray_type varray_init PARAMS ((size_t, enum varray_data_enum, #define VARRAY_GENERIC_PTR_INIT(va, num, name) \ va = varray_init (num, VARRAY_DATA_GENERIC, name) +#define VARRAY_GENERIC_PTR_NOGC_INIT(va, num, name) \ + va = varray_init (num, VARRAY_DATA_GENERIC_NOGC, name) + #define VARRAY_CHAR_PTR_INIT(va, num, name) \ va = varray_init (num, VARRAY_DATA_CPTR, name) @@ -204,13 +216,19 @@ extern varray_type varray_init PARAMS ((size_t, enum varray_data_enum, #define VARRAY_ELT_LIST_INIT(va, num, name) \ va = varray_init (num, VARRAY_DATA_TE, name) +#define VARRAY_EDGE_INIT(va, num, name) \ + va = varray_init (num, VARRAY_DATA_EDGE, name) + +#define VARRAY_TREE_PTR_INIT(va, num, name) \ + va = varray_init (num, VARRAY_DATA_TREE_PTR, name) + /* Free up memory allocated by the virtual array, but do not free any of the elements involved. */ #define VARRAY_FREE(vp) \ do { if (vp) { free (vp); vp = (varray_type) 0; } } while (0) /* Grow/shrink the virtual array VA to N elements. */ -extern varray_type varray_grow PARAMS ((varray_type, size_t)); +extern varray_type varray_grow (varray_type, size_t); #define VARRAY_GROW(VA, N) ((VA) = varray_grow (VA, N)) @@ -221,21 +239,36 @@ extern varray_type varray_grow PARAMS ((varray_type, size_t)); #define VARRAY_CLEAR(VA) varray_clear(VA) -extern void varray_clear PARAMS ((varray_type)); +extern void varray_clear (varray_type); +extern void varray_copy (varray_type v1, varray_type v2); + +extern void dump_varray_statistics (void); /* 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; +extern void varray_check_failed (varray_type, size_t, const char *, int, + const char *) ATTRIBUTE_NORETURN; +extern void varray_underflow (varray_type, const char *, int, const char *) + ATTRIBUTE_NORETURN; #define VARRAY_CHECK(VA, N, T) __extension__ \ (*({ varray_type const _va = (VA); \ - const size_t _n = (N); \ + const size_t _n = (N); \ if (_n >= _va->num_elements) \ varray_check_failed (_va, _n, __FILE__, __LINE__, __FUNCTION__); \ &_va->data.T[_n]; })) + +#define VARRAY_POP(VA) do { \ + varray_type const _va = (VA); \ + if (_va->elements_used == 0) \ + varray_underflow (_va, __FILE__, __LINE__, __FUNCTION__); \ + else \ + _va->elements_used--; \ +} while (0) + #else #define VARRAY_CHECK(VA, N, T) ((VA)->data.T[N]) +/* Pop the top element of VA. */ +#define VARRAY_POP(VA) do { ((VA)->elements_used--); } while (0) #endif /* Push X onto VA. T is the name of the field in varray_data @@ -249,14 +282,6 @@ extern void varray_check_failed PARAMS ((varray_type, size_t, } \ while (0) -/* Pop the top element of VA. */ -#define VARRAY_POP(VA) \ - ((VA)->elements_used--) - -/* Return the top element of VA. */ -#define VARRAY_TOP(VA, T) \ - ((VA)->data.T[(VA)->elements_used - 1]) - #define VARRAY_CHAR(VA, N) VARRAY_CHECK (VA, N, c) #define VARRAY_UCHAR(VA, N) VARRAY_CHECK (VA, N, uc) #define VARRAY_SHORT(VA, N) VARRAY_CHECK (VA, N, s) @@ -268,6 +293,7 @@ extern void varray_check_failed PARAMS ((varray_type, size_t, #define VARRAY_WIDE_INT(VA, N) VARRAY_CHECK (VA, N, hint) #define VARRAY_UWIDE_INT(VA, N) VARRAY_CHECK (VA, N, uhint) #define VARRAY_GENERIC_PTR(VA,N) VARRAY_CHECK (VA, N, generic) +#define VARRAY_GENERIC_PTR_NOGC(VA,N) VARRAY_CHECK (VA, N, generic_nogc) #define VARRAY_CHAR_PTR(VA,N) VARRAY_CHECK (VA, N, cptr) #define VARRAY_RTX(VA, N) VARRAY_CHECK (VA, N, rtx) #define VARRAY_RTVEC(VA, N) VARRAY_CHECK (VA, N, rtvec) @@ -277,6 +303,8 @@ extern void varray_check_failed PARAMS ((varray_type, size_t, #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) +#define VARRAY_EDGE(VA, N) VARRAY_CHECK (VA, N, e) +#define VARRAY_TREE_PTR(VA, N) VARRAY_CHECK (VA, N, tp) /* Push a new element on the end of VA, extending it if necessary. */ #define VARRAY_PUSH_CHAR(VA, X) VARRAY_PUSH (VA, c, X) @@ -290,6 +318,7 @@ extern void varray_check_failed PARAMS ((varray_type, size_t, #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, X) VARRAY_PUSH (VA, generic, X) +#define VARRAY_PUSH_GENERIC_PTR_NOGC(VA, X) VARRAY_PUSH (VA, generic_nogc, 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) @@ -298,8 +327,12 @@ extern void varray_check_failed PARAMS ((varray_type, size_t, #define VARRAY_PUSH_REG(VA, X) VARRAY_PUSH (VA, reg, X) #define VARRAY_PUSH_CONST_EQUIV(VA, X) VARRAY_PUSH (VA, const_equiv, X) #define VARRAY_PUSH_BB(VA, X) VARRAY_PUSH (VA, bb, X) +#define VARRAY_PUSH_EDGE(VA, X) VARRAY_PUSH (VA, e, X) +#define VARRAY_PUSH_TREE_PTR(VA, X) VARRAY_PUSH (VA, tp, X) /* Return the last element of VA. */ +#define VARRAY_TOP(VA, T) VARRAY_CHECK(VA, (VA)->elements_used - 1, T) + #define VARRAY_TOP_CHAR(VA) VARRAY_TOP (VA, c) #define VARRAY_TOP_UCHAR(VA) VARRAY_TOP (VA, uc) #define VARRAY_TOP_SHORT(VA) VARRAY_TOP (VA, s) @@ -311,6 +344,7 @@ extern void varray_check_failed PARAMS ((varray_type, size_t, #define VARRAY_TOP_WIDE_INT(VA) VARRAY_TOP (VA, hint) #define VARRAY_TOP_UWIDE_INT(VA) VARRAY_TOP (VA, uhint) #define VARRAY_TOP_GENERIC_PTR(VA) VARRAY_TOP (VA, generic) +#define VARRAY_TOP_GENERIC_PTR_NOGC(VA) VARRAY_TOP (VA, generic_nogc) #define VARRAY_TOP_CHAR_PTR(VA) VARRAY_TOP (VA, cptr) #define VARRAY_TOP_RTX(VA) VARRAY_TOP (VA, rtx) #define VARRAY_TOP_RTVEC(VA) VARRAY_TOP (VA, rtvec) @@ -319,5 +353,7 @@ extern void varray_check_failed PARAMS ((varray_type, size_t, #define VARRAY_TOP_REG(VA) VARRAY_TOP (VA, reg) #define VARRAY_TOP_CONST_EQUIV(VA) VARRAY_TOP (VA, const_equiv) #define VARRAY_TOP_BB(VA) VARRAY_TOP (VA, bb) +#define VARRAY_TOP_EDGE(VA) VARRAY_TOP (VA, e) +#define VARRAY_TOP_TREE_PTR(VA) VARRAY_TOP (VA, tp) #endif /* ! GCC_VARRAY_H */