X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircons.c;h=22f6743483613ee3be40365b6bf07b02c584feb0;hb=d2dc2564b47d9c113d7e6e598574e9733627fcca;hp=d36140a8237e8553511d3142f94b350e7145e385;hpb=1bcb9c2940ed123d3e6acbc4f8840c9f6d588744;p=libfirm diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c index d36140a82..22f674348 100644 --- a/ir/ir/ircons.c +++ b/ir/ir/ircons.c @@ -62,6 +62,111 @@ typedef struct Phi_in_stack Phi_in_stack; */ static uninitialized_local_variable_func_t *default_initialize_local_variable = NULL; +/* creates a bd constructor for a binop */ +#define NEW_BD_BINOP(instr) \ +static ir_node * \ +new_bd_##instr (dbg_info *db, ir_node *block, \ + ir_node *op1, ir_node *op2, ir_mode *mode) \ +{ \ + ir_node *in[2]; \ + ir_node *res; \ + ir_graph *irg = current_ir_graph; \ + in[0] = op1; \ + in[1] = op2; \ + res = new_ir_node(db, irg, block, op_##instr, mode, 2, in); \ + res = optimize_node(res); \ + IRN_VRFY_IRG(res, irg); \ + return res; \ +} + +/* creates a bd constructor for an unop */ +#define NEW_BD_UNOP(instr) \ +static ir_node * \ +new_bd_##instr (dbg_info *db, ir_node *block, \ + ir_node *op, ir_mode *mode) \ +{ \ + ir_node *res; \ + ir_graph *irg = current_ir_graph; \ + res = new_ir_node(db, irg, block, op_##instr, mode, 1, &op); \ + res = optimize_node(res); \ + IRN_VRFY_IRG(res, irg); \ + return res; \ +} + +/* creates a bd constructor for an divop */ +#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_node *in[3]; \ + ir_node *res; \ + ir_graph *irg = current_ir_graph; \ + in[0] = memop; \ + in[1] = op1; \ + in[2] = op2; \ + res = new_ir_node(db, irg, block, op_##instr, mode_T, 3, in); \ + res = optimize_node(res); \ + IRN_VRFY_IRG(res, irg); \ + return res; \ +} + +/* creates a rd constructor for a binop */ +#define NEW_RD_BINOP(instr) \ +ir_node * \ +new_rd_##instr (dbg_info *db, ir_graph *irg, ir_node *block, \ + ir_node *op1, ir_node *op2, ir_mode *mode) \ +{ \ + ir_node *res; \ + ir_graph *rem = current_ir_graph; \ + current_ir_graph = irg; \ + res = new_bd_##instr(db, block, op1, op2, mode); \ + current_ir_graph = rem; \ + return res; \ +} + +/* creates a rd constructor for an unop */ +#define NEW_RD_UNOP(instr) \ +ir_node * \ +new_rd_##instr (dbg_info *db, ir_graph *irg, ir_node *block, \ + ir_node *op, ir_mode *mode) \ +{ \ + ir_node *res; \ + ir_graph *rem = current_ir_graph; \ + current_ir_graph = irg; \ + res = new_bd_##instr(db, block, op, mode); \ + current_ir_graph = rem; \ + return res; \ +} + +/* creates a rd constructor for an divop */ +#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_node *res; \ + ir_graph *rem = current_ir_graph; \ + current_ir_graph = irg; \ + res = new_bd_##instr(db, block, memop, op1, op2); \ + current_ir_graph = rem; \ + return res; \ +} + +/* creates a d constructor for an binop */ +#define NEW_D_BINOP(instr) \ +ir_node * \ +new_d_##instr (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode) { \ + return new_bd_##instr(db, current_ir_graph->current_block, op1, op2, mode); \ +} + +/* creates a d constructor for an unop */ +#define NEW_D_UNOP(instr) \ +ir_node * \ +new_d_##instr (dbg_info *db, ir_node *op, ir_mode *mode) { \ + return new_bd_##instr(db, current_ir_graph->current_block, op, mode); \ +} + /* Constructs a Block with a fixed number of predecessors. Does not set current_block. Can not be used with automatic @@ -145,7 +250,7 @@ new_bd_Phi (dbg_info *db, ir_node *block, int arity, ir_node **in, ir_mode *mode /* Memory Phis in endless loops must be kept alive. As we can't distinguish these easily we keep all of them alive. */ if ((res->op == op_Phi) && (mode == mode_M)) - add_End_keepalive(irg->end, res); + add_End_keepalive(get_irg_end(irg), res); return res; } @@ -155,7 +260,7 @@ new_bd_Const_type (dbg_info *db, ir_node *block, ir_mode *mode, tarval *con, ir_ ir_node *res; ir_graph *irg = current_ir_graph; - res = new_ir_node (db, irg, irg->start_block, op_Const, mode, 0, NULL); + res = new_ir_node (db, irg, get_irg_start_block(irg), op_Const, mode, 0, NULL); res->attr.con.tv = con; set_Const_type(res, tp); /* Call method because of complex assertion. */ res = optimize_node (res); @@ -267,285 +372,34 @@ new_bd_Tuple (dbg_info *db, ir_node *block, int arity, ir_node **in) return res; } -static ir_node * -new_bd_Add (dbg_info *db, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *in[2]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = op1; - in[1] = op2; - res = new_ir_node(db, irg, block, op_Add, mode, 2, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Sub (dbg_info *db, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *in[2]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = op1; - in[1] = op2; - res = new_ir_node (db, irg, block, op_Sub, mode, 2, in); - res = optimize_node (res); - IRN_VRFY_IRG(res, irg); - - return res; -} - -static ir_node * -new_bd_Minus (dbg_info *db, ir_node *block, - ir_node *op, ir_mode *mode) -{ - ir_node *res; - ir_graph *irg = current_ir_graph; - - res = new_ir_node(db, irg, block, op_Minus, mode, 1, &op); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Mul (dbg_info *db, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *in[2]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = op1; - in[1] = op2; - res = new_ir_node(db, irg, block, op_Mul, mode, 2, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Quot (dbg_info *db, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2) -{ - ir_node *in[3]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = memop; - in[1] = op1; - in[2] = op2; - res = new_ir_node(db, irg, block, op_Quot, mode_T, 3, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_DivMod (dbg_info *db, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2) -{ - ir_node *in[3]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = memop; - in[1] = op1; - in[2] = op2; - res = new_ir_node(db, irg, block, op_DivMod, mode_T, 3, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Div (dbg_info *db, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2) -{ - ir_node *in[3]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = memop; - in[1] = op1; - in[2] = op2; - res = new_ir_node(db, irg, block, op_Div, mode_T, 3, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Mod (dbg_info *db, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2) -{ - ir_node *in[3]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = memop; - in[1] = op1; - in[2] = op2; - res = new_ir_node(db, irg, block, op_Mod, mode_T, 3, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_And (dbg_info *db, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *in[2]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = op1; - in[1] = op2; - res = new_ir_node(db, irg, block, op_And, mode, 2, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Or (dbg_info *db, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *in[2]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = op1; - in[1] = op2; - res = new_ir_node(db, irg, block, op_Or, mode, 2, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Eor (dbg_info *db, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *in[2]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = op1; - in[1] = op2; - res = new_ir_node (db, irg, block, op_Eor, mode, 2, in); - res = optimize_node (res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Not (dbg_info *db, ir_node *block, - ir_node *op, ir_mode *mode) -{ - ir_node *res; - ir_graph *irg = current_ir_graph; - - res = new_ir_node(db, irg, block, op_Not, mode, 1, &op); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Shl (dbg_info *db, ir_node *block, - ir_node *op, ir_node *k, ir_mode *mode) -{ - ir_node *in[2]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = op; - in[1] = k; - res = new_ir_node(db, irg, block, op_Shl, mode, 2, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Shr (dbg_info *db, ir_node *block, - ir_node *op, ir_node *k, ir_mode *mode) -{ - ir_node *in[2]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = op; - in[1] = k; - res = new_ir_node(db, irg, block, op_Shr, mode, 2, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} +NEW_BD_BINOP(Add) +NEW_BD_BINOP(Sub) +NEW_BD_UNOP(Minus) +NEW_BD_BINOP(Mul) +NEW_BD_DIVOP(Quot) +NEW_BD_DIVOP(DivMod) +NEW_BD_DIVOP(Div) +NEW_BD_DIVOP(Mod) +NEW_BD_BINOP(And) +NEW_BD_BINOP(Or) +NEW_BD_BINOP(Eor) +NEW_BD_UNOP(Not) +NEW_BD_BINOP(Shl) +NEW_BD_BINOP(Shr) +NEW_BD_BINOP(Shrs) +NEW_BD_BINOP(Rot) +NEW_BD_UNOP(Abs) +NEW_BD_BINOP(Carry) +NEW_BD_BINOP(Borrow) static ir_node * -new_bd_Shrs (dbg_info *db, ir_node *block, - ir_node *op, ir_node *k, ir_mode *mode) +new_bd_Cmp (dbg_info *db, ir_node *block, ir_node *op1, ir_node *op2) { ir_node *in[2]; ir_node *res; ir_graph *irg = current_ir_graph; - - in[0] = op; - in[1] = k; - res = new_ir_node(db, irg, block, op_Shrs, mode, 2, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Rot (dbg_info *db, ir_node *block, - ir_node *op, ir_node *k, ir_mode *mode) -{ - ir_node *in[2]; - ir_node *res; - ir_graph *irg = current_ir_graph; - - in[0] = op; - in[1] = k; - res = new_ir_node(db, irg, block, op_Rot, mode, 2, in); - res = optimize_node(res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Abs (dbg_info *db, ir_node *block, - ir_node *op, ir_mode *mode) -{ - ir_node *res; - ir_graph *irg = current_ir_graph; - - res = new_ir_node(db, irg, block, op_Abs, mode, 1, &op); - res = optimize_node (res); - IRN_VRFY_IRG(res, irg); - return res; -} - -static ir_node * -new_bd_Cmp (dbg_info *db, ir_node *block, - ir_node *op1, ir_node *op2) -{ - ir_node *in[2]; - ir_node *res; - ir_graph *irg = current_ir_graph; - in[0] = op1; in[1] = op2; - res = new_ir_node(db, irg, block, op_Cmp, mode_T, 2, in); res = optimize_node(res); IRN_VRFY_IRG(res, irg); @@ -808,7 +662,7 @@ new_bd_Unknown (ir_mode *m) ir_node *res; ir_graph *irg = current_ir_graph; - res = new_ir_node(NULL, irg, irg->start_block, op_Unknown, m, 0, NULL); + res = new_ir_node(NULL, irg, get_irg_start_block(irg), op_Unknown, m, 0, NULL); res = optimize_node(res); return res; } @@ -836,7 +690,7 @@ new_bd_EndReg (dbg_info *db, ir_node *block) ir_graph *irg = current_ir_graph; res = new_ir_node(db, irg, block, op_EndReg, mode_T, -1, NULL); - irg->end_reg = res; + set_irg_end_reg(irg, res); IRN_VRFY_IRG(res, irg); return res; } @@ -848,7 +702,7 @@ new_bd_EndExcept (dbg_info *db, ir_node *block) ir_graph *irg = current_ir_graph; res = new_ir_node(db, irg, block, op_EndExcept, mode_T, -1, NULL); - irg->end_except = res; + set_irg_end_except(irg, res); IRN_VRFY_IRG (res, irg); return res; } @@ -906,6 +760,31 @@ new_bd_Mux (dbg_info *db, ir_node *block, return res; } +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; +} + 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) @@ -972,7 +851,7 @@ new_bd_Bound (dbg_info *db, ir_node *block, in[2] = lower; in[3] = upper; res = new_ir_node(db, irg, block, op_Bound, mode_T, 4, in); - res->attr.copyb.exc.pin_state = op_pin_state_pinned; + res->attr.bound.exc.pin_state = op_pin_state_pinned; res = optimize_node(res); IRN_VRFY_IRG(res, irg); return res; @@ -1151,243 +1030,25 @@ new_rd_Tuple (dbg_info *db, ir_graph *irg, ir_node *block, int arity, ir_node ** return res; } -ir_node * -new_rd_Add (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Add(db, block, op1, op2, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Sub (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Sub(db, block, op1, op2, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Minus (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Minus(db, block, op, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Mul (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Mul(db, block, op1, op2, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Quot (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Quot(db, block, memop, op1, op2); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_DivMod (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_DivMod(db, block, memop, op1, op2); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Div (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Div (db, block, memop, op1, op2); - current_ir_graph =rem; - - return res; -} - -ir_node * -new_rd_Mod (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *memop, ir_node *op1, ir_node *op2) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Mod(db, block, memop, op1, op2); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_And (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_And(db, block, op1, op2, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Or (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Or(db, block, op1, op2, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Eor (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op1, ir_node *op2, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Eor(db, block, op1, op2, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Not (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Not(db, block, op, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Shl (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op, ir_node *k, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Shl (db, block, op, k, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Shr (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op, ir_node *k, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Shr(db, block, op, k, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Shrs (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op, ir_node *k, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Shrs(db, block, op, k, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Rot (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op, ir_node *k, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Rot(db, block, op, k, mode); - current_ir_graph = rem; - - return res; -} - -ir_node * -new_rd_Abs (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *op, ir_mode *mode) -{ - ir_node *res; - ir_graph *rem = current_ir_graph; - - current_ir_graph = irg; - res = new_bd_Abs(db, block, op, mode); - current_ir_graph = rem; - - return res; -} +NEW_RD_BINOP(Add) +NEW_RD_BINOP(Sub) +NEW_RD_UNOP(Minus) +NEW_RD_BINOP(Mul) +NEW_RD_DIVOP(Quot) +NEW_RD_DIVOP(DivMod) +NEW_RD_DIVOP(Div) +NEW_RD_DIVOP(Mod) +NEW_RD_BINOP(And) +NEW_RD_BINOP(Or) +NEW_RD_BINOP(Eor) +NEW_RD_UNOP(Not) +NEW_RD_BINOP(Shl) +NEW_RD_BINOP(Shr) +NEW_RD_BINOP(Shrs) +NEW_RD_BINOP(Rot) +NEW_RD_UNOP(Abs) +NEW_RD_BINOP(Carry) +NEW_RD_BINOP(Borrow) ir_node * new_rd_Cmp (dbg_info *db, ir_graph *irg, ir_node *block, @@ -1579,22 +1240,22 @@ new_rd_SymConst (dbg_info *db, ir_graph *irg, ir_node *block, symconst_symbol va ir_node *new_rd_SymConst_addr_ent (dbg_info *db, ir_graph *irg, entity *symbol, ir_type *tp) { symconst_symbol sym = {(ir_type *)symbol}; - return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_addr_ent, tp); + return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_addr_ent, tp); } ir_node *new_rd_SymConst_addr_name (dbg_info *db, ir_graph *irg, ident *symbol, ir_type *tp) { symconst_symbol sym = {(ir_type *)symbol}; - return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_addr_name, tp); + return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_addr_name, tp); } ir_node *new_rd_SymConst_type_tag (dbg_info *db, ir_graph *irg, ir_type *symbol, ir_type *tp) { symconst_symbol sym = {symbol}; - return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_type_tag, tp); + return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_type_tag, tp); } ir_node *new_rd_SymConst_size (dbg_info *db, ir_graph *irg, ir_type *symbol, ir_type *tp) { symconst_symbol sym = {symbol}; - return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_size, tp); + return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_size, tp); } ir_node * @@ -1611,9 +1272,8 @@ new_rd_Sync (dbg_info *db, ir_graph *irg, ir_node *block, int arity, ir_node **i } ir_node * -new_rd_Bad (ir_graph *irg) -{ - return irg->bad; +new_rd_Bad (ir_graph *irg) { + return get_irg_bad(irg); } ir_node * @@ -1662,7 +1322,7 @@ new_rd_EndReg (dbg_info *db, ir_graph *irg, ir_node *block) ir_node *res; res = new_ir_node(db, irg, block, op_EndReg, mode_T, -1, NULL); - irg->end_reg = res; + set_irg_end_reg(irg, res); IRN_VRFY_IRG(res, irg); return res; } @@ -1673,7 +1333,7 @@ new_rd_EndExcept (dbg_info *db, ir_graph *irg, ir_node *block) ir_node *res; res = new_ir_node(db, irg, block, op_EndExcept, mode_T, -1, NULL); - irg->end_except = res; + set_irg_end_except(irg, res); IRN_VRFY_IRG (res, irg); return res; } @@ -1707,7 +1367,7 @@ new_rd_Filter (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *arg, ir_mod ir_node * new_rd_NoMem (ir_graph *irg) { - return irg->no_mem; + return get_irg_no_mem(irg); } ir_node * @@ -1724,6 +1384,20 @@ new_rd_Mux (dbg_info *db, ir_graph *irg, ir_node *block, return res; } +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; +} + 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) { @@ -1881,10 +1555,6 @@ ir_node *new_r_Not (ir_graph *irg, ir_node *block, ir_node *op, ir_mode *mode) { return new_rd_Not(NULL, irg, block, op, mode); } -ir_node *new_r_Cmp (ir_graph *irg, ir_node *block, - ir_node *op1, ir_node *op2) { - return new_rd_Cmp(NULL, irg, block, op1, op2); -} ir_node *new_r_Shl (ir_graph *irg, ir_node *block, ir_node *op, ir_node *k, ir_mode *mode) { return new_rd_Shl(NULL, irg, block, op, k, mode); @@ -1901,6 +1571,18 @@ ir_node *new_r_Rot (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); } +ir_node *new_r_Carry (ir_graph *irg, ir_node *block, + ir_node *op, ir_node *k, ir_mode *mode) { + return new_rd_Carry(NULL, irg, block, op, k, mode); +} +ir_node *new_r_Borrow (ir_graph *irg, ir_node *block, + ir_node *op, ir_node *k, ir_mode *mode) { + return new_rd_Borrow(NULL, irg, block, op, k, mode); +} +ir_node *new_r_Cmp (ir_graph *irg, ir_node *block, + ir_node *op1, ir_node *op2) { + return new_rd_Cmp(NULL, irg, block, op1, op2); +} ir_node *new_r_Conv (ir_graph *irg, ir_node *block, ir_node *op, ir_mode *mode) { return new_rd_Conv(NULL, irg, block, op, mode); @@ -1979,6 +1661,10 @@ 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); @@ -2490,7 +2176,7 @@ new_rd_Phi_in (ir_graph *irg, ir_node *block, ir_mode *mode, /* Memory Phis in endless loops must be kept alive. As we can't distinguish these easily we keep all of them alive. */ if ((res->op == op_Phi) && (mode == mode_M)) - add_End_keepalive(irg->end, res); + add_End_keepalive(get_irg_end(irg), res); } return res; @@ -2889,43 +2575,38 @@ mature_immBlock (ir_node *block) ir_node * new_d_Phi (dbg_info *db, int arity, ir_node **in, ir_mode *mode) { - return new_bd_Phi(db, current_ir_graph->current_block, - arity, in, mode); + return new_bd_Phi(db, current_ir_graph->current_block, arity, in, mode); } ir_node * new_d_Const (dbg_info *db, ir_mode *mode, tarval *con) { - return new_bd_Const(db, current_ir_graph->start_block, - mode, con); + return new_bd_Const(db, get_irg_start_block(current_ir_graph), mode, con); } ir_node * new_d_Const_long(dbg_info *db, ir_mode *mode, long value) { - return new_bd_Const_long(db, current_ir_graph->start_block, mode, value); + return new_bd_Const_long(db, get_irg_start_block(current_ir_graph), mode, value); } ir_node * new_d_Const_type (dbg_info *db, ir_mode *mode, tarval *con, ir_type *tp) { - return new_bd_Const_type(db, current_ir_graph->start_block, - mode, con, tp); + return new_bd_Const_type(db, get_irg_start_block(current_ir_graph), mode, con, tp); } ir_node * new_d_Id (dbg_info *db, ir_node *val, ir_mode *mode) { - return new_bd_Id(db, current_ir_graph->current_block, - val, mode); + return new_bd_Id(db, current_ir_graph->current_block, val, mode); } ir_node * new_d_Proj (dbg_info *db, ir_node *arg, ir_mode *mode, long proj) { - return new_bd_Proj(db, current_ir_graph->current_block, - arg, mode, proj); + return new_bd_Proj(db, current_ir_graph->current_block, arg, mode, proj); } ir_node * @@ -2942,8 +2623,7 @@ new_d_defaultProj (dbg_info *db, ir_node *arg, long max_proj) ir_node * new_d_Conv (dbg_info *db, ir_node *op, ir_mode *mode) { - return new_bd_Conv(db, current_ir_graph->current_block, - op, mode); + return new_bd_Conv(db, current_ir_graph->current_block, op, mode); } ir_node * @@ -2955,38 +2635,13 @@ new_d_Cast (dbg_info *db, ir_node *op, ir_type *to_tp) ir_node * new_d_Tuple (dbg_info *db, int arity, ir_node **in) { - return new_bd_Tuple(db, current_ir_graph->current_block, - arity, in); + return new_bd_Tuple(db, current_ir_graph->current_block, arity, in); } -ir_node * -new_d_Add (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode) -{ - return new_bd_Add(db, current_ir_graph->current_block, - op1, op2, mode); -} - -ir_node * -new_d_Sub (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode) -{ - return new_bd_Sub(db, current_ir_graph->current_block, - op1, op2, mode); -} - - -ir_node * -new_d_Minus (dbg_info *db, ir_node *op, ir_mode *mode) -{ - return new_bd_Minus(db, current_ir_graph->current_block, - op, mode); -} - -ir_node * -new_d_Mul (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode) -{ - return new_bd_Mul(db, current_ir_graph->current_block, - op1, op2, mode); -} +NEW_D_BINOP(Add) +NEW_D_BINOP(Sub) +NEW_D_UNOP(Minus) +NEW_D_BINOP(Mul) /** * allocate the frag array @@ -3001,13 +2656,11 @@ static void allocate_frag_arr(ir_node *res, ir_op *op, ir_node ***frag_store) { } } - ir_node * new_d_Quot (dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2) { ir_node *res; - res = new_bd_Quot (db, current_ir_graph->current_block, - memop, op1, op2); + res = new_bd_Quot (db, current_ir_graph->current_block, memop, op1, op2); res->attr.except.pin_state = op_pin_state_pinned; #if PRECISE_EXC_CONTEXT allocate_frag_arr(res, op_Quot, &res->attr.except.frag_arr); /* Could be optimized away. */ @@ -3020,8 +2673,7 @@ ir_node * new_d_DivMod (dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2) { ir_node *res; - res = new_bd_DivMod (db, current_ir_graph->current_block, - memop, op1, op2); + res = new_bd_DivMod (db, current_ir_graph->current_block, memop, op1, op2); res->attr.except.pin_state = op_pin_state_pinned; #if PRECISE_EXC_CONTEXT allocate_frag_arr(res, op_DivMod, &res->attr.except.frag_arr); /* Could be optimized away. */ @@ -3034,8 +2686,7 @@ ir_node * new_d_Div (dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2) { ir_node *res; - res = new_bd_Div (db, current_ir_graph->current_block, - memop, op1, op2); + res = new_bd_Div (db, current_ir_graph->current_block, memop, op1, op2); res->attr.except.pin_state = op_pin_state_pinned; #if PRECISE_EXC_CONTEXT allocate_frag_arr(res, op_Div, &res->attr.except.frag_arr); /* Could be optimized away. */ @@ -3048,8 +2699,7 @@ ir_node * new_d_Mod (dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2) { ir_node *res; - res = new_bd_Mod (db, current_ir_graph->current_block, - memop, op1, op2); + res = new_bd_Mod (db, current_ir_graph->current_block, memop, op1, op2); res->attr.except.pin_state = op_pin_state_pinned; #if PRECISE_EXC_CONTEXT allocate_frag_arr(res, op_Mod, &res->attr.except.frag_arr); /* Could be optimized away. */ @@ -3058,74 +2708,22 @@ new_d_Mod (dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2) return res; } -ir_node * -new_d_And (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode) -{ - return new_bd_And (db, current_ir_graph->current_block, - op1, op2, mode); -} - -ir_node * -new_d_Or (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode) -{ - return new_bd_Or (db, current_ir_graph->current_block, - op1, op2, mode); -} - -ir_node * -new_d_Eor (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode) -{ - return new_bd_Eor (db, current_ir_graph->current_block, - op1, op2, mode); -} - -ir_node * -new_d_Not (dbg_info *db, ir_node *op, ir_mode *mode) -{ - return new_bd_Not (db, current_ir_graph->current_block, - op, mode); -} - -ir_node * -new_d_Shl (dbg_info *db, ir_node *op, ir_node *k, ir_mode *mode) -{ - return new_bd_Shl (db, current_ir_graph->current_block, - op, k, mode); -} - -ir_node * -new_d_Shr (dbg_info *db, ir_node *op, ir_node *k, ir_mode *mode) -{ - return new_bd_Shr (db, current_ir_graph->current_block, - op, k, mode); -} - -ir_node * -new_d_Shrs (dbg_info *db, ir_node *op, ir_node *k, ir_mode *mode) -{ - return new_bd_Shrs (db, current_ir_graph->current_block, - op, k, mode); -} - -ir_node * -new_d_Rot (dbg_info *db, ir_node *op, ir_node *k, ir_mode *mode) -{ - return new_bd_Rot (db, current_ir_graph->current_block, - op, k, mode); -} - -ir_node * -new_d_Abs (dbg_info *db, ir_node *op, ir_mode *mode) -{ - return new_bd_Abs (db, current_ir_graph->current_block, - op, mode); -} +NEW_D_BINOP(And) +NEW_D_BINOP(Or) +NEW_D_BINOP(Eor) +NEW_D_UNOP(Not) +NEW_D_BINOP(Shl) +NEW_D_BINOP(Shr) +NEW_D_BINOP(Shrs) +NEW_D_BINOP(Rot) +NEW_D_UNOP(Abs) +NEW_D_BINOP(Carry) +NEW_D_BINOP(Borrow) ir_node * new_d_Cmp (dbg_info *db, ir_node *op1, ir_node *op2) { - return new_bd_Cmp (db, current_ir_graph->current_block, - op1, op2); + return new_bd_Cmp(db, current_ir_graph->current_block, op1, op2); } ir_node * @@ -3234,22 +2832,21 @@ new_d_Sel (dbg_info *db, ir_node *store, ir_node *objptr, int n_index, ir_node * ir_node * new_d_SymConst_type (dbg_info *db, symconst_symbol value, symconst_kind kind, ir_type *tp) { - return new_bd_SymConst_type (db, current_ir_graph->start_block, + return new_bd_SymConst_type (db, get_irg_start_block(current_ir_graph), value, kind, tp); } ir_node * new_d_SymConst (dbg_info *db, symconst_symbol value, symconst_kind kind) { - return new_bd_SymConst (db, current_ir_graph->start_block, + return new_bd_SymConst (db, get_irg_start_block(current_ir_graph), value, kind); } ir_node * new_d_Sync (dbg_info *db, int arity, ir_node** in) { - return new_bd_Sync (db, current_ir_graph->current_block, - arity, in); + return new_bd_Sync (db, current_ir_graph->current_block, arity, in); } @@ -3321,6 +2918,12 @@ new_d_Mux (dbg_info *db, ir_node *sel, ir_node *ir_false, sel, ir_false, ir_true, mode); } +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); +} + ir_node *new_d_CopyB(dbg_info *db,ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) { ir_node *res; @@ -3477,7 +3080,7 @@ set_store (ir_node *store) void keep_alive (ir_node *ka) { - add_End_keepalive(current_ir_graph->end, ka); + add_End_keepalive(get_irg_end(current_ir_graph), ka); } /* --- Useful access routines --- */ @@ -3503,24 +3106,16 @@ init_cons(uninitialized_local_variable_func_t *func) default_initialize_local_variable = func; } -/* call for each graph */ -void -irg_finalize_cons (ir_graph *irg) { - irg->phase_state = phase_high; -} - void irp_finalize_cons (void) { - int i, n_irgs = get_irp_n_irgs(); - for (i = 0; i < n_irgs; i++) { + int i; + for (i = get_irp_n_irgs() - 1; i >= 0; --i) { irg_finalize_cons(get_irp_irg(i)); } - irp->phase_state = phase_high;\ + irp->phase_state = phase_high; } - - ir_node *new_Block(int arity, ir_node **in) { return new_d_Block(NULL, arity, in); } @@ -3620,6 +3215,12 @@ ir_node *new_Shrs (ir_node *op, ir_node *k, ir_mode *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_Carry (ir_node *op1, ir_node *op2, ir_mode *mode) { + return new_d_Carry(NULL, op1, op2, mode); +} +ir_node *new_Borrow (ir_node *op1, ir_node *op2, ir_mode *mode) { + return new_d_Borrow(NULL, op1, op2, mode); +} ir_node *new_Cmp (ir_node *op1, ir_node *op2) { return new_d_Cmp(NULL, op1, op2); } @@ -3691,6 +3292,9 @@ 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); }