X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircons.c;h=b901811e97eee57717d108c9b4a8a0cb6701e439;hb=b597c7fd473086ca6374b2abbdf129f595c156d0;hp=87881b31233f6cc6acacc24cbca9239554508dd7;hpb=d697a307b98ca3812f0ed43c6f8a404b29613c7e;p=libfirm diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c index 87881b312..b901811e9 100644 --- a/ir/ir/ircons.c +++ b/ir/ir/ircons.c @@ -395,7 +395,7 @@ NEW_BD_UNOP(Not) NEW_BD_BINOP(Shl) NEW_BD_BINOP(Shr) NEW_BD_BINOP(Shrs) -NEW_BD_BINOP(Rot) +NEW_BD_BINOP(Rotl) NEW_BD_UNOP(Abs) NEW_BD_BINOP(Carry) NEW_BD_BINOP(Borrow) @@ -617,9 +617,9 @@ new_bd_SymConst_type(dbg_info *db, ir_node *block, ir_mode *mode, ir_graph *irg = current_ir_graph; ir_node *res = new_ir_node(db, irg, block, op_SymConst, mode, 0, NULL); - res->attr.symc.num = symkind; - res->attr.symc.sym = value; - res->attr.symc.tp = tp; + res->attr.symc.kind = symkind; + res->attr.symc.sym = value; + res->attr.symc.tp = tp; res = optimize_node(res); IRN_VRFY_IRG(res, irg); @@ -748,30 +748,6 @@ new_bd_Mux(dbg_info *db, ir_node *block, return res; } /* new_bd_Mux */ -static ir_node * -new_bd_Psi(dbg_info *db, ir_node *block, - int arity, ir_node *cond[], ir_node *vals[], ir_mode *mode) { - ir_node **in; - ir_node *res; - ir_graph *irg = current_ir_graph; - int i; - - NEW_ARR_A(ir_node *, in, 2 * arity + 1); - - for (i = 0; i < arity; ++i) { - in[2 * i] = cond[i]; - in[2 * i + 1] = vals[i]; - } - in[2 * i] = vals[i]; - - res = new_ir_node(db, irg, block, op_Psi, mode, 2 * arity + 1, in); - assert(res); - - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} /* new_bd_Psi */ - static ir_node * new_bd_CopyB(dbg_info *db, ir_node *block, ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) { @@ -862,12 +838,12 @@ new_bd_ASM(dbg_info *db, ir_node *block, int arity, ir_node *in[], ir_asm_constr 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.clobber = NEW_ARR_D(ident *, irg->obst, n_clobber); 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); - memcpy(res->attr.assem.clobber, clobber, sizeof(clobber[0]) * n_clobber); + memcpy(res->attr.assem.inputs, inputs, sizeof(inputs[0]) * arity); + memcpy(res->attr.assem.outputs, outputs, sizeof(outputs[0]) * n_outs); + memcpy(res->attr.assem.clobber, clobber, sizeof(clobber[0]) * n_clobber); res = optimize_node(res); IRN_VRFY_IRG(res, irg); @@ -1050,7 +1026,7 @@ NEW_RD_UNOP(Not) NEW_RD_BINOP(Shl) NEW_RD_BINOP(Shr) NEW_RD_BINOP(Shrs) -NEW_RD_BINOP(Rot) +NEW_RD_BINOP(Rotl) NEW_RD_UNOP(Abs) NEW_RD_BINOP(Carry) NEW_RD_BINOP(Borrow) @@ -1395,19 +1371,6 @@ new_rd_Mux(dbg_info *db, ir_graph *irg, ir_node *block, return res; } /* new_rd_Mux */ -ir_node * -new_rd_Psi(dbg_info *db, ir_graph *irg, ir_node *block, - int arity, ir_node *cond[], ir_node *vals[], ir_mode *mode) { - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Psi(db, block, arity, cond, vals, mode); - current_ir_graph = rem; - - return res; -} /* new_rd_Psi */ - ir_node *new_rd_CopyB(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) { ir_node *res; @@ -1607,9 +1570,9 @@ ir_node *new_r_Shrs(ir_graph *irg, ir_node *block, ir_node *op, ir_node *k, ir_mode *mode) { return new_rd_Shrs(NULL, irg, block, op, k, mode); } -ir_node *new_r_Rot(ir_graph *irg, ir_node *block, +ir_node *new_r_Rotl(ir_graph *irg, ir_node *block, ir_node *op, ir_node *k, ir_mode *mode) { - return new_rd_Rot(NULL, irg, block, op, k, mode); + return new_rd_Rotl(NULL, irg, block, op, k, mode); } ir_node *new_r_Carry(ir_graph *irg, ir_node *block, ir_node *op, ir_node *k, ir_mode *mode) { @@ -1701,10 +1664,6 @@ ir_node *new_r_Mux(ir_graph *irg, ir_node *block, ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode) { return new_rd_Mux(NULL, irg, block, sel, ir_false, ir_true, mode); } -ir_node *new_r_Psi(ir_graph *irg, ir_node *block, - int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode) { - return new_rd_Psi(NULL, irg, block, arity, conds, vals, mode); -} ir_node *new_r_CopyB(ir_graph *irg, ir_node *block, ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) { return new_rd_CopyB(NULL, irg, block, store, dst, src, data_type); @@ -2466,7 +2425,7 @@ NEW_D_UNOP(Not) NEW_D_BINOP(Shl) NEW_D_BINOP(Shr) NEW_D_BINOP(Shrs) -NEW_D_BINOP(Rot) +NEW_D_BINOP(Rotl) NEW_D_UNOP(Abs) NEW_D_BINOP(Carry) NEW_D_BINOP(Borrow) @@ -2641,12 +2600,6 @@ new_d_Mux(dbg_info *db, ir_node *sel, ir_node *ir_false, sel, ir_false, ir_true, mode); } /* new_d_Mux */ -ir_node * -new_d_Psi(dbg_info *db,int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode) { - return new_bd_Psi(db, current_ir_graph->current_block, - arity, conds, vals, mode); -} /* new_d_Psi */ - ir_node *new_d_CopyB(dbg_info *db,ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) { ir_node *res; @@ -3016,8 +2969,8 @@ ir_node *new_Shr(ir_node *op, ir_node *k, ir_mode *mode) { ir_node *new_Shrs(ir_node *op, ir_node *k, ir_mode *mode) { return new_d_Shrs(NULL, op, k, mode); } -ir_node *new_Rot(ir_node *op, ir_node *k, ir_mode *mode) { - return new_d_Rot(NULL, op, k, mode); +ir_node *new_Rotl(ir_node *op, ir_node *k, ir_mode *mode) { + return new_d_Rotl(NULL, op, k, mode); } ir_node *new_Carry(ir_node *op1, ir_node *op2, ir_mode *mode) { return new_d_Carry(NULL, op1, op2, mode); @@ -3099,9 +3052,6 @@ ir_node *new_NoMem(void) { ir_node *new_Mux(ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode) { return new_d_Mux(NULL, sel, ir_false, ir_true, mode); } -ir_node *new_Psi(int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode) { - return new_d_Psi(NULL, arity, conds, vals, mode); -} ir_node *new_CopyB(ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) { return new_d_CopyB(NULL, store, dst, src, data_type); }