X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=f6f381a7f6000bfdf5b8ec2ab02085501e616f9b;hb=a08e6f04aa3669cff094f94a9484c7c2bb1314d0;hp=a4b8ae50e96867bf58c917ebadc3b7832f0270b7;hpb=7c36344d22a7c306a4e216f135c974bdb9f6b943;p=libfirm

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index a4b8ae50e..f6f381a7f 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.
  *
@@ -26,9 +26,7 @@
 #include "config.h"
 
 #include <string.h>
-#ifdef HAVE_STDDEF_H
-# include <stddef.h>
-#endif
+#include <stddef.h>
 
 #include "xmalloc.h"
 #include "ircons_t.h"
@@ -75,30 +73,6 @@ void set_current_ir_graph(ir_graph *graph)
 	current_ir_graph = graph;
 }
 
-#ifdef INTERPROCEDURAL_VIEW
-int firm_interprocedural_view = 0;
-
-int (get_interprocedural_view)(void)
-{
-	return _get_interprocedural_view();
-}
-
-void (set_interprocedural_view)(int state)
-{
-	firm_interprocedural_view = state;
-
-	/* set function vectors for faster access */
-	if (state) {
-		_get_irn_arity = _get_irn_inter_arity;
-		_get_irn_n     = _get_irn_inter_n;
-	}
-	else {
-		_get_irn_arity = _get_irn_intra_arity;
-		_get_irn_n     = _get_irn_intra_n;
-	}
-}
-#endif
-
 /** contains the suffix for frame type names */
 static ident *frame_type_suffix = NULL;
 
@@ -137,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);
@@ -156,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;
@@ -175,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.
@@ -187,15 +154,13 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc)
 {
 	ir_graph *res;
 	ir_node  *first_block;
-	ir_node  *end, *start, *start_block, *initial_mem, *projX, *bad;
+	ir_node  *start, *start_block, *initial_mem, *projX;
 
 	res = alloc_graph();
 
 	/* 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);
@@ -214,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;
@@ -244,47 +208,37 @@ 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_reg   (res, end);
-	set_irg_end_except(res, end);
-
-	start_block = new_immBlock();
-	set_cur_block(start_block);
+	set_irg_end_block (res, new_r_immBlock(res));
+	set_irg_end(res, new_r_End(res, 0, NULL));
+
+	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;
-	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;
@@ -305,7 +259,6 @@ ir_graph *new_ir_graph(ir_entity *ent, int n_loc)
 ir_graph *new_const_code_irg(void)
 {
 	ir_graph *res = alloc_graph();
-	ir_node  *bad;
 	ir_node  *body_block;
 	ir_node  *end;
 	ir_node  *end_block;
@@ -317,7 +270,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 */
@@ -333,55 +285,42 @@ 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_noopt(res, 0, NULL);
 	set_irg_end_block(res, end_block);
-	set_cur_block(end_block);
-	end = new_End();
-	set_irg_end       (res, end);
-	set_irg_end_reg   (res, end);
-	set_irg_end_except(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;
-	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_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);
 	set_Block_block_visited(body_block, -1);
 	set_Block_block_visited(start_block, -1);
 	set_irn_visited(start_block, -1);
-	set_irn_visited(bad, -1);
 	set_irn_visited(no_mem, -1);
 
-	res->phase_state = phase_high;
-
 	return res;
 }
 
@@ -394,7 +333,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);
@@ -406,7 +345,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));
@@ -454,7 +393,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);
@@ -473,12 +412,9 @@ ir_graph *create_irg_copy(ir_graph *irg)
 	/* -- The end block -- */
 	set_irg_end_block (res, get_new_node(get_irg_end_block(irg)));
 	set_irg_end       (res, get_new_node(get_irg_end(irg)));
-	set_irg_end_reg   (res, get_new_node(get_irg_end_reg(irg)));
-	set_irg_end_except(res, get_new_node(get_irg_end_except(irg)));
 
 	/* -- The start block -- */
 	set_irg_start_block(res, get_new_node(get_irg_start_block(irg)));
-	set_irg_bad        (res, get_new_node(get_irg_bad(irg)));
 	set_irg_no_mem     (res, get_new_node(get_irg_no_mem(irg)));
 	set_irg_start      (res, get_new_node(get_irg_start(irg)));
 
@@ -513,8 +449,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 */
 	}
@@ -551,12 +486,12 @@ 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;
 }
 
-ir_node *(get_idx_irn)(ir_graph *irg, unsigned idx)
+ir_node *(get_idx_irn)(const ir_graph *irg, unsigned idx)
 {
 	return _get_idx_irn(irg, idx);
 }
@@ -601,27 +536,6 @@ void (set_irg_end)(ir_graph *irg, ir_node *node)
 	_set_irg_end(irg, node);
 }
 
-ir_node *(get_irg_end_reg)(const ir_graph *irg)
-{
-	return _get_irg_end_reg(irg);
-}
-
-void (set_irg_end_reg)(ir_graph *irg, ir_node *node)
-{
-	_set_irg_end_reg(irg, node);
-}
-
-ir_node *(get_irg_end_except)(const ir_graph *irg)
-{
-	return _get_irg_end_except(irg);
-}
-
-void (set_irg_end_except)(ir_graph *irg, ir_node *node)
-{
-	assert(get_irn_op(node) == op_EndExcept || is_End(node));
-	_set_irg_end_except(irg, node);
-}
-
 ir_node *(get_irg_initial_exec)(const ir_graph *irg)
 {
 	return _get_irg_initial_exec(irg);
@@ -642,16 +556,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);
@@ -672,16 +576,6 @@ void (set_irg_args)(ir_graph *irg, ir_node *node)
 	_set_irg_args(irg, node);
 }
 
-ir_node *(get_irg_bad)(const ir_graph *irg)
-{
-	return _get_irg_bad(irg);
-}
-
-void (set_irg_bad)(ir_graph *irg, ir_node *node)
-{
-	_set_irg_bad(irg, node);
-}
-
 ir_node *(get_irg_no_mem)(const ir_graph *irg)
 {
 	return _get_irg_no_mem(irg);
@@ -692,16 +586,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);
@@ -732,10 +616,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. */
@@ -749,7 +630,7 @@ struct obstack *
  *
  * Implementation is GLIBC specific as is uses the internal _obstack_chunk implementation.
  */
-int node_is_in_irgs_storage(ir_graph *irg, ir_node *n)
+int node_is_in_irgs_storage(const ir_graph *irg, const ir_node *n)
 {
 	struct _obstack_chunk *p;
 
@@ -790,7 +671,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);
 }
@@ -832,8 +713,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));
 	}
 }
@@ -865,19 +746,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)
@@ -927,7 +808,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
@@ -961,31 +842,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)
 {