X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fir%2Firgraph.c;h=ba6e16effb6ad1473119f737f51b6ce4e5f1bc43;hb=e1d0a7c980faef658ffd4fd63a43e74b764a7dfe;hp=c5d93a071599b20d5e039a29d1756a3a6f9ecd63;hpb=c8e1cf6a41fa2077058cce740783ab78990ac0ab;p=libfirm

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index c5d93a071..ba6e16eff 100644
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -111,10 +111,10 @@ static ir_graph *alloc_graph(void)
  */
 static void free_graph(ir_graph *irg)
 {
-	char *ptr = (char *)irg;
-	int  i;
+	char           *ptr = (char *)irg;
+	ir_edge_kind_t  i;
 
-	for (i = 0; i < EDGE_KIND_LAST; ++i)
+	for (i = EDGE_KIND_FIRST; i < EDGE_KIND_LAST; ++i)
 		edges_deactivate_kind(irg, i);
 	DEL_ARR_F(irg->idx_irn_map);
 	free(ptr - additional_graph_data_size);
@@ -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;
@@ -149,7 +142,7 @@ void irg_set_nloc(ir_graph *res, int n_loc)
 }
 
 /* Allocates a list of nodes:
-    - The start block containing a start node and Proj nodes for it's four
+    - The start block containing a start node and Proj nodes for its four
       results (X, M, P, Tuple).
     - The end block containing an end node. This block is not matured after
       new_ir_graph as predecessors need to be added to it.
@@ -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);
@@ -217,45 +208,40 @@ 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, 0, NULL);
+	set_irg_end(res, end);
 
-	start_block = new_immBlock();
-	set_cur_block(start_block);
+	start_block = new_r_Block_noopt(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;
+	bad = new_r_Bad(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();
+	set_irg_no_mem     (res, new_r_NoMem(res));
+	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_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;
@@ -288,7 +274,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 */
@@ -309,37 +294,31 @@ ir_graph *new_const_code_irg(void)
 	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_noopt(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, 0, NULL);
+	set_irg_end(res, end);
 
 	/* -- The start block -- */
-	start_block        = new_immBlock();
-	set_cur_block(start_block);
+	start_block = new_r_Block_noopt(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;
+	bad = new_r_Bad(res);
 	set_irg_bad(res, bad);
-	no_mem = new_ir_node(NULL, res, start_block, op_NoMem, mode_M, 0, NULL);
+	no_mem = new_r_NoMem(res);
 	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_immBlock();
-	add_immBlock_pred(body_block, projX);
-	mature_immBlock(body_block); /* mature the 'body' block for expressions */
-	set_cur_block(body_block);
+	body_block = new_r_Block(res, 1, &projX);
+
+	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);
@@ -349,8 +328,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;
 }
 
@@ -363,7 +340,7 @@ ir_graph *new_const_code_irg(void)
  */
 static void copy_all_nodes(ir_node *node, void *env)
 {
-	ir_graph *irg      = env;
+	ir_graph *irg      = (ir_graph*)env;
 	ir_node  *new_node = irn_copy_into_irg(node, irg);
 
 	set_irn_link(node, new_node);
@@ -375,7 +352,7 @@ static void copy_all_nodes(ir_node *node, void *env)
 
 		if (is_frame_type(tp)) {
 			/* replace by the copied entity */
-			ent = get_entity_link(ent);
+			ent = (ir_entity*)get_entity_link(ent);
 
 			assert(is_entity(ent));
 			assert(get_entity_owner(ent) == get_irg_frame_type(irg));
@@ -517,7 +494,7 @@ long get_irg_graph_nr(const ir_graph *irg)
 }
 #endif
 
-int get_irg_idx(const ir_graph *irg)
+size_t get_irg_idx(const ir_graph *irg)
 {
 	return irg->index;
 }
@@ -587,16 +564,6 @@ void (set_irg_frame)(ir_graph *irg, ir_node *node)
 	_set_irg_frame(irg, node);
 }
 
-ir_node *(get_irg_tls)(const ir_graph *irg)
-{
-	return _get_irg_tls(irg);
-}
-
-void (set_irg_tls)(ir_graph *irg, ir_node *node)
-{
-	_set_irg_tls(irg, node);
-}
-
 ir_node *(get_irg_initial_mem)(const ir_graph *irg)
 {
 	return _get_irg_initial_mem(irg);
@@ -637,16 +604,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);
@@ -677,10 +634,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. */
@@ -735,7 +689,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);
 }
@@ -777,8 +731,8 @@ void (set_irg_loopinfo_inconsistent)(ir_graph *irg)
 
 void set_irp_loopinfo_inconsistent(void)
 {
-	int i;
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+	size_t i, n;
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		set_irg_loopinfo_inconsistent(get_irp_irg(i));
 	}
 }
@@ -810,19 +764,19 @@ void (set_irg_inline_property)(ir_graph *irg, irg_inline_property s)
 	_set_irg_inline_property(irg, s);
 }
 
-unsigned (get_irg_additional_properties)(const ir_graph *irg)
+mtp_additional_properties (get_irg_additional_properties)(const ir_graph *irg)
 {
 	return _get_irg_additional_properties(irg);
 }
 
-void (set_irg_additional_properties)(ir_graph *irg, unsigned property_mask)
+void (set_irg_additional_properties)(ir_graph *irg, mtp_additional_properties property_mask)
 {
 	_set_irg_additional_properties(irg, property_mask);
 }
 
-void (set_irg_additional_property)(ir_graph *irg, mtp_additional_property flag)
+void (add_irg_additional_properties)(ir_graph *irg, mtp_additional_properties flag)
 {
-	_set_irg_additional_property(irg, flag);
+	_add_irg_additional_properties(irg, flag);
 }
 
 void (set_irg_link)(ir_graph *irg, void *thing)
@@ -872,7 +826,7 @@ void set_max_irg_visited(int val)
 ir_visited_t inc_max_irg_visited(void)
 {
 #ifndef NDEBUG
-	int i;
+	size_t i;
 	for (i = 0; i < get_irp_n_irgs(); i++)
 		assert(max_irg_visited >= get_irg_visited(get_irp_irg(i)));
 #endif
@@ -906,31 +860,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)
 {