From 09b26f8f8fa068c26c06d74ba2c157ed6a465b32 Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Fri, 31 Oct 2008 14:03:24 +0000 Subject: [PATCH] - removed rest of already unsupported USE_EXPLICIT_PHI_IN_STACK [r23326] --- ir/ir/ircons.c | 10 ---------- ir/ir/irgraph.c | 20 -------------------- ir/ir/irtypes.h | 5 +---- 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c index 7947f3897..e06063846 100644 --- a/ir/ir/ircons.c +++ b/ir/ir/ircons.c @@ -44,16 +44,6 @@ #include "iredges_t.h" #include "irflag_t.h" -#if USE_EXPLICIT_PHI_IN_STACK -/* A stack needed for the automatic Phi node construction in constructor - Phi_in. Redefinition in irgraph.c!! */ -struct Phi_in_stack { - ir_node **stack; - int pos; -}; -typedef struct Phi_in_stack Phi_in_stack; -#endif - /* when we need verifying */ #ifdef NDEBUG # define IRN_VRFY_IRG(res, irg) diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c index 155fded88..f622f0df7 100644 --- a/ir/ir/irgraph.c +++ b/ir/ir/irgraph.c @@ -141,13 +141,6 @@ static void free_graph(ir_graph *irg) { free(ptr - additional_graph_data_size); } -#if USE_EXPLICIT_PHI_IN_STACK -/* really defined in ircons.c */ -typedef struct Phi_in_stack Phi_in_stack; -Phi_in_stack *new_Phi_in_stack(); -void free_Phi_in_stack(Phi_in_stack *s); -#endif - /** * Set the number of locals for a given graph. * @@ -210,10 +203,6 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) { res->visited = 0; /* visited flag, for the ir walker */ res->block_visited = 0; /* visited flag, for the 'block'-walker */ -#if USE_EXPLICIT_PHI_IN_STACK - res->Phi_in_stack = new_Phi_in_stack(); /* A stack needed for automatic Phi - generation */ -#endif res->extbb_obst = NULL; res->last_node_idx = 0; @@ -320,9 +309,6 @@ ir_graph *new_const_code_irg(void) { 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 */ -#if USE_EXPLICIT_PHI_IN_STACK - res->Phi_in_stack = NULL; -#endif res->obst = XMALLOC(struct obstack); obstack_init (res->obst); res->extbb_obst = NULL; @@ -471,9 +457,6 @@ ir_graph *create_irg_copy(ir_graph *irg) { res->n_loc = 0; res->visited = 0; /* visited flag, for the ir walker */ res->block_visited = 0; /* visited flag, for the 'block'-walker */ -#if USE_EXPLICIT_PHI_IN_STACK - res->Phi_in_stack = NULL; -#endif res->obst = XMALLOC(struct obstack); obstack_init(res->obst); res->extbb_obst = NULL; @@ -557,9 +540,6 @@ void free_ir_graph(ir_graph *irg) { free_End(get_irg_end(irg)); obstack_free(irg->obst,NULL); free(irg->obst); -#if USE_EXPLICIT_PHI_IN_STACK - free_Phi_in_stack(irg->Phi_in_stack); -#endif if (irg->loc_descriptions) free(irg->loc_descriptions); irg->kind = k_BAD; diff --git a/ir/ir/irtypes.h b/ir/ir/irtypes.h index eade5faf9..1dd517841 100644 --- a/ir/ir/irtypes.h +++ b/ir/ir/irtypes.h @@ -460,9 +460,6 @@ struct ir_graph { unsigned fp_model; /**< floating point model of the graph. */ /* -- Fields for construction -- */ -#if USE_EXPLICIT_PHI_IN_STACK - struct Phi_in_stack *Phi_in_stack; /**< Needed for automatic Phi construction. */ -#endif int n_loc; /**< Number of local variables in this procedure including procedure parameters. */ void **loc_descriptions; /**< Storage for local variable descriptions. */ @@ -480,11 +477,11 @@ struct ir_graph { unsigned *caller_isbe; /**< For callgraph analysis: raw bitset if backedge info calculated. */ cg_callee_entry **callees; /**< For callgraph analysis: list of callee calls */ unsigned *callee_isbe; /**< For callgraph analysis: raw bitset if backedge info calculated. */ + ir_loop *l; /**< For callgraph analysis. */ int callgraph_loop_depth; /**< For callgraph analysis */ int callgraph_recursion_depth; /**< For callgraph analysis */ double method_execution_frequency; /**< For callgraph analysis */ - ir_loop *l; /**< For callgraph analysis. */ /* -- Fields for Walking the graph -- */ ir_visited_t visited; /**< this flag is an identifier for -- 2.20.1