2007-05-24 H.J. Lu <hongjiu.lu@intel.com>

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

diff --git a/gcc/cfghooks.h b/gcc/cfghooks.h
index 5c3e610..bd7d1b3 100644 (file)
--- a/gcc/cfghooks.h
+++ b/gcc/cfghooks.h
@@ -47,6 +47,10 @@ struct cfg_hooks
      not be abnormal.  */
   basic_block (*redirect_edge_and_branch_force) (edge, basic_block);
 
+  /* Returns true if it is possible to remove the edge by redirecting it
+     to the destination of the other edge going from its source.  */
+  bool (*can_remove_branch_p) (edge);
+
   /* Remove statements corresponding to a given basic block.  */
   void (*delete_basic_block) (basic_block);
 
@@ -111,27 +115,24 @@ struct cfg_hooks
 
   /* A hook for duplicating loop in CFG, currently this is used
      in loop versioning.  */
-  bool (*cfg_hook_duplicate_loop_to_header_edge) (struct loop *loop, edge e,
-                                                 struct loops *loops,
-                                                 unsigned int ndupl,
-                                                 sbitmap wont_exit,
-                                                 edge orig, edge *to_remove,
-                                                 unsigned int *n_to_remove,
-                                                 int flags);
+  bool (*cfg_hook_duplicate_loop_to_header_edge) (struct loop *, edge,
+                                                 unsigned, sbitmap,
+                                                 edge, VEC (edge, heap) **,
+                                                 int);
 
   /* Add condition to new basic block and update CFG used in loop
      versioning.  */
   void (*lv_add_condition_to_bb) (basic_block, basic_block, basic_block,
-                                 void *);
+                                 void *);
   /* Update the PHI nodes in case of loop versioning.  */
   void (*lv_adjust_loop_header_phi) (basic_block, basic_block,
                                     basic_block, edge);
-                                   
+
   /* Given a condition BB extract the true/false taken/not taken edges
      (depending if we are on tree's or RTL). */
   void (*extract_cond_bb_edges) (basic_block, edge *, edge *);
 
-  
+
   /* Add PHI arguments queued in PENDINT_STMT list on edge E to edge
      E->dest (only in tree-ssa loop versioning.  */
   void (*flush_pending_stmts) (edge);
@@ -141,6 +142,8 @@ extern void verify_flow_info (void);
 extern void dump_bb (basic_block, FILE *, int);
 extern edge redirect_edge_and_branch (edge, basic_block);
 extern basic_block redirect_edge_and_branch_force (edge, basic_block);
+extern bool can_remove_branch_p (edge);
+extern void remove_branch (edge);
 extern edge split_block (basic_block, void *);
 extern edge split_block_after_labels (basic_block);
 extern bool move_block_after (basic_block, basic_block);
@@ -157,18 +160,17 @@ extern void tidy_fallthru_edges (void);
 extern void predict_edge (edge e, enum br_predictor predictor, int probability);
 extern bool predicted_by_p (basic_block bb, enum br_predictor predictor);
 extern bool can_duplicate_block_p (basic_block);
-extern basic_block duplicate_block (basic_block, edge);
+extern basic_block duplicate_block (basic_block, edge, basic_block);
 extern bool block_ends_with_call_p (basic_block bb);
 extern bool block_ends_with_condjump_p (basic_block bb);
 extern int flow_call_edges_add (sbitmap);
 extern void execute_on_growing_pred (edge);
 extern void execute_on_shrinking_pred (edge);
 extern bool cfg_hook_duplicate_loop_to_header_edge (struct loop *loop, edge,
-                                                   struct loops *loops,
                                                    unsigned int ndupl,
                                                    sbitmap wont_exit,
-                                                   edge orig, edge *to_remove,
-                                                   unsigned int *n_to_remove,
+                                                   edge orig,
+                                                   VEC (edge, heap) **to_remove,
                                                    int flags);
 
 extern void lv_flush_pending_stmts (edge);
@@ -184,7 +186,7 @@ extern struct cfg_hooks rtl_cfg_hooks;
 extern struct cfg_hooks cfg_layout_rtl_cfg_hooks;
 
 /* Declarations.  */
-extern int ir_type (void);
+extern enum ir_type current_ir_type (void);
 extern void rtl_register_cfg_hooks (void);
 extern void cfg_layout_rtl_register_cfg_hooks (void);
 extern void tree_register_cfg_hooks (void);