gcc/ChangeLog * vecir.h: New file with VEC primitives for tree, gimple, and rtl. * Makefile.in: Add it. Fix all other Makefile dependencies for changes below. * tree.h: Include it instead of defining VEC primitives here. * gimple.h: Likewise. * rtl.h: Likewise. * tree-inline.h: Inlclude vecir.h instead of gimple.h. * except.h: Include vecir.h, break dependence on tree.h. * gimplify.c (append_to_statement_list_1, append_to_statement_list): Move from here... * tree-iterator.c: ...to here. * tree-iterator.h: Fix file introduction comment. Add extern markers. * c-lex.c: Include fixed-value.h instead of rtl.h. Do not include tm_p.h. * c-cppbuiltin.c: Explain why debug.h and tm_p.h are included. * c-objc-common.h: Do not include tm.h, rtl.h, insn-config.h, integrate.h, function.h, toplev.h, tree-inline.h, ggc.h, tree-mudflap.h, and target.h. * c-semantics.c: Do not include except.h, ggc.h, rtl.h, timevar.h, predict.h, tree-inline.h, gimple.h, and langhooks.h. * c-decl.c: Do not include expr.h, ggc.h, libfuncs.h, except.h. Add FIXME for why gimple.h is still included (should be unnecessary since GCC 4.5 gimplification unit-at-a-time). * c-typeck.c: Do not include rtl.h, tm_p.h, ggc.h, and gimple.h. * c-pragma.c: Add FIXME for why function.h needs to be included just for cfun, at front-end level. Add note that REGISTER_TARGET_PRAGMAS should probably be a target hook. Do not include ggc.h, but include vecprim.h for VEC(char). * c-opts.c: Do not include tm.h, tree-inline.h, and tm_p.h. Explain why target.h is included. * c-omp.h: Do not include tm.h, function.h, and bitmap.h. Explain why gimple.h is included. * c-ppoutput.c: Do not include tm.h. * c-common.c: Do not include gimple.h. Explain why expr.h is included. * c-parses.c: Explain why rtl.h is included, and that this (and only this) is also why tm.h must be included. Do not include except.h. * c-lang.c: Do not include ggc.h. cp/ChangeLog * decl.c: Include tree-iterator.h, as fixup for tree-inline.h changes. * Make-lang.in: Fix dependencies accordingly. From-SVN: r159442
122 lines
3.1 KiB
C
122 lines
3.1 KiB
C
/* Iterator routines for manipulating GENERIC tree statement list.
|
|
Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
|
|
Contributed by Andrew MacLeod <amacleod@redhat.com>
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3, or (at your option)
|
|
any later version.
|
|
|
|
GCC is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GCC; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
/* This file is dependent upon the implementation of tree's. It provides an
|
|
abstract interface to the tree objects such that if all tree creation and
|
|
manipulations are done through this interface, we can easily change the
|
|
implementation of tree's, and not impact other code. */
|
|
|
|
#ifndef GCC_TREE_ITERATOR_H
|
|
#define GCC_TREE_ITERATOR_H 1
|
|
|
|
/* Iterator object for GENERIC or GIMPLE TREE statements. */
|
|
|
|
typedef struct {
|
|
struct tree_statement_list_node *ptr;
|
|
tree container;
|
|
} tree_stmt_iterator;
|
|
|
|
static inline tree_stmt_iterator
|
|
tsi_start (tree t)
|
|
{
|
|
tree_stmt_iterator i;
|
|
|
|
i.ptr = STATEMENT_LIST_HEAD (t);
|
|
i.container = t;
|
|
|
|
return i;
|
|
}
|
|
|
|
static inline tree_stmt_iterator
|
|
tsi_last (tree t)
|
|
{
|
|
tree_stmt_iterator i;
|
|
|
|
i.ptr = STATEMENT_LIST_TAIL (t);
|
|
i.container = t;
|
|
|
|
return i;
|
|
}
|
|
|
|
static inline bool
|
|
tsi_end_p (tree_stmt_iterator i)
|
|
{
|
|
return i.ptr == NULL;
|
|
}
|
|
|
|
static inline bool
|
|
tsi_one_before_end_p (tree_stmt_iterator i)
|
|
{
|
|
return i.ptr != NULL && i.ptr->next == NULL;
|
|
}
|
|
|
|
static inline void
|
|
tsi_next (tree_stmt_iterator *i)
|
|
{
|
|
i->ptr = i->ptr->next;
|
|
}
|
|
|
|
static inline void
|
|
tsi_prev (tree_stmt_iterator *i)
|
|
{
|
|
i->ptr = i->ptr->prev;
|
|
}
|
|
|
|
static inline tree *
|
|
tsi_stmt_ptr (tree_stmt_iterator i)
|
|
{
|
|
return &i.ptr->stmt;
|
|
}
|
|
|
|
static inline tree
|
|
tsi_stmt (tree_stmt_iterator i)
|
|
{
|
|
return i.ptr->stmt;
|
|
}
|
|
|
|
enum tsi_iterator_update
|
|
{
|
|
TSI_NEW_STMT, /* Only valid when single statement is added, move
|
|
iterator to it. */
|
|
TSI_SAME_STMT, /* Leave the iterator at the same statement. */
|
|
TSI_CHAIN_START, /* Only valid when chain of statements is added, move
|
|
iterator to the first statement in the chain. */
|
|
TSI_CHAIN_END, /* Only valid when chain of statements is added, move
|
|
iterator to the last statement in the chain. */
|
|
TSI_CONTINUE_LINKING /* Move iterator to whatever position is suitable for
|
|
linking other statements/chains of statements in
|
|
the same direction. */
|
|
};
|
|
|
|
extern void tsi_link_before (tree_stmt_iterator *, tree,
|
|
enum tsi_iterator_update);
|
|
extern void tsi_link_after (tree_stmt_iterator *, tree,
|
|
enum tsi_iterator_update);
|
|
|
|
extern void tsi_delink (tree_stmt_iterator *);
|
|
|
|
extern tree alloc_stmt_list (void);
|
|
extern void free_stmt_list (tree);
|
|
extern void append_to_statement_list (tree, tree *);
|
|
extern void append_to_statement_list_force (tree, tree *);
|
|
|
|
#endif /* GCC_TREE_ITERATOR_H */
|