X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=ade886f4bcd4ff4060dd31020160198418012cd3;hb=b4647d67ab7885d5da32c2a30242fbc4ed93d81b;hp=0680c7cb08e7bdf303703a05faf3d55f5fb7d3af;hpb=d7337be4ef7938bf403e919f71844215a56e10b2;p=libfirm

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index 0680c7cb0..ade886f4b 100644
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -130,18 +130,11 @@ void irg_set_nloc(ir_graph *res, int n_loc)
 {
 	assert(res->phase_state == phase_building);
 
-	if (get_opt_precise_exc_context()) {
-		res->n_loc = n_loc + 1 + 1; /* number of local variables that are never
-		                               dereferenced in this graph plus one for
-		                               the store plus one for links to fragile
-		                               operations.  n_loc is not the number of
-		                               parameters to the procedure!  */
-	} else {
-		res->n_loc = n_loc + 1;     /* number of local variables that are never
-		                               dereferenced in this graph plus one for
-		                               the store. This is not the number of parameters
-		                               to the procedure!  */
-	}
+	res->n_loc = n_loc + 1;     /* number of local variables that are never
+	                               dereferenced in this graph plus one for
+	                               the store. This is not the number of
+	                               parameters to the procedure!  */
+
 	if (res->loc_descriptions) {
 		xfree(res->loc_descriptions);
 		res->loc_descriptions = NULL;
@@ -168,8 +161,6 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc)
 	/* inform statistics here, as blocks will be already build on this graph */
 	hook_new_graph(res, ent);
 
-	current_ir_graph = res;
-
 	/*-- initialized for each graph. --*/
 	res->kind = k_ir_graph;
 	res->obst = XMALLOC(struct obstack);
@@ -188,8 +179,7 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc)
 
 	res->last_node_idx = 0;
 
-	res->value_table = new_identities(); /* value table for global value
-	                                        numbering for optimizing use in iropt.c */
+	new_identities(res);
 	res->outs = NULL;
 
 	res->inline_property       = irg_inline_any;
@@ -218,45 +208,42 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc)
 	res->frame_type = new_type_frame();
 
 	/* the Anchor node must be created first */
-	res->anchor = new_Anchor(res);
+	res->anchor = new_r_Anchor(res);
 
 	/*-- Nodes needed in every graph --*/
-	set_irg_end_block (res, new_immBlock());
-	set_cur_block(get_irg_end_block(res));
-	end               = new_End();
-	set_irg_end       (res, end);
+	set_irg_end_block (res, new_r_immBlock(res));
+	end = new_r_End(res);
+	set_irg_end(res, end);
 
-	start_block = new_immBlock();
-	set_cur_block(start_block);
+	start_block = new_r_Block(res, 0, NULL);
 	set_irg_start_block(res, start_block);
 	bad = new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL);
 	bad->attr.irg.irg = res;
 	set_irg_bad        (res, bad);
 	set_irg_no_mem     (res, new_ir_node(NULL, res, start_block, op_NoMem, mode_M, 0, NULL));
-	start = new_Start();
+	start = new_r_Start(res);
 	set_irg_start      (res, start);
 
 	/* Proj results of start node */
-	projX                   = new_Proj(start, mode_X, pn_Start_X_initial_exec);
+	projX                   = new_r_Proj(start, mode_X, pn_Start_X_initial_exec);
 	set_irg_initial_exec    (res, projX);
-	set_irg_frame           (res, new_Proj(start, mode_P_data, pn_Start_P_frame_base));
-	set_irg_tls             (res, new_Proj(start, mode_P_data, pn_Start_P_tls));
-	set_irg_args            (res, new_Proj(start, mode_T,      pn_Start_T_args));
-	initial_mem             = new_Proj(start, mode_M, pn_Start_M);
+	set_irg_frame           (res, new_r_Proj(start, mode_P_data, pn_Start_P_frame_base));
+	set_irg_tls             (res, new_r_Proj(start, mode_P_data, pn_Start_P_tls));
+	set_irg_args            (res, new_r_Proj(start, mode_T,      pn_Start_T_args));
+	initial_mem             = new_r_Proj(start, mode_M, pn_Start_M);
 	set_irg_initial_mem(res, initial_mem);
 
-	set_store(initial_mem);
-
 	res->index       = get_irp_new_irg_idx();
 #ifdef DEBUG_libfirm
 	res->graph_nr    = get_irp_new_node_nr();
 #endif
 
-	mature_immBlock(res->current_block);
+	set_r_cur_block(res, start_block);
+	set_r_store(res, initial_mem);
 
 	/*-- Make a block to start with --*/
-	first_block = new_immBlock();
-	set_cur_block(first_block);
+	first_block = new_r_immBlock(res);
+	set_r_cur_block(res, first_block);
 	add_immBlock_pred(first_block, projX);
 
 	res->method_execution_frequency = -1.0;
@@ -289,7 +276,6 @@ ir_graph *new_const_code_irg(void)
 	/* inform statistics here, as blocks will be already build on this graph */
 	hook_new_graph(res, NULL);
 
-	current_ir_graph   = res;
 	res->n_loc         = 1; /* Only the memory. */
 	res->visited       = 0; /* visited flag, for the ir walker */
 	res->block_visited = 0; /* visited flag, for the 'block'-walker */
@@ -305,42 +291,37 @@ ir_graph *new_const_code_irg(void)
 	res->fp_model         = fp_model_precise;
 
 	/* value table for global value numbering for optimizing use in iropt.c */
-	res->value_table = new_identities();
+	new_identities(res);
 	res->ent         = NULL;
 	res->frame_type  = NULL;
 
 	/* the Anchor node must be created first */
-	res->anchor = new_Anchor(res);
+	res->anchor = new_r_Anchor(res);
 
 	/* -- The end block -- */
-	end_block = new_immBlock();
+	end_block = new_r_Block(res, 0, NULL);
 	set_irg_end_block(res, end_block);
-	set_cur_block(end_block);
-	end = new_End();
-	set_irg_end       (res, end);
-	mature_immBlock(end_block);
+	end = new_r_End(res);
+	set_irg_end(res, end);
 
 	/* -- The start block -- */
-	start_block        = new_immBlock();
-	set_cur_block(start_block);
+	start_block = new_r_Block(res, 0, NULL);
 	set_irg_start_block(res, start_block);
 	bad = new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL);
 	bad->attr.irg.irg = res;
 	set_irg_bad(res, bad);
 	no_mem = new_ir_node(NULL, res, start_block, op_NoMem, mode_M, 0, NULL);
 	set_irg_no_mem(res, no_mem);
-	start = new_Start();
+	start = new_r_Start(res);
 	set_irg_start(res, start);
 
 	/* Proj results of start node */
-	set_irg_initial_mem(res, new_Proj(start, mode_M, pn_Start_M));
-	projX = new_Proj(start, mode_X, pn_Start_X_initial_exec);
-	mature_immBlock(start_block);
+	set_irg_initial_mem(res, new_r_Proj(start, mode_M, pn_Start_M));
+	projX = new_r_Proj(start, mode_X, pn_Start_X_initial_exec);
+
+	body_block = new_r_Block(res, 1, &projX);
 
-	body_block = new_immBlock();
-	add_immBlock_pred(body_block, projX);
-	mature_immBlock(body_block); /* mature the 'body' block for expressions */
-	set_cur_block(body_block);
+	set_r_cur_block(res, body_block);
 
 	/* Set the visited flag high enough that the blocks will never be visited. */
 	set_irn_visited(body_block, -1);
@@ -350,8 +331,6 @@ ir_graph *new_const_code_irg(void)
 	set_irn_visited(bad, -1);
 	set_irn_visited(no_mem, -1);
 
-	res->phase_state = phase_high;
-
 	return res;
 }
 
@@ -424,7 +403,7 @@ ir_graph *create_irg_copy(ir_graph *irg)
 	res->extblk_state     = ir_extblk_info_none;
 	res->fp_model         = irg->fp_model;
 
-	res->value_table = new_identities();
+	new_identities(res);
 
 	/* clone the frame type here for safety */
 	irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
@@ -481,8 +460,7 @@ void free_ir_graph(ir_graph *irg)
 		free_irg_outs(irg);
 	if (irg->frame_type)
 		free_type(irg->frame_type);
-	if (irg->value_table)
-		del_identities(irg->value_table);
+	del_identities(irg);
 	if (irg->ent) {
 		set_entity_irg(irg->ent, NULL);  /* not set in const code irg */
 	}
@@ -639,16 +617,6 @@ void (set_irg_no_mem)(ir_graph *irg, ir_node *node)
 	_set_irg_no_mem(irg, node);
 }
 
-ir_node *(get_irg_current_block)(const ir_graph *irg)
-{
-	return _get_irg_current_block(irg);
-}
-
-void (set_irg_current_block)(ir_graph *irg, ir_node *node)
-{
-	_set_irg_current_block(irg, node);
-}
-
 ir_entity *(get_irg_entity)(const ir_graph *irg)
 {
 	return _get_irg_entity(irg);
@@ -679,10 +647,7 @@ ir_type *get_irg_value_param_type(ir_graph *irg)
 
 int get_irg_n_locs(ir_graph *irg)
 {
-	if (get_opt_precise_exc_context())
-		return irg->n_loc - 1 - 1;
-	else
-		return irg->n_loc - 1;
+	return irg->n_loc - 1;
 }
 
 /* Returns the obstack associated with the graph. */
@@ -737,7 +702,7 @@ void (set_irg_outs_inconsistent)(ir_graph *irg)
 	_set_irg_outs_inconsistent(irg);
 }
 
-irg_extblk_state (get_irg_extblk_state)(const ir_graph *irg)
+irg_extblk_info_state (get_irg_extblk_state)(const ir_graph *irg)
 {
 	return _get_irg_extblk_state(irg);
 }
@@ -908,31 +873,6 @@ void set_irg_fp_model(ir_graph *irg, unsigned model)
 	irg->fp_model = model;
 }
 
-/**
- * walker Start->End: places Proj nodes into the same block
- * as it's predecessors
- *
- * @param n    the node
- * @param env  ignored
- */
-static void normalize_proj_walker(ir_node *n, void *env)
-{
-	(void) env;
-	if (is_Proj(n)) {
-		ir_node *pred  = get_Proj_pred(n);
-		ir_node *block = get_nodes_block(pred);
-
-		set_nodes_block(n, block);
-	}
-}
-
-/* move Proj nodes into the same block as its predecessors */
-void normalize_proj_nodes(ir_graph *irg)
-{
-	irg_walk_graph(irg, NULL, normalize_proj_walker, NULL);
-	set_irg_outs_inconsistent(irg);
-}
-
 /* set a description for local value n */
 void set_irg_loc_description(ir_graph *irg, int n, void *description)
 {