basic-block.h (struct edge_def): Use basic_block instead of basic_block_def *.
* basic-block.h (struct edge_def): Use basic_block instead of basic_block_def *. * cfgloop.h (struct loop_exit, struct loop): Likewise. * gengenrtl.c (type_from_format): Likewise. Also for 'tree' instead of union tree_node *. * rtl.h (union rtunion_def, emit_insn_before_noloc, emit_insn_after_noloc, add_insn_before, add_insn_after, debug_bb_slim): Likewise. * tree-inline.h (struct copy_body_data): Likewise. * sched-rgn.c (dump_region_dot): Likewise. * gimple.h (struct gimple_statement_base, gimple_set_bb, gsi_move_to_bb_end): Likewise. * sched-vis.c (debug_bb_slim): Likewise. (debug_bb_n_slim): Likewise. * config/mn10300/mn10300.c (mn10300_insert_setlb_lcc): Likewise. (mn10300_block_contains_call): From-SVN: r189424
This commit is contained in:
parent
c48acc4f0a
commit
b8244d74e1
10 changed files with 43 additions and 24 deletions
|
@ -1,3 +1,22 @@
|
|||
2012-07-11 Steven Bosscher <steven@gcc.gnu.org>
|
||||
|
||||
* basic-block.h (struct edge_def): Use basic_block instead of
|
||||
basic_block_def *.
|
||||
* cfgloop.h (struct loop_exit, struct loop): Likewise.
|
||||
* gengenrtl.c (type_from_format): Likewise. Also for 'tree'
|
||||
instead of union tree_node *.
|
||||
* rtl.h (union rtunion_def, emit_insn_before_noloc,
|
||||
emit_insn_after_noloc, add_insn_before, add_insn_after,
|
||||
debug_bb_slim): Likewise.
|
||||
* tree-inline.h (struct copy_body_data): Likewise.
|
||||
* sched-rgn.c (dump_region_dot): Likewise.
|
||||
* gimple.h (struct gimple_statement_base, gimple_set_bb,
|
||||
gsi_move_to_bb_end): Likewise.
|
||||
* sched-vis.c (debug_bb_slim): Likewise.
|
||||
(debug_bb_n_slim): Likewise.
|
||||
* config/mn10300/mn10300.c (mn10300_insert_setlb_lcc): Likewise.
|
||||
(mn10300_block_contains_call):
|
||||
|
||||
2012-07-11 Greta Yorsh <Greta.Yorsh@arm.com>
|
||||
|
||||
PR target/53859
|
||||
|
|
|
@ -35,8 +35,8 @@ typedef HOST_WIDEST_INT gcov_type;
|
|||
/* Control flow edge information. */
|
||||
struct GTY(()) edge_def {
|
||||
/* The two blocks at the ends of the edge. */
|
||||
struct basic_block_def *src;
|
||||
struct basic_block_def *dest;
|
||||
basic_block src;
|
||||
basic_block dest;
|
||||
|
||||
/* Instructions queued on the edge. */
|
||||
union edge_def_insns {
|
||||
|
@ -161,8 +161,8 @@ struct GTY((chain_next ("%h.next_bb"), chain_prev ("%h.prev_bb"))) basic_block_d
|
|||
struct et_node * GTY ((skip (""))) dom[2];
|
||||
|
||||
/* Previous and next blocks in the chain. */
|
||||
struct basic_block_def *prev_bb;
|
||||
struct basic_block_def *next_bb;
|
||||
basic_block prev_bb;
|
||||
basic_block next_bb;
|
||||
|
||||
union basic_block_il_dependent {
|
||||
struct gimple_bb_info GTY ((tag ("0"))) gimple;
|
||||
|
|
|
@ -80,7 +80,7 @@ struct GTY ((chain_next ("%h.next"))) nb_iter_bound {
|
|||
|
||||
struct GTY (()) loop_exit {
|
||||
/* The exit edge. */
|
||||
struct edge_def *e;
|
||||
edge e;
|
||||
|
||||
/* Previous and next exit in the list of the exits of the loop. */
|
||||
struct loop_exit *prev;
|
||||
|
@ -114,10 +114,10 @@ struct GTY ((chain_next ("%h.next"))) loop {
|
|||
unsigned ninsns;
|
||||
|
||||
/* Basic block of loop header. */
|
||||
struct basic_block_def *header;
|
||||
basic_block header;
|
||||
|
||||
/* Basic block of loop latch. */
|
||||
struct basic_block_def *latch;
|
||||
basic_block latch;
|
||||
|
||||
/* For loop unrolling/peeling decision. */
|
||||
struct lpt_decision lpt_decision;
|
||||
|
|
|
@ -3178,7 +3178,7 @@ mn10300_insert_setlb_lcc (rtx label, rtx branch)
|
|||
}
|
||||
|
||||
static bool
|
||||
mn10300_block_contains_call (struct basic_block_def * block)
|
||||
mn10300_block_contains_call (basic_block block)
|
||||
{
|
||||
rtx insn;
|
||||
|
||||
|
|
|
@ -64,9 +64,9 @@ type_from_format (int c)
|
|||
case 'E':
|
||||
return "rtvec ";
|
||||
case 't':
|
||||
return "union tree_node *"; /* tree - typedef not available */
|
||||
return "tree ";
|
||||
case 'B':
|
||||
return "struct basic_block_def *"; /* basic block - typedef not available */
|
||||
return "basic_block ";
|
||||
default:
|
||||
gcc_unreachable ();
|
||||
}
|
||||
|
|
|
@ -200,7 +200,7 @@ struct GTY(()) gimple_statement_base {
|
|||
|
||||
/* [ WORD 3 ]
|
||||
Basic block holding this statement. */
|
||||
struct basic_block_def *bb;
|
||||
basic_block bb;
|
||||
|
||||
/* [ WORD 4-5 ]
|
||||
Linked lists of gimple statements. The next pointers form
|
||||
|
@ -818,7 +818,7 @@ void gimple_call_reset_alias_info (gimple);
|
|||
bool gimple_assign_copy_p (gimple);
|
||||
bool gimple_assign_ssa_name_copy_p (gimple);
|
||||
bool gimple_assign_unary_nop_p (gimple);
|
||||
void gimple_set_bb (gimple, struct basic_block_def *);
|
||||
void gimple_set_bb (gimple, basic_block);
|
||||
void gimple_assign_set_rhs_from_tree (gimple_stmt_iterator *, tree);
|
||||
void gimple_assign_set_rhs_with_ops_1 (gimple_stmt_iterator *, enum tree_code,
|
||||
tree, tree, tree);
|
||||
|
@ -1186,7 +1186,7 @@ gimple_has_substatements (gimple g)
|
|||
|
||||
/* Return the basic block holding statement G. */
|
||||
|
||||
static inline struct basic_block_def *
|
||||
static inline basic_block
|
||||
gimple_bb (const_gimple g)
|
||||
{
|
||||
return g->gsbase.bb;
|
||||
|
@ -5190,7 +5190,7 @@ bool gsi_remove (gimple_stmt_iterator *, bool);
|
|||
gimple_stmt_iterator gsi_for_stmt (gimple);
|
||||
void gsi_move_after (gimple_stmt_iterator *, gimple_stmt_iterator *);
|
||||
void gsi_move_before (gimple_stmt_iterator *, gimple_stmt_iterator *);
|
||||
void gsi_move_to_bb_end (gimple_stmt_iterator *, struct basic_block_def *);
|
||||
void gsi_move_to_bb_end (gimple_stmt_iterator *, basic_block);
|
||||
void gsi_insert_on_edge (edge, gimple);
|
||||
void gsi_insert_seq_on_edge (edge, gimple_seq);
|
||||
basic_block gsi_insert_on_edge_immediate (edge, gimple);
|
||||
|
|
12
gcc/rtl.h
12
gcc/rtl.h
|
@ -196,7 +196,7 @@ union rtunion_def
|
|||
addr_diff_vec_flags rt_addr_diff_vec_flags;
|
||||
struct cselib_val_struct *rt_cselib;
|
||||
tree rt_tree;
|
||||
struct basic_block_def *rt_bb;
|
||||
basic_block rt_bb;
|
||||
mem_attrs *rt_mem;
|
||||
reg_attrs *rt_reg;
|
||||
struct constant_descriptor_rtx *rt_constant;
|
||||
|
@ -1735,7 +1735,7 @@ extern rtx assign_temp (tree, int, int);
|
|||
|
||||
/* In emit-rtl.c */
|
||||
extern rtx emit_insn_before (rtx, rtx);
|
||||
extern rtx emit_insn_before_noloc (rtx, rtx, struct basic_block_def *);
|
||||
extern rtx emit_insn_before_noloc (rtx, rtx, basic_block);
|
||||
extern rtx emit_insn_before_setloc (rtx, rtx, int);
|
||||
extern rtx emit_jump_insn_before (rtx, rtx);
|
||||
extern rtx emit_jump_insn_before_noloc (rtx, rtx);
|
||||
|
@ -1750,7 +1750,7 @@ extern rtx emit_barrier_before (rtx);
|
|||
extern rtx emit_label_before (rtx, rtx);
|
||||
extern rtx emit_note_before (enum insn_note, rtx);
|
||||
extern rtx emit_insn_after (rtx, rtx);
|
||||
extern rtx emit_insn_after_noloc (rtx, rtx, struct basic_block_def *);
|
||||
extern rtx emit_insn_after_noloc (rtx, rtx, basic_block);
|
||||
extern rtx emit_insn_after_setloc (rtx, rtx, int);
|
||||
extern rtx emit_jump_insn_after (rtx, rtx);
|
||||
extern rtx emit_jump_insn_after_noloc (rtx, rtx);
|
||||
|
@ -2435,8 +2435,8 @@ extern void unshare_all_rtl_in_chain (rtx);
|
|||
extern void verify_rtl_sharing (void);
|
||||
extern void link_cc0_insns (rtx);
|
||||
extern void add_insn (rtx);
|
||||
extern void add_insn_before (rtx, rtx, struct basic_block_def *);
|
||||
extern void add_insn_after (rtx, rtx, struct basic_block_def *);
|
||||
extern void add_insn_before (rtx, rtx, basic_block);
|
||||
extern void add_insn_after (rtx, rtx, basic_block);
|
||||
extern void remove_insn (rtx);
|
||||
extern rtx emit (rtx);
|
||||
extern void delete_insn (rtx);
|
||||
|
@ -2463,7 +2463,7 @@ extern void delete_dead_jumptables (void);
|
|||
|
||||
/* In sched-vis.c. */
|
||||
extern void debug_bb_n_slim (int);
|
||||
extern void debug_bb_slim (struct basic_block_def *);
|
||||
extern void debug_bb_slim (basic_block);
|
||||
extern void print_rtl_slim (FILE *, rtx, rtx, int, int);
|
||||
extern void print_rtl_slim_with_bb (FILE *, rtx, int);
|
||||
extern void dump_insn_slim (FILE *f, rtx x);
|
||||
|
|
|
@ -435,7 +435,7 @@ dump_region_dot (FILE *f, int rgn)
|
|||
edge e;
|
||||
edge_iterator ei;
|
||||
int src_bb_num = rgn_bb_table[current_blocks + i];
|
||||
struct basic_block_def *bb = BASIC_BLOCK (src_bb_num);
|
||||
basic_block bb = BASIC_BLOCK (src_bb_num);
|
||||
|
||||
FOR_EACH_EDGE (e, ei, bb->succs)
|
||||
if (bb_in_region_p (e->dest->index, rgn))
|
||||
|
|
|
@ -833,7 +833,7 @@ print_rtl_slim (FILE *f, rtx first, rtx last, int count, int flags)
|
|||
}
|
||||
|
||||
DEBUG_FUNCTION void
|
||||
debug_bb_slim (struct basic_block_def *bb)
|
||||
debug_bb_slim (basic_block bb)
|
||||
{
|
||||
print_rtl_slim (stderr, BB_HEAD (bb), BB_END (bb), -1, 32);
|
||||
}
|
||||
|
@ -841,7 +841,7 @@ debug_bb_slim (struct basic_block_def *bb)
|
|||
DEBUG_FUNCTION void
|
||||
debug_bb_n_slim (int n)
|
||||
{
|
||||
struct basic_block_def *bb = BASIC_BLOCK (n);
|
||||
basic_block bb = BASIC_BLOCK (n);
|
||||
debug_bb_slim (bb);
|
||||
}
|
||||
|
||||
|
|
|
@ -116,7 +116,7 @@ typedef struct copy_body_data
|
|||
struct pointer_set_t *statements_to_fold;
|
||||
|
||||
/* Entry basic block to currently copied body. */
|
||||
struct basic_block_def *entry_bb;
|
||||
basic_block entry_bb;
|
||||
|
||||
/* Debug statements that need processing. */
|
||||
VEC(gimple,heap) *debug_stmts;
|
||||
|
|
Loading…
Add table
Reference in a new issue