X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircons.c;h=7cbd797d1db61d96e9f73b3f32ee860962de2136;hb=2c4676f64fa3e89b1442c09869fee8998a832508;hp=528f254787f5a2fe61de1b07fc6973dce5c1e2c0;hpb=0ad65f3029353abbdbe8acdca9c156c878c722b6;p=libfirm diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c index 528f25478..7cbd797d1 100644 --- a/ir/ir/ircons.c +++ b/ir/ir/ircons.c @@ -104,7 +104,7 @@ new_bd_##instr(dbg_info *db, ir_node *block, \ #define NEW_BD_DIVOP(instr) \ static ir_node * \ new_bd_##instr(dbg_info *db, ir_node *block, \ - ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) \ + ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) \ { \ ir_node *in[3]; \ ir_node *res; \ @@ -113,7 +113,7 @@ new_bd_##instr(dbg_info *db, ir_node *block, \ in[1] = op1; \ in[2] = op2; \ res = new_ir_node(db, irg, block, op_##instr, mode_T, 3, in); \ - res->attr.divmod.exc.pin_state = op_pin_state_pinned; \ + res->attr.divmod.exc.pin_state = state; \ res->attr.divmod.res_mode = mode; \ res = optimize_node(res); \ IRN_VRFY_IRG(res, irg); \ @@ -152,12 +152,12 @@ new_rd_##instr(dbg_info *db, ir_graph *irg, ir_node *block, \ #define NEW_RD_DIVOP(instr) \ ir_node * \ new_rd_##instr(dbg_info *db, ir_graph *irg, ir_node *block, \ - ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) \ + ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) \ { \ ir_node *res; \ ir_graph *rem = current_ir_graph; \ current_ir_graph = irg; \ - res = new_bd_##instr(db, block, memop, op1, op2, mode); \ + res = new_bd_##instr(db, block, memop, op1, op2, mode, state);\ current_ir_graph = rem; \ return res; \ } @@ -194,12 +194,14 @@ new_bd_Block(dbg_info *db, int arity, ir_node **in) { res->attr.block.is_dead = 0; res->attr.block.is_mb_head = 1; + res->attr.block.has_label = 0; res->attr.block.irg = irg; res->attr.block.backedge = new_backedge_arr(irg->obst, arity); res->attr.block.in_cg = NULL; res->attr.block.cg_backedge = NULL; res->attr.block.extblk = NULL; res->attr.block.mb_depth = 0; + res->attr.block.label = 0; set_Block_matured(res, 1); set_Block_block_visited(res, 0); @@ -270,6 +272,7 @@ static ir_node * new_bd_Const_type(dbg_info *db, ir_node *block, ir_mode *mode, tarval *con, ir_type *tp) { ir_node *res; ir_graph *irg = current_ir_graph; + (void) block; res = new_ir_node(db, irg, get_irg_start_block(irg), op_Const, mode, 0, NULL); res->attr.con.tv = con; @@ -413,8 +416,8 @@ new_bd_Jmp(dbg_info *db, ir_node *block) { ir_node *res; ir_graph *irg = current_ir_graph; - res = new_ir_node (db, irg, block, op_Jmp, mode_X, 0, NULL); - res = optimize_node (res); + res = new_ir_node(db, irg, block, op_Jmp, mode_X, 0, NULL); + res = optimize_node(res); IRN_VRFY_IRG(res, irg); return res; } /* new_bd_Jmp */ @@ -424,12 +427,9 @@ new_bd_IJmp(dbg_info *db, ir_node *block, ir_node *tgt) { ir_node *res; ir_graph *irg = current_ir_graph; - res = new_ir_node (db, irg, block, op_IJmp, mode_X, 1, &tgt); - res = optimize_node (res); + res = new_ir_node(db, irg, block, op_IJmp, mode_X, 1, &tgt); + res = optimize_node(res); IRN_VRFY_IRG(res, irg); - - if (get_irn_op(res) == op_IJmp) /* still an IJmp */ - keep_alive(res); return res; } /* new_bd_IJmp */ @@ -438,11 +438,11 @@ new_bd_Cond(dbg_info *db, ir_node *block, ir_node *c) { ir_node *res; ir_graph *irg = current_ir_graph; - res = new_ir_node (db, irg, block, op_Cond, mode_T, 1, &c); + res = new_ir_node(db, irg, block, op_Cond, mode_T, 1, &c); res->attr.cond.kind = dense; res->attr.cond.default_proj = 0; res->attr.cond.pred = COND_JMP_PRED_NONE; - res = optimize_node (res); + res = optimize_node(res); IRN_VRFY_IRG(res, irg); return res; } /* new_bd_Cond */ @@ -503,6 +503,7 @@ new_bd_Load(dbg_info *db, ir_node *block, res->attr.load.exc.pin_state = op_pin_state_pinned; res->attr.load.load_mode = mode; res->attr.load.volatility = volatility_non_volatile; + res->attr.load.aligned = align_is_aligned; res = optimize_node(res); IRN_VRFY_IRG(res, irg); return res; @@ -521,6 +522,7 @@ new_bd_Store(dbg_info *db, ir_node *block, res = new_ir_node(db, irg, block, op_Store, mode_T, 3, in); res->attr.store.exc.pin_state = op_pin_state_pinned; res->attr.store.volatility = volatility_non_volatile; + res->attr.store.aligned = align_is_aligned; res = optimize_node(res); IRN_VRFY_IRG(res, irg); return res; @@ -629,9 +631,9 @@ new_bd_Confirm(dbg_info *db, ir_node *block, ir_node *val, ir_node *bound, pn_Cm in[0] = val; in[1] = bound; - res = new_ir_node (db, irg, block, op_Confirm, get_irn_mode(val), 2, in); - res->attr.confirm_cmp = cmp; - res = optimize_node (res); + res = new_ir_node(db, irg, block, op_Confirm, get_irn_mode(val), 2, in); + res->attr.confirm.cmp = cmp; + res = optimize_node(res); IRN_VRFY_IRG(res, irg); return res; } /* new_bd_Confirm */ @@ -837,19 +839,21 @@ new_bd_Pin(dbg_info *db, ir_node *block, ir_node *node) { } /* new_bd_Pin */ static ir_node * -new_bd_ASM(dbg_info *db, ir_node *block, ir_node *store, int arity, ir_node *inputs[], ident *asm_text) { - ir_node *res, **in; +new_bd_ASM(dbg_info *db, ir_node *block, int arity, ir_node *in[], ir_asm_constraint *inputs, + int n_outs, ir_asm_constraint *outputs, int n_clobber, ident *clobber[], ident *asm_text) { + ir_node *res; ir_graph *irg = current_ir_graph; - int i; - - NEW_ARR_A(ir_node *, in, arity + 1); + (void) clobber; - in[0] = store; - for (i = 0; i < arity; ++i) - in[i + 1] = inputs[i]; + res = new_ir_node(db, irg, block, op_ASM, mode_T, arity, in); + res->attr.assem.pin_state = op_pin_state_pinned; + res->attr.assem.inputs = NEW_ARR_D(ir_asm_constraint, irg->obst, arity); + res->attr.assem.outputs = NEW_ARR_D(ir_asm_constraint, irg->obst, n_outs); + res->attr.assem.clobber = NEW_ARR_D(ident *, irg->obst, n_clobber); + res->attr.assem.asm_text = asm_text; - res = new_ir_node(db, irg, block, op_ASM, mode_T, arity + 1, in); - res->attr.assem.asm_text = asm_text; + memcpy(res->attr.assem.inputs, inputs, sizeof(inputs[0]) * arity); + memcpy(res->attr.assem.outputs, outputs, sizeof(outputs[0]) * n_outs); res = optimize_node(res); IRN_VRFY_IRG(res, irg); @@ -892,7 +896,7 @@ new_rd_End(dbg_info *db, ir_graph *irg, ir_node *block) { ir_node *res; ir_graph *rem = current_ir_graph; - current_ir_graph = rem; + current_ir_graph = irg; res = new_bd_End(db, block); current_ir_graph = rem; @@ -1438,13 +1442,15 @@ ir_node *new_rd_Pin(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *node) return res; } /* new_rd_Pin */ -ir_node *new_rd_ASM(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, - int arity, ir_node *inputs[], ident *asm_text) { +ir_node *new_rd_ASM(dbg_info *db, ir_graph *irg, ir_node *block, + int arity, ir_node *in[], ir_asm_constraint *inputs, + int n_outs, ir_asm_constraint *outputs, + int n_clobber, ident *clobber[], ident *asm_text) { ir_node *res; ir_graph *rem = current_ir_graph; current_ir_graph = irg; - res = new_bd_ASM(db, block, store, arity, inputs, asm_text); + res = new_bd_ASM(db, block, arity, in, inputs, n_outs, outputs, n_clobber, clobber, asm_text); current_ir_graph = rem; return res; @@ -1520,20 +1526,20 @@ ir_node *new_r_Mul(ir_graph *irg, ir_node *block, return new_rd_Mul(NULL, irg, block, op1, op2, mode); } ir_node *new_r_Quot(ir_graph *irg, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { - return new_rd_Quot(NULL, irg, block, memop, op1, op2, mode); + ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { + return new_rd_Quot(NULL, irg, block, memop, op1, op2, mode, state); } ir_node *new_r_DivMod(ir_graph *irg, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { - return new_rd_DivMod(NULL, irg, block, memop, op1, op2, mode); + ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { + return new_rd_DivMod(NULL, irg, block, memop, op1, op2, mode, state); } ir_node *new_r_Div(ir_graph *irg, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { - return new_rd_Div(NULL, irg, block, memop, op1, op2, mode); + ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { + return new_rd_Div(NULL, irg, block, memop, op1, op2, mode, state); } ir_node *new_r_Mod(ir_graph *irg, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { - return new_rd_Mod(NULL, irg, block, memop, op1, op2, mode); + ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { + return new_rd_Mod(NULL, irg, block, memop, op1, op2, mode, state); } ir_node *new_r_Abs(ir_graph *irg, ir_node *block, ir_node *op, ir_mode *mode) { @@ -1633,7 +1639,7 @@ ir_node *new_r_Bad(ir_graph *irg) { return new_rd_Bad(irg); } ir_node *new_r_Confirm(ir_graph *irg, ir_node *block, ir_node *val, ir_node *bound, pn_Cmp cmp) { - return new_rd_Confirm (NULL, irg, block, val, bound, cmp); + return new_rd_Confirm(NULL, irg, block, val, bound, cmp); } ir_node *new_r_Unknown(ir_graph *irg, ir_mode *m) { return new_rd_Unknown(irg, m); @@ -1684,9 +1690,11 @@ ir_node *new_r_Bound(ir_graph *irg, ir_node *block, ir_node *new_r_Pin(ir_graph *irg, ir_node *block, ir_node *node) { return new_rd_Pin(NULL, irg, block, node); } -ir_node *new_r_ASM(ir_graph *irg, ir_node *block, ir_node *store, - int arity, ir_node *inputs[], ident *asm_text) { - return new_rd_ASM(NULL, irg, block, store, arity, inputs, asm_text); +ir_node *new_r_ASM(ir_graph *irg, ir_node *block, + int arity, ir_node *in[], ir_asm_constraint *inputs, + int n_outs, ir_asm_constraint *outputs, + int n_clobber, ident *clobber[], ident *asm_text) { + return new_rd_ASM(NULL, irg, block, arity, in, inputs, n_outs, outputs, n_clobber, clobber, asm_text); } /** ********************/ @@ -1809,9 +1817,9 @@ Phi_in_stack * new_Phi_in_stack(void) { Phi_in_stack *res; - res = (Phi_in_stack *) malloc ( sizeof (Phi_in_stack)); + res = (Phi_in_stack *) xmalloc(sizeof(Phi_in_stack)); - res->stack = NEW_ARR_F (ir_node *, 0); + res->stack = NEW_ARR_F(ir_node *, 0); res->pos = 0; return res; @@ -2607,6 +2615,7 @@ new_d_Proj(dbg_info *db, ir_node *arg, ir_mode *mode, long proj) { ir_node * new_d_defaultProj(dbg_info *db, ir_node *arg, long max_proj) { ir_node *res; + (void) db; assert(arg->op == op_Cond); arg->attr.cond.kind = fragmentary; arg->attr.cond.default_proj = max_proj; @@ -2653,9 +2662,9 @@ static void allocate_frag_arr(ir_node *res, ir_op *op, ir_node ***frag_store) { } /* allocate_frag_arr */ ir_node * -new_d_Quot(dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { +new_d_Quot(dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { ir_node *res; - res = new_bd_Quot(db, current_ir_graph->current_block, memop, op1, op2, mode); + res = new_bd_Quot(db, current_ir_graph->current_block, memop, op1, op2, mode, state); #if PRECISE_EXC_CONTEXT allocate_frag_arr(res, op_Quot, &res->attr.except.frag_arr); /* Could be optimized away. */ #endif @@ -2664,9 +2673,9 @@ new_d_Quot(dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mo } /* new_d_Quot */ ir_node * -new_d_DivMod(dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { +new_d_DivMod(dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { ir_node *res; - res = new_bd_DivMod(db, current_ir_graph->current_block, memop, op1, op2, mode); + res = new_bd_DivMod(db, current_ir_graph->current_block, memop, op1, op2, mode, state); #if PRECISE_EXC_CONTEXT allocate_frag_arr(res, op_DivMod, &res->attr.except.frag_arr); /* Could be optimized away. */ #endif @@ -2675,9 +2684,9 @@ new_d_DivMod(dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2, ir_mode * } /* new_d_DivMod */ ir_node * -new_d_Div(dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { +new_d_Div(dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { ir_node *res; - res = new_bd_Div(db, current_ir_graph->current_block, memop, op1, op2, mode); + res = new_bd_Div(db, current_ir_graph->current_block, memop, op1, op2, mode, state); #if PRECISE_EXC_CONTEXT allocate_frag_arr(res, op_Div, &res->attr.except.frag_arr); /* Could be optimized away. */ #endif @@ -2686,9 +2695,9 @@ new_d_Div(dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mod } ir_node * -new_d_Mod(dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { +new_d_Mod(dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { ir_node *res; - res = new_bd_Mod(db, current_ir_graph->current_block, memop, op1, op2, mode); + res = new_bd_Mod(db, current_ir_graph->current_block, memop, op1, op2, mode, state); #if PRECISE_EXC_CONTEXT allocate_frag_arr(res, op_Mod, &res->attr.except.frag_arr); /* Could be optimized away. */ #endif @@ -2923,8 +2932,10 @@ new_d_Pin(dbg_info *db, ir_node *node) { } /* new_d_Pin */ ir_node * -new_d_ASM(dbg_info *db, ir_node *store, int arity, ir_node *inputs[], ident *asm_text) { - return new_bd_ASM(db, current_ir_graph->current_block, store, arity, inputs, asm_text); +new_d_ASM(dbg_info *db, int arity, ir_node *in[], ir_asm_constraint *inputs, + int n_outs, ir_asm_constraint *outputs, + int n_clobber, ident *clobber[], ident *asm_text) { + return new_bd_ASM(db, current_ir_graph->current_block, arity, in, inputs, n_outs, outputs, n_clobber, clobber, asm_text); } /* new_d_ASM */ /* ********************************************************************* */ @@ -2949,6 +2960,7 @@ new_d_immBlock(dbg_info *db) { res->attr.block.is_matured = 0; res->attr.block.is_dead = 0; res->attr.block.is_mb_head = 1; + res->attr.block.has_label = 0; res->attr.block.irg = current_ir_graph; res->attr.block.backedge = NULL; res->attr.block.in_cg = NULL; @@ -2956,6 +2968,7 @@ new_d_immBlock(dbg_info *db) { res->attr.block.extblk = NULL; res->attr.block.region = NULL; res->attr.block.mb_depth = 0; + res->attr.block.label = 0; set_Block_block_visited(res, 0); @@ -3024,6 +3037,7 @@ get_d_value(dbg_info *db, int pos, ir_mode *mode) { ir_graph *irg = current_ir_graph; assert(get_irg_phase_state(irg) == phase_building); inc_irg_visited(irg); + (void) db; return get_r_value_internal(irg->current_block, pos + 1, mode); } /* get_d_value */ @@ -3204,17 +3218,17 @@ ir_node *new_Minus(ir_node *op, ir_mode *mode) { ir_node *new_Mul(ir_node *op1, ir_node *op2, ir_mode *mode) { return new_d_Mul(NULL, op1, op2, mode); } -ir_node *new_Quot(ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { - return new_d_Quot(NULL, memop, op1, op2, mode); +ir_node *new_Quot(ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { + return new_d_Quot(NULL, memop, op1, op2, mode, state); } -ir_node *new_DivMod(ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { - return new_d_DivMod(NULL, memop, op1, op2, mode); +ir_node *new_DivMod(ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { + return new_d_DivMod(NULL, memop, op1, op2, mode, state); } -ir_node *new_Div(ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { - return new_d_Div(NULL, memop, op1, op2, mode); +ir_node *new_Div(ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { + return new_d_Div(NULL, memop, op1, op2, mode, state); } -ir_node *new_Mod(ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode) { - return new_d_Mod(NULL, memop, op1, op2, mode); +ir_node *new_Mod(ir_node *memop, ir_node *op1, ir_node *op2, ir_mode *mode, op_pin_state state) { + return new_d_Mod(NULL, memop, op1, op2, mode, state); } ir_node *new_Abs(ir_node *op, ir_mode *mode) { return new_d_Abs(NULL, op, mode); @@ -3297,7 +3311,7 @@ ir_node *new_Bad(void) { return new_d_Bad(); } ir_node *new_Confirm(ir_node *val, ir_node *bound, pn_Cmp cmp) { - return new_d_Confirm (NULL, val, bound, cmp); + return new_d_Confirm(NULL, val, bound, cmp); } ir_node *new_Unknown(ir_mode *m) { return new_d_Unknown(m); @@ -3341,6 +3355,15 @@ ir_node *new_Bound(ir_node *store, ir_node *idx, ir_node *lower, ir_node *upper) ir_node *new_Pin(ir_node *node) { return new_d_Pin(NULL, node); } -ir_node *new_ASM(ir_node *store, int arity, ir_node *inputs[], ident *asm_text) { - return new_d_ASM(NULL, store, arity, inputs, asm_text); +ir_node *new_ASM(int arity, ir_node *in[], ir_asm_constraint *inputs, + int n_outs, ir_asm_constraint *outputs, + int n_clobber, ident *clobber[], ident *asm_text) { + return new_d_ASM(NULL, arity, in, inputs, n_outs, outputs, n_clobber, clobber, asm_text); +} + +/* create a new anchor node */ +ir_node *new_Anchor(ir_graph *irg) { + ir_node *in[anchor_last]; + memset(in, 0, sizeof(in)); + return new_ir_node(NULL, irg, NULL, op_Anchor, mode_ANY, anchor_last, in); }