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

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index ba6e16eff..c3b08605c 100644
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -21,7 +21,6 @@
  * @file
  * @brief    Entry point to the representation of procedure code.
  * @author   Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck
- * @version  $Id$
  */
 #include "config.h"
 
@@ -41,12 +40,12 @@
 #include "irouts.h"
 #include "irhooks.h"
 #include "irtools.h"
+#include "util.h"
 #include "irgwalk.h"
 #include "irbackedge_t.h"
 #include "iredges_t.h"
 #include "type_t.h"
 #include "irmemory.h"
-#include "irphase.h"
 
 #define INITIAL_IDX_IRN_MAP_SIZE 1024
 
@@ -76,7 +75,6 @@ void set_current_ir_graph(ir_graph *graph)
 /** contains the suffix for frame type names */
 static ident *frame_type_suffix = NULL;
 
-/* initialize the IR graph module */
 void firm_init_irgraph(void)
 {
 	frame_type_suffix = new_id_from_str(FRAME_TP_SUFFIX);
@@ -120,12 +118,6 @@ static void free_graph(ir_graph *irg)
 	free(ptr - additional_graph_data_size);
 }
 
-/**
- * Set the number of locals for a given graph.
- *
- * @param irg    the graph
- * @param n_loc  number of locals
- */
 void irg_set_nloc(ir_graph *res, int n_loc)
 {
 	assert(res->phase_state == phase_building);
@@ -141,20 +133,11 @@ 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 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.
-    - The current block, which is empty and also not matured.
-   Further it allocates several datastructures needed for graph construction
-   and optimization.
-*/
 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();
 
@@ -186,18 +169,11 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc)
 	res->additional_properties = mtp_property_inherited;  /* inherited from type */
 
 	res->irg_pinned_state    = op_pin_state_pinned;
-	res->outs_state          = outs_none;
-	res->dom_state           = dom_none;
-	res->pdom_state          = dom_none;
 	res->typeinfo_state      = ir_typeinfo_none;
 	set_irp_typeinfo_inconsistent();           /* there is a new graph with typeinfo_none. */
 	res->callee_info_state   = irg_callee_info_none;
-	res->loopinfo_state      = loopinfo_none;
 	res->class_cast_state    = ir_class_casts_transitive;
-	res->extblk_state        = ir_extblk_info_none;
-	res->execfreq_state      = exec_freq_none;
 	res->fp_model            = fp_model_precise;
-	res->entity_usage_state  = ir_entity_usage_not_computed;
 	res->mem_disambig_opt    = aa_opt_inherited;
 
 	/*-- Type information for the procedure of the graph --*/
@@ -211,14 +187,11 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc)
 	res->anchor = new_r_Anchor(res);
 
 	/*-- Nodes needed in every graph --*/
-	set_irg_end_block (res, new_r_immBlock(res));
-	end = new_r_End(res, 0, NULL);
-	set_irg_end(res, end);
+	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_r_Bad(res);
-	set_irg_bad        (res, bad);
 	set_irg_no_mem     (res, new_r_NoMem(res));
 	start = new_r_Start(res);
 	set_irg_start      (res, start);
@@ -240,9 +213,8 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc)
 	set_r_store(res, initial_mem);
 
 	/*-- Make a block to start with --*/
-	first_block = new_r_immBlock(res);
+	first_block = new_r_Block(res, 1, &projX);
 	set_r_cur_block(res, first_block);
-	add_immBlock_pred(first_block, projX);
 
 	res->method_execution_frequency = -1.0;
 	res->estimated_node_count       = 0;
@@ -257,12 +229,9 @@ ir_graph *new_ir_graph(ir_entity *ent, int n_loc)
 	return res;
 }
 
-/* Make a rudimentary IR graph for the constant code.
-   Must look like a correct irg, spare everything else. */
 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;
@@ -285,7 +254,6 @@ ir_graph *new_const_code_irg(void)
 
 	res->phase_state      = phase_building;
 	res->irg_pinned_state = op_pin_state_pinned;
-	res->extblk_state     = ir_extblk_info_none;
 	res->fp_model         = fp_model_precise;
 
 	/* value table for global value numbering for optimizing use in iropt.c */
@@ -305,8 +273,6 @@ ir_graph *new_const_code_irg(void)
 	/* -- The start block -- */
 	start_block = new_r_Block_noopt(res, 0, NULL);
 	set_irg_start_block(res, start_block);
-	bad = new_r_Bad(res);
-	set_irg_bad(res, bad);
 	no_mem = new_r_NoMem(res);
 	set_irg_no_mem(res, no_mem);
 	start = new_r_Start(res);
@@ -325,8 +291,6 @@ ir_graph *new_const_code_irg(void)
 	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);
 
 	return res;
 }
@@ -377,9 +341,6 @@ static ir_node *get_new_node(const ir_node *old_node)
 	return (ir_node*) get_irn_link(old_node);
 }
 
-/*
- * Create a new graph that is a copy of a given one.
- */
 ir_graph *create_irg_copy(ir_graph *irg)
 {
 	ir_graph *res;
@@ -397,13 +358,12 @@ ir_graph *create_irg_copy(ir_graph *irg)
 
 	res->phase_state      = irg->phase_state;
 	res->irg_pinned_state = irg->irg_pinned_state;
-	res->extblk_state     = ir_extblk_info_none;
 	res->fp_model         = irg->fp_model;
 
 	new_identities(res);
 
 	/* clone the frame type here for safety */
-	irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
+	irp_reserve_resources(irp, IRP_RESOURCE_ENTITY_LINK);
 	res->frame_type  = clone_frame_type(irg->frame_type);
 
 	res->phase_state = irg->phase_state;
@@ -422,7 +382,6 @@ ir_graph *create_irg_copy(ir_graph *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)));
 
@@ -434,18 +393,11 @@ ir_graph *create_irg_copy(ir_graph *irg)
 	res->estimated_node_count = irg->estimated_node_count;
 
 	ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
-	irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
+	irp_free_resources(irp, IRP_RESOURCE_ENTITY_LINK);
 
 	return res;
 }
 
-/* Frees the passed irgraph.
-   Deallocates all nodes in this graph and the ir_graph structure.
-   Sets the field irgraph in the corresponding entity to NULL.
-   Does not remove the irgraph from the list in irprog (requires
-   inefficient search, call remove_irp_irg by hand).
-   Does not free types, entities or modes that are used only by this
-   graph, nor the entity standing for this graph. */
 void free_ir_graph(ir_graph *irg)
 {
 	assert(is_ir_graph(irg));
@@ -453,17 +405,14 @@ void free_ir_graph(ir_graph *irg)
 	edges_deactivate(irg);
 
 	hook_free_graph(irg);
-	if (irg->outs_state != outs_none)
-		free_irg_outs(irg);
-	if (irg->frame_type)
-		free_type(irg->frame_type);
+	free_irg_outs(irg);
 	del_identities(irg);
 	if (irg->ent) {
 		set_entity_irg(irg->ent, NULL);  /* not set in const code irg */
 	}
 
 	free_End(get_irg_end(irg));
-	obstack_free(irg->obst,NULL);
+	obstack_free(irg->obst, NULL);
 	free(irg->obst);
 	if (irg->loc_descriptions)
 		free(irg->loc_descriptions);
@@ -471,18 +420,12 @@ void free_ir_graph(ir_graph *irg)
 	free_graph(irg);
 }
 
-/* access routines for all ir_graph attributes:
-   templates:
-   {attr type} get_irg_{attribute name} (ir_graph *irg);
-   void set_irg_{attr name} (ir_graph *irg, {attr type} {attr}); */
-
 int (is_ir_graph)(const void *thing)
 {
-	return _is_ir_graph(thing);
+	return is_ir_graph_(thing);
 }
 
 #ifdef DEBUG_libfirm
-/* Outputs a unique number for this node */
 long get_irg_graph_nr(const ir_graph *irg)
 {
 	return irg->graph_nr;
@@ -499,137 +442,119 @@ 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);
+	return get_idx_irn_(irg, idx);
 }
 
 ir_node *(get_irg_start_block)(const ir_graph *irg)
 {
-	return _get_irg_start_block(irg);
+	return get_irg_start_block_(irg);
 }
 
 void (set_irg_start_block)(ir_graph *irg, ir_node *node)
 {
-	_set_irg_start_block(irg, node);
+	set_irg_start_block_(irg, node);
 }
 
 ir_node *(get_irg_start)(const ir_graph *irg)
 {
-	return _get_irg_start(irg);
+	return get_irg_start_(irg);
 }
 
 void (set_irg_start)(ir_graph *irg, ir_node *node)
 {
-	_set_irg_start(irg, node);
+	set_irg_start_(irg, node);
 }
 
 ir_node *(get_irg_end_block)(const ir_graph *irg)
 {
-	return _get_irg_end_block(irg);
+	return get_irg_end_block_(irg);
 }
 
 void (set_irg_end_block)(ir_graph *irg, ir_node *node)
 {
-  _set_irg_end_block(irg, node);
+	set_irg_end_block_(irg, node);
 }
 
 ir_node *(get_irg_end)(const ir_graph *irg)
 {
-	return _get_irg_end(irg);
+	return get_irg_end_(irg);
 }
 
 void (set_irg_end)(ir_graph *irg, ir_node *node)
 {
-	_set_irg_end(irg, node);
+	set_irg_end_(irg, node);
 }
 
 ir_node *(get_irg_initial_exec)(const ir_graph *irg)
 {
-	return _get_irg_initial_exec(irg);
+	return get_irg_initial_exec_(irg);
 }
 
 void (set_irg_initial_exec)(ir_graph *irg, ir_node *node)
 {
-	_set_irg_initial_exec(irg, node);
+	set_irg_initial_exec_(irg, node);
 }
 
 ir_node *(get_irg_frame)(const ir_graph *irg)
 {
-	return _get_irg_frame(irg);
+	return get_irg_frame_(irg);
 }
 
 void (set_irg_frame)(ir_graph *irg, ir_node *node)
 {
-	_set_irg_frame(irg, node);
+	set_irg_frame_(irg, node);
 }
 
 ir_node *(get_irg_initial_mem)(const ir_graph *irg)
 {
-	return _get_irg_initial_mem(irg);
+	return get_irg_initial_mem_(irg);
 }
 
 void (set_irg_initial_mem)(ir_graph *irg, ir_node *node)
 {
-	_set_irg_initial_mem(irg, node);
+	set_irg_initial_mem_(irg, node);
 }
 
 ir_node *(get_irg_args)(const ir_graph *irg)
 {
-	return _get_irg_args(irg);
+	return get_irg_args_(irg);
 }
 
 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);
+	set_irg_args_(irg, node);
 }
 
 ir_node *(get_irg_no_mem)(const ir_graph *irg)
 {
-	return _get_irg_no_mem(irg);
+	return get_irg_no_mem_(irg);
 }
 
 void (set_irg_no_mem)(ir_graph *irg, ir_node *node)
 {
-	_set_irg_no_mem(irg, node);
+	set_irg_no_mem_(irg, node);
 }
 
 ir_entity *(get_irg_entity)(const ir_graph *irg)
 {
-	return _get_irg_entity(irg);
+	return get_irg_entity_(irg);
 }
 
 void (set_irg_entity)(ir_graph *irg, ir_entity *ent)
 {
-	_set_irg_entity(irg, ent);
+	set_irg_entity_(irg, ent);
 }
 
 ir_type *(get_irg_frame_type)(ir_graph *irg)
 {
-	return _get_irg_frame_type(irg);
+	return get_irg_frame_type_(irg);
 }
 
 void (set_irg_frame_type)(ir_graph *irg, ir_type *ftp)
 {
-	_set_irg_frame_type(irg, ftp);
-}
-
-/* Returns the value parameter type of an IR graph. */
-ir_type *get_irg_value_param_type(ir_graph *irg)
-{
-	ir_entity *ent = get_irg_entity(irg);
-	ir_type   *mtp = get_entity_type(ent);
-	return get_method_value_param_type(mtp);
+	set_irg_frame_type_(irg, ftp);
 }
 
 int get_irg_n_locs(ir_graph *irg)
@@ -637,18 +562,12 @@ int get_irg_n_locs(ir_graph *irg)
 	return irg->n_loc - 1;
 }
 
-/* Returns the obstack associated with the graph. */
-struct obstack *
-(get_irg_obstack)(const ir_graph *irg) {
-	return _get_irg_obstack(irg);
+struct obstack *(get_irg_obstack)(const ir_graph *irg)
+{
+	return get_irg_obstack_(irg);
 }
 
-/*
- * Returns true if the node n is allocated on the storage of graph irg.
- *
- * 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;
 
@@ -666,132 +585,72 @@ int node_is_in_irgs_storage(ir_graph *irg, ir_node *n)
 
 irg_phase_state (get_irg_phase_state)(const ir_graph *irg)
 {
-	return _get_irg_phase_state(irg);
+	return get_irg_phase_state_(irg);
 }
 
 void (set_irg_phase_state)(ir_graph *irg, irg_phase_state state)
 {
-	_set_irg_phase_state(irg, state);
+	set_irg_phase_state_(irg, state);
 }
 
 op_pin_state (get_irg_pinned)(const ir_graph *irg)
 {
-	return _get_irg_pinned(irg);
-}
-
-irg_outs_state (get_irg_outs_state)(const ir_graph *irg)
-{
-	return _get_irg_outs_state(irg);
-}
-
-void (set_irg_outs_inconsistent)(ir_graph *irg)
-{
-	_set_irg_outs_inconsistent(irg);
-}
-
-irg_extblk_info_state (get_irg_extblk_state)(const ir_graph *irg)
-{
-	return _get_irg_extblk_state(irg);
-}
-
-void (set_irg_extblk_inconsistent)(ir_graph *irg)
-{
-	_set_irg_extblk_inconsistent(irg);
+	return get_irg_pinned_(irg);
 }
 
-irg_dom_state (get_irg_dom_state)(const ir_graph *irg)
-{
-	return _get_irg_dom_state(irg);
-}
-
-irg_dom_state (get_irg_postdom_state)(const ir_graph *irg)
-{
-	return _get_irg_postdom_state(irg);
-}
-
-void (set_irg_doms_inconsistent)(ir_graph *irg)
-{
-	_set_irg_doms_inconsistent(irg);
-}
-
-irg_loopinfo_state (get_irg_loopinfo_state)(const ir_graph *irg)
-{
-	return _get_irg_loopinfo_state(irg);
-}
-
-void (set_irg_loopinfo_state)(ir_graph *irg, irg_loopinfo_state s)
-{
-	_set_irg_loopinfo_state(irg, s);
-}
-
-void (set_irg_loopinfo_inconsistent)(ir_graph *irg)
-{
-	_set_irg_loopinfo_inconsistent(irg);
-}
-
-void set_irp_loopinfo_inconsistent(void)
-{
-	size_t i, n;
-	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
-		set_irg_loopinfo_inconsistent(get_irp_irg(i));
-	}
-}
-
-
-
 void (set_irg_pinned)(ir_graph *irg, op_pin_state p)
 {
-	_set_irg_pinned(irg, p);
+	set_irg_pinned_(irg, p);
 }
 
 irg_callee_info_state (get_irg_callee_info_state)(const ir_graph *irg)
 {
-	return _get_irg_callee_info_state(irg);
+	return get_irg_callee_info_state_(irg);
 }
 
 void (set_irg_callee_info_state)(ir_graph *irg, irg_callee_info_state s)
 {
-	_set_irg_callee_info_state(irg, s);
+	set_irg_callee_info_state_(irg, s);
 }
 
 irg_inline_property (get_irg_inline_property)(const ir_graph *irg)
 {
-	return _get_irg_inline_property(irg);
+	return get_irg_inline_property_(irg);
 }
 
 void (set_irg_inline_property)(ir_graph *irg, irg_inline_property s)
 {
-	_set_irg_inline_property(irg, s);
+	set_irg_inline_property_(irg, s);
 }
 
 mtp_additional_properties (get_irg_additional_properties)(const ir_graph *irg)
 {
-	return _get_irg_additional_properties(irg);
+	return get_irg_additional_properties_(irg);
 }
 
 void (set_irg_additional_properties)(ir_graph *irg, mtp_additional_properties property_mask)
 {
-	_set_irg_additional_properties(irg, property_mask);
+	set_irg_additional_properties_(irg, property_mask);
 }
 
 void (add_irg_additional_properties)(ir_graph *irg, mtp_additional_properties flag)
 {
-	_add_irg_additional_properties(irg, flag);
+	add_irg_additional_properties_(irg, flag);
 }
 
 void (set_irg_link)(ir_graph *irg, void *thing)
 {
-	_set_irg_link(irg, thing);
+	set_irg_link_(irg, thing);
 }
 
 void *(get_irg_link)(const ir_graph *irg)
 {
-	return _get_irg_link(irg);
+	return get_irg_link_(irg);
 }
 
 ir_visited_t (get_irg_visited)(const ir_graph *irg)
 {
-	return _get_irg_visited(irg);
+	return get_irg_visited_(irg);
 }
 
 /** maximum visited flag content of all ir_graph visited fields. */
@@ -835,32 +694,29 @@ ir_visited_t inc_max_irg_visited(void)
 
 ir_visited_t (get_irg_block_visited)(const ir_graph *irg)
 {
-	return _get_irg_block_visited(irg);
+	return get_irg_block_visited_(irg);
 }
 
 void (set_irg_block_visited)(ir_graph *irg, ir_visited_t visited)
 {
-	_set_irg_block_visited(irg, visited);
+	set_irg_block_visited_(irg, visited);
 }
 
 void (inc_irg_block_visited)(ir_graph *irg)
 {
-  _inc_irg_block_visited(irg);
+  inc_irg_block_visited_(irg);
 }
 
-/* Return the floating point model of this graph. */
 unsigned (get_irg_fp_model)(const ir_graph *irg)
 {
-	return _get_irg_fp_model(irg);
+	return get_irg_fp_model_(irg);
 }
 
-/* Sets the floating point model for this graph. */
 void set_irg_fp_model(ir_graph *irg, unsigned model)
 {
 	irg->fp_model = model;
 }
 
-/* set a description for local value n */
 void set_irg_loc_description(ir_graph *irg, int n, void *description)
 {
 	assert(0 <= n && n < irg->n_loc);
@@ -871,37 +727,15 @@ void set_irg_loc_description(ir_graph *irg, int n, void *description)
 	irg->loc_descriptions[n] = description;
 }
 
-/* get the description for local value n */
 void *get_irg_loc_description(ir_graph *irg, int n)
 {
 	assert(0 <= n && n < irg->n_loc);
 	return irg->loc_descriptions ? irg->loc_descriptions[n] : NULL;
 }
 
-void irg_register_phase(ir_graph *irg, ir_phase_id id, ir_phase *phase)
-{
-	assert(id <= PHASE_LAST);
-	assert(irg->phases[id] == NULL);
-	irg->phases[id] = phase;
-}
-
-void irg_invalidate_phases(ir_graph *irg)
-{
-	int p;
-	for (p = 0; p <= PHASE_LAST; ++p) {
-		ir_phase *phase = irg->phases[p];
-		if (phase == NULL)
-			continue;
-
-		phase_free(phase);
-		irg->phases[p] = NULL;
-	}
-}
-
 #ifndef NDEBUG
 void ir_reserve_resources(ir_graph *irg, ir_resources_t resources)
 {
-	assert((resources & ~IR_RESOURCE_LOCAL_MASK) == 0);
 	assert((irg->reserved_resources & resources) == 0);
 	irg->reserved_resources |= resources;
 }
@@ -916,21 +750,18 @@ ir_resources_t ir_resources_reserved(const ir_graph *irg)
 {
 	return irg->reserved_resources;
 }
-#endif /* NDEBUG */
+#endif
 
-/* Returns a estimated node count of the irg. */
 unsigned (get_irg_estimated_node_cnt)(const ir_graph *irg)
 {
-	return _get_irg_estimated_node_cnt(irg);
+	return get_irg_estimated_node_cnt_(irg);
 }
 
-/* Returns the last irn index for this graph. */
 unsigned get_irg_last_idx(const ir_graph *irg)
 {
 	return irg->last_node_idx;
 }
 
-/* register additional space in an IR graph */
 size_t register_additional_graph_data(size_t size)
 {
 	assert(!forbid_new_data && "Too late to register additional node data");
@@ -943,15 +774,15 @@ size_t register_additional_graph_data(size_t size)
 
 void (set_irg_state)(ir_graph *irg, ir_graph_state_t state)
 {
-	_set_irg_state(irg, state);
+	set_irg_state_(irg, state);
 }
 
 void (clear_irg_state)(ir_graph *irg, ir_graph_state_t state)
 {
-	_clear_irg_state(irg, state);
+	clear_irg_state_(irg, state);
 }
 
 int (is_irg_state)(const ir_graph *irg, ir_graph_state_t state)
 {
-	return _is_irg_state(irg, state);
+	return is_irg_state_(irg, state);
 }