X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=cd5aabb74a425c037261bc2fbbf49c2abfb38c1e;hb=c86cca5071eb546f462a6d21c3088892526f460c;hp=ade886f4bcd4ff4060dd31020160198418012cd3;hpb=b58fa7bff3669430bb2422735b193a043709d9d1;p=libfirm diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c index ade886f4b..cd5aabb74 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. * @@ -41,12 +41,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 @@ -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); @@ -142,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. @@ -154,7 +154,7 @@ 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 +186,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 --*/ @@ -212,15 +205,11 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) /*-- Nodes needed in every graph --*/ set_irg_end_block (res, new_r_immBlock(res)); - end = new_r_End(res); - set_irg_end(res, end); + set_irg_end(res, new_r_End(res, 0, NULL)); - start_block = new_r_Block(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)); + set_irg_no_mem (res, new_r_NoMem(res)); start = new_r_Start(res); set_irg_start (res, start); @@ -228,7 +217,6 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) projX = new_r_Proj(start, mode_X, pn_Start_X_initial_exec); set_irg_initial_exec (res, projX); 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); @@ -264,7 +252,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; @@ -287,7 +274,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 */ @@ -299,18 +285,15 @@ ir_graph *new_const_code_irg(void) res->anchor = new_r_Anchor(res); /* -- The end block -- */ - end_block = new_r_Block(res, 0, NULL); + end_block = new_r_Block_noopt(res, 0, NULL); set_irg_end_block(res, end_block); - end = new_r_End(res); + end = new_r_End(res, 0, NULL); set_irg_end(res, end); /* -- The start block -- */ - start_block = new_r_Block(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); - 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_r_Start(res); set_irg_start(res, start); @@ -328,7 +311,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; @@ -343,7 +325,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); @@ -355,7 +337,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)); @@ -400,13 +382,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; @@ -425,7 +406,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))); @@ -437,7 +417,7 @@ 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; } @@ -456,8 +436,7 @@ void free_ir_graph(ir_graph *irg) edges_deactivate(irg); hook_free_graph(irg); - if (irg->outs_state != outs_none) - free_irg_outs(irg); + free_irg_outs(irg); if (irg->frame_type) free_type(irg->frame_type); del_identities(irg); @@ -497,12 +476,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); } @@ -567,16 +546,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); @@ -597,16 +566,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); @@ -637,14 +596,6 @@ 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); -} - int get_irg_n_locs(ir_graph *irg) { return irg->n_loc - 1; @@ -661,7 +612,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; @@ -692,66 +643,6 @@ 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); -} - -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) -{ - int i; - for (i = get_irp_n_irgs() - 1; i >= 0; --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); @@ -777,19 +668,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) @@ -839,7 +730,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 @@ -891,30 +782,9 @@ void *get_irg_loc_description(ir_graph *irg, int n) 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; }