Fixed some typos.
[libfirm] / ir / ir / ircons.c
index 297b5b5..06c627b 100644 (file)
@@ -71,13 +71,12 @@ ir_node *new_rd_ASM(dbg_info *db, ir_node *block, ir_node *mem,
 
        ir_node *res = new_ir_node(db, irg, block, op_ASM, mode_T, r_arity, r_in);
 
-       res->attr.assem.pin_state = op_pin_state_pinned;
-       res->attr.assem.input_constraints
-               = NEW_ARR_D(ir_asm_constraint, irg->obst, arity);
-       res->attr.assem.output_constraints
-               = NEW_ARR_D(ir_asm_constraint, irg->obst, n_outs);
-       res->attr.assem.clobbers = NEW_ARR_D(ident *, irg->obst, n_clobber);
-       res->attr.assem.text     = text;
+       struct obstack *const obst = get_irg_obstack(irg);
+       res->attr.assem.pin_state          = op_pin_state_pinned;
+       res->attr.assem.input_constraints  = NEW_ARR_D(ir_asm_constraint, obst, arity);
+       res->attr.assem.output_constraints = NEW_ARR_D(ir_asm_constraint, obst, n_outs);
+       res->attr.assem.clobbers           = NEW_ARR_D(ident*,            obst, n_clobber);
+       res->attr.assem.text               = text;
 
        memcpy(res->attr.assem.input_constraints,  inputs,  sizeof(inputs[0]) * arity);
        memcpy(res->attr.assem.output_constraints, outputs, sizeof(outputs[0]) * n_outs);
@@ -235,16 +234,11 @@ static ir_node *set_phi_arguments(ir_node *phi, int pos)
                in[i] = value;
        }
 
-       phi->attr.phi.u.backedge = new_backedge_arr(irg->obst, arity);
+       phi->attr.phi.u.backedge = new_backedge_arr(get_irg_obstack(irg), arity);
        set_irn_in(phi, arity, in);
 
        irn_verify_irg(phi, irg);
 
-       /* Memory Phis in endless loops must be kept alive.
-          As we can't distinguish these easily we keep all of them alive. */
-       if (mode == mode_M)
-               add_End_keepalive(get_irg_end(irg), phi);
-
        try_remove_unnecessary_phi(phi);
        return phi;
 }
@@ -317,7 +311,6 @@ void mature_immBlock(ir_node *block)
        size_t   n_preds;
        ir_node  *next;
        ir_node  *phi;
-       ir_node **new_in;
        ir_graph *irg;
 
        assert(is_Block(block));
@@ -327,7 +320,7 @@ void mature_immBlock(ir_node *block)
        irg     = get_irn_irg(block);
        n_preds = ARR_LEN(block->in) - 1;
        /* Fix block parameters */
-       block->attr.block.backedge = new_backedge_arr(irg->obst, n_preds);
+       block->attr.block.backedge = new_backedge_arr(get_irg_obstack(irg), n_preds);
 
        /* Traverse a chain of Phi nodes attached to this block and mature
        these, too. */
@@ -346,8 +339,7 @@ void mature_immBlock(ir_node *block)
 
        /* create final in-array for the block */
        if (block->attr.block.dynamic_ins) {
-               new_in = NEW_ARR_D(ir_node*, irg->obst, n_preds+1);
-               memcpy(new_in, block->in, (n_preds+1) * sizeof(new_in[0]));
+               ir_node **const new_in = DUP_ARR_D(ir_node*, get_irg_obstack(irg), block->in);
                DEL_ARR_F(block->in);
                block->in = new_in;
                block->attr.block.dynamic_ins = false;
@@ -367,14 +359,14 @@ void mature_immBlock(ir_node *block)
 
 ir_node *new_d_Const_long(dbg_info *db, ir_mode *mode, long value)
 {
-       assert(get_irg_phase_state(current_ir_graph) == phase_building);
+       assert(irg_is_constrained(current_ir_graph, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        return new_rd_Const_long(db, current_ir_graph, mode, value);
 }
 
 ir_node *new_d_simpleSel(dbg_info *db, ir_node *store, ir_node *objptr,
                          ir_entity *ent)
 {
-       assert(get_irg_phase_state(current_ir_graph) == phase_building);
+       assert(irg_is_constrained(current_ir_graph, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        return new_rd_Sel(db, current_ir_graph->current_block,
                          store, objptr, 0, NULL, ent);
 }
@@ -382,7 +374,7 @@ ir_node *new_d_simpleSel(dbg_info *db, ir_node *store, ir_node *objptr,
 ir_node *new_d_SymConst(dbg_info *db, ir_mode *mode, symconst_symbol value,
                         symconst_kind kind)
 {
-       assert(get_irg_phase_state(current_ir_graph) == phase_building);
+       assert(irg_is_constrained(current_ir_graph, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        return new_rd_SymConst(db, current_ir_graph, mode, value, kind);
 }
 
@@ -391,7 +383,7 @@ ir_node *new_d_ASM(dbg_info *db, ir_node *mem, int arity, ir_node *in[],
                    size_t n_outs, ir_asm_constraint *outputs,
                    size_t n_clobber, ident *clobber[], ident *text)
 {
-       assert(get_irg_phase_state(current_ir_graph) == phase_building);
+       assert(irg_is_constrained(current_ir_graph, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        return new_rd_ASM(db, current_ir_graph->current_block, mem, arity, in,
                          inputs, n_outs, outputs, n_clobber, clobber, text);
 }
@@ -423,7 +415,7 @@ ir_node *new_r_DivRL(ir_node *block, ir_node * irn_mem, ir_node * irn_left, ir_n
 ir_node *new_d_DivRL(dbg_info *dbgi, ir_node * irn_mem, ir_node * irn_left, ir_node * irn_right, ir_mode* resmode, op_pin_state pin_state)
 {
        ir_node *res;
-       assert(get_irg_phase_state(current_ir_graph) == phase_building);
+       assert(irg_is_constrained(current_ir_graph, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        res = new_rd_DivRL(dbgi, current_ir_graph->current_block, irn_mem, irn_left, irn_right, resmode, pin_state);
        return res;
 }
@@ -437,7 +429,7 @@ ir_node *new_rd_immBlock(dbg_info *dbgi, ir_graph *irg)
 {
        ir_node *res;
 
-       assert(get_irg_phase_state(irg) == phase_building);
+       assert(irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        /* creates a new dynamic in-array as length of in is -1 */
        res = new_ir_node(dbgi, irg, NULL, op_Block, mode_BB, -1, NULL);
 
@@ -450,8 +442,7 @@ ir_node *new_rd_immBlock(dbg_info *dbgi, ir_graph *irg)
        set_Block_block_visited(res, 0);
 
        /* Create and initialize array for Phi-node construction. */
-       res->attr.block.graph_arr = NEW_ARR_D(ir_node *, irg->obst, irg->n_loc);
-       memset(res->attr.block.graph_arr, 0, sizeof(ir_node*) * irg->n_loc);
+       res->attr.block.graph_arr = NEW_ARR_DZ(ir_node*, get_irg_obstack(irg), irg->n_loc);
 
        /* Immature block may not be optimized! */
        irn_verify_irg(res, irg);
@@ -494,7 +485,7 @@ void set_cur_block(ir_node *target)
 
 void set_r_cur_block(ir_graph *irg, ir_node *target)
 {
-       assert(get_irg_phase_state(irg) == phase_building);
+       assert(irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        assert(target == NULL || is_Block(target));
        assert(target == NULL || get_irn_irg(target) == irg);
        irg->current_block = target;
@@ -502,7 +493,7 @@ void set_r_cur_block(ir_graph *irg, ir_node *target)
 
 ir_node *get_r_cur_block(ir_graph *irg)
 {
-       assert(get_irg_phase_state(irg) == phase_building);
+       assert(irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        return irg->current_block;
 }
 
@@ -513,7 +504,7 @@ ir_node *get_cur_block(void)
 
 ir_node *get_r_value(ir_graph *irg, int pos, ir_mode *mode)
 {
-       assert(get_irg_phase_state(irg) == phase_building);
+       assert(irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        assert(pos >= 0);
 
        return get_r_value_internal(irg->current_block, pos + 1, mode);
@@ -580,7 +571,7 @@ ir_mode *ir_guess_mode(int pos)
 
 void set_r_value(ir_graph *irg, int pos, ir_node *value)
 {
-       assert(get_irg_phase_state(irg) == phase_building);
+       assert(irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        assert(pos >= 0);
        assert(pos+1 < irg->n_loc);
        assert(is_ir_node(value));
@@ -594,7 +585,7 @@ void set_value(int pos, ir_node *value)
 
 ir_node *get_r_store(ir_graph *irg)
 {
-       assert(get_irg_phase_state(irg) == phase_building);
+       assert(irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        return get_r_value_internal(irg->current_block, 0, mode_M);
 }
 
@@ -607,7 +598,7 @@ void set_r_store(ir_graph *irg, ir_node *store)
 {
        ir_node *load, *pload, *pred, *in[2];
 
-       assert(get_irg_phase_state(irg) == phase_building);
+       assert(irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
        /* Beware: due to dead code elimination, a store might become a Bad node even in
           the construction phase. */
        assert((get_irn_mode(store) == mode_M || is_Bad(store)) && "storing non-memory node");
@@ -663,7 +654,7 @@ void irg_finalize_cons(ir_graph *irg)
        ir_node *end_block = get_irg_end_block(irg);
        mature_immBlock(end_block);
 
-       set_irg_phase_state(irg, phase_high);
+       clear_irg_constraints(irg, IR_GRAPH_CONSTRAINT_CONSTRUCTION);
 }
 
 void irp_finalize_cons(void)
@@ -672,7 +663,6 @@ void irp_finalize_cons(void)
        for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
                irg_finalize_cons(get_irp_irg(i));
        }
-       irp->phase_state = phase_high;
 }
 
 ir_node *new_Const_long(ir_mode *mode, long value)
@@ -702,17 +692,17 @@ ir_node *new_r_Anchor(ir_graph *irg)
        ir_node *res;
        size_t   i;
        memset(in, 0, sizeof(in));
-       res = new_ir_node(NULL, irg, NULL, op_Anchor, mode_ANY, anchor_last+1, in);
+       res = new_ir_node(NULL, irg, NULL, op_Anchor, mode_ANY, 0, NULL);
        res->attr.anchor.irg.irg = irg;
 
-       /* hack to get get_irn_irg working: set block to ourself and allow
-        * get_Block_irg for anchor */
+       /* hack to get get_irn_irg in set_irn_in() working */
        res->in[0] = res;
 
-       /* we can't have NULL inputs so reference ourselfes for now */
+       /* we can't have NULL inputs so reference ourselves for now */
        for (i = 0; i <= (size_t)anchor_last; ++i) {
-               set_irn_n(res, i, res);
+               in[i] = res;
        }
+       set_irn_in(res, anchor_last+1, in);
 
        return res;
 }
@@ -721,12 +711,11 @@ ir_node *new_r_Block_noopt(ir_graph *irg, int arity, ir_node *in[])
 {
        ir_node *res = new_ir_node(NULL, irg, NULL, op_Block, mode_BB, arity, in);
        res->attr.block.irg.irg = irg;
-       res->attr.block.backedge = new_backedge_arr(irg->obst, arity);
+       res->attr.block.backedge = new_backedge_arr(get_irg_obstack(irg), arity);
        set_Block_matured(res, 1);
        /* Create and initialize array for Phi-node construction. */
-       if (get_irg_phase_state(irg) == phase_building) {
-               res->attr.block.graph_arr = NEW_ARR_D(ir_node *, irg->obst, irg->n_loc);
-               memset(res->attr.block.graph_arr, 0, irg->n_loc * sizeof(ir_node*));
+       if (irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_CONSTRUCTION)) {
+               res->attr.block.graph_arr = NEW_ARR_DZ(ir_node*, get_irg_obstack(irg), irg->n_loc);
        }
        irn_verify_irg(res, irg);
        return res;