X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk_blk.c;h=3779bece9c80ef1b66d96b594db7b6641aef7636;hb=b4647d67ab7885d5da32c2a30242fbc4ed93d81b;hp=abb7677ccc264a64bcdbbc0abf06ba7e45d474ca;hpb=ea75e9d38674b468f602a0699fb64b9c01254797;p=libfirm

diff --git a/ir/ir/irgwalk_blk.c b/ir/ir/irgwalk_blk.c
index abb7677cc..3779bece9 100644
--- a/ir/ir/irgwalk_blk.c
+++ b/ir/ir/irgwalk_blk.c
@@ -41,7 +41,7 @@
 /**
  * Metadata for block walker
  */
-typedef struct _blk_collect_data_t {
+typedef struct blk_collect_data_t {
 	struct obstack obst;            /**< obstack to allocate objects on */
 	pset           *blk_map;        /**< Hash map: Block -> List */
 	ir_node        **blk_list;      /**< the Block list */
@@ -51,7 +51,7 @@ typedef struct _blk_collect_data_t {
 /**
  * An entry for a block in the blk_map
  */
-typedef struct _block_entry_t {
+typedef struct block_entry_t {
 	ir_node *block;       /**< the block */
 	ir_node **phi_list;   /**< the list of Phi instruction */
 	ir_node **df_list;    /**< the list of data flow instruction */
@@ -267,11 +267,11 @@ static void traverse_dom_blocks_top_down(blk_collect_data_t* blks, irg_walk_func
 	ctx.env  = env;
 
 	if (pre != NULL && post != NULL)
-		dom_tree_walk_irg(current_ir_graph,	dom_block_visit_both, NULL, &ctx);
+		dom_tree_walk_irg(current_ir_graph, dom_block_visit_both, NULL, &ctx);
 	else if (pre != NULL)
-		dom_tree_walk_irg(current_ir_graph,	dom_block_visit_pre, NULL, &ctx);
+		dom_tree_walk_irg(current_ir_graph, dom_block_visit_pre, NULL, &ctx);
 	else if (post != NULL)
-		dom_tree_walk_irg(current_ir_graph,	dom_block_visit_post, NULL, &ctx);
+		dom_tree_walk_irg(current_ir_graph, dom_block_visit_post, NULL, &ctx);
 }
 
 /**
@@ -285,7 +285,7 @@ static void collect_walk(ir_node *node, blk_collect_data_t *env)
 
 	mark_irn_visited(node);
 
-	if (node->op == op_Block) {
+	if (is_Block(node)) {
 		/* predecessors of a block are control flow nodes */
 		for (i = _get_walk_arity(env, node) - 1; i >= 0; --i) {
 			ir_node *pred = _get_walk_irn_n(env, node, i);
@@ -324,7 +324,7 @@ static void collect_walk(ir_node *node, blk_collect_data_t *env)
 				collect_walk(pred, env);
 
 				/* BEWARE: predecessors of End nodes might be blocks */
-				if (is_no_Block(pred)) {
+				if (!is_Block(pred)) {
 					ir_node *blk  = get_nodes_block(pred);
 
 					/*
@@ -362,7 +362,7 @@ static void collect_blks_lists(ir_node *node, ir_node *block,
 			ir_node *pred = _get_walk_irn_n(env, node, i);
 
 			/* BEWARE: predecessors of End nodes might be blocks */
-			if (is_no_Block(pred)) {
+			if (!is_Block(pred)) {
 				ir_node *blk  = get_nodes_block(pred);
 
 				if (!irn_visited(pred)) {
@@ -421,12 +421,6 @@ static void do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre,
 	blk_collect_data_t blks;
 	block_entry_t      *entry;
 
-#ifdef INTERPROCEDURAL_VIEW
-	/* switch off interprocedural view */
-	int old_view       = get_interprocedural_view();
-	set_interprocedural_view(0);
-#endif
-
 	obstack_init(&blks.obst);
 	blks.blk_map     = new_pset(addr_cmp, 1);
 	blks.blk_list    = NEW_ARR_F(ir_node *, 0);
@@ -453,9 +447,6 @@ static void do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre,
 	del_pset(blks.blk_map);
 	obstack_free(&blks.obst, NULL);
 
-#ifdef INTERPROCEDURAL_VIEW
-	set_interprocedural_view(old_view);
-#endif
 	ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 }