X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_dw.c;h=1eba62520cf280cac3f59d1f624a4bb74a3ead3e;hb=3da5ed2598245b896255bc444aaa1768f6098cfe;hp=f7511080006d3f15b63a2b869654561d72ff42c9;hpb=533dd6365655673e864462ae7c459d58d8fa7683;p=libfirm diff --git a/ir/lower/lower_dw.c b/ir/lower/lower_dw.c index f75110800..1eba62520 100644 --- a/ir/lower/lower_dw.c +++ b/ir/lower/lower_dw.c @@ -127,7 +127,8 @@ typedef struct _lower_env_t { /** * Get a primitive mode for a mode. */ -static ir_type *get_primitive_type(ir_mode *mode) { +static ir_type *get_primitive_type(ir_mode *mode) +{ pmap_entry *entry = pmap_find(prim_types, mode); ir_type *tp; char buf[64]; @@ -145,7 +146,8 @@ static ir_type *get_primitive_type(ir_mode *mode) { /** * Create a method type for a Conv emulation from imode to omode. */ -static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode, lower_env_t *env) { +static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode, lower_env_t *env) +{ conv_tp_entry_t key, *entry; ir_type *mtd; @@ -331,7 +333,8 @@ static void prepare_links(ir_node *node, void *env) /** * Translate a Constant: create two. */ -static void lower_Const(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Const(ir_node *node, ir_mode *mode, lower_env_t *env) +{ tarval *tv, *tv_l, *tv_h; ir_node *low, *high; dbg_info *dbg = get_irn_dbg_info(node); @@ -356,7 +359,8 @@ static void lower_Const(ir_node *node, ir_mode *mode, lower_env_t *env) { /** * Translate a Load: create two. */ -static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_mode *low_mode = env->params->low_unsigned; ir_graph *irg = current_ir_graph; ir_node *adr = get_Load_ptr(node); @@ -379,7 +383,7 @@ static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) { /* create two loads */ dbg = get_irn_dbg_info(node); low = new_rd_Load(dbg, block, mem, low, low_mode, volatility); - proj = new_r_Proj(block, low, mode_M, pn_Load_M); + proj = new_r_Proj(low, mode_M, pn_Load_M); high = new_rd_Load(dbg, block, proj, high, mode, volatility); idx = get_irn_idx(node); @@ -401,8 +405,8 @@ static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) { break; case pn_Load_res: /* Result of load operation. */ assert(idx < env->n_entries); - env->entries[idx]->low_word = new_r_Proj(block, low, low_mode, pn_Load_res); - env->entries[idx]->high_word = new_r_Proj(block, high, mode, pn_Load_res); + env->entries[idx]->low_word = new_r_Proj(low, low_mode, pn_Load_res); + env->entries[idx]->high_word = new_r_Proj(high, mode, pn_Load_res); break; default: assert(0 && "unexpected Proj number"); @@ -416,7 +420,8 @@ static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) { /** * Translate a Store: create two. */ -static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_graph *irg; ir_node *block, *adr, *mem; ir_node *low, *high, *irn, *proj; @@ -453,7 +458,7 @@ static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) { /* create two Stores */ dbg = get_irn_dbg_info(node); low = new_rd_Store(dbg, block, mem, low, entry->low_word, volatility); - proj = new_r_Proj(block, low, mode_M, pn_Store_M); + proj = new_r_Proj(low, mode_M, pn_Store_M); high = new_rd_Store(dbg, block, proj, high, entry->high_word, volatility); idx = get_irn_idx(node); @@ -493,7 +498,8 @@ static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) { */ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op, ir_mode *imode, ir_mode *omode, - lower_env_t *env) { + lower_env_t *env) +{ symconst_symbol sym; ir_entity *ent; op_mode_entry_t key, *entry; @@ -523,7 +529,8 @@ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op, * * Create an intrinsic Call. */ -static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *block, *irn, *call, *proj; ir_node *in[4]; ir_mode *opmode; @@ -566,7 +573,7 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) { irn = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode, env); call = new_rd_Call(dbg, block, get_Div_mem(node), irn, 4, in, mtp); set_irn_pinned(call, get_irn_pinned(node)); - irn = new_r_Proj(block, call, mode_T, pn_Call_T_result); + irn = new_r_Proj(call, mode_T, pn_Call_T_result); for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) { switch (get_Proj_proj(proj)) { @@ -583,8 +590,8 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) { case pn_Div_res: /* Result of computation. */ idx = get_irn_idx(proj); assert(idx < env->n_entries); - env->entries[idx]->low_word = new_r_Proj(block, irn, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(block, irn, mode, 1); + env->entries[idx]->low_word = new_r_Proj(irn, env->params->low_unsigned, 0); + env->entries[idx]->high_word = new_r_Proj(irn, mode, 1); break; default: assert(0 && "unexpected Proj number"); @@ -600,7 +607,8 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) { * * Create an intrinsic Call. */ -static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *block, *proj, *irn, *call; ir_node *in[4]; ir_mode *opmode; @@ -643,7 +651,7 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) { irn = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode, env); call = new_rd_Call(dbg, block, get_Mod_mem(node), irn, 4, in, mtp); set_irn_pinned(call, get_irn_pinned(node)); - irn = new_r_Proj(block, call, mode_T, pn_Call_T_result); + irn = new_r_Proj(call, mode_T, pn_Call_T_result); for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) { switch (get_Proj_proj(proj)) { @@ -660,8 +668,8 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) { case pn_Mod_res: /* Result of computation. */ idx = get_irn_idx(proj); assert(idx < env->n_entries); - env->entries[idx]->low_word = new_r_Proj(block, irn, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(block, irn, mode, 1); + env->entries[idx]->low_word = new_r_Proj(irn, env->params->low_unsigned, 0); + env->entries[idx]->high_word = new_r_Proj(irn, mode, 1); break; default: assert(0 && "unexpected Proj number"); @@ -677,7 +685,8 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) { * * Create two intrinsic Calls. */ -static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *block, *proj, *irn, *mem, *callDiv, *callMod; ir_node *resDiv = NULL; ir_node *resMod = NULL; @@ -736,16 +745,16 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) { irn = get_intrinsic_address(mtp, op_Div, opmode, opmode, env); callDiv = new_rd_Call(dbg, block, mem, irn, 4, in, mtp); set_irn_pinned(callDiv, get_irn_pinned(node)); - resDiv = new_r_Proj(block, callDiv, mode_T, pn_Call_T_result); + resDiv = new_r_Proj(callDiv, mode_T, pn_Call_T_result); } /* if */ if (flags & 2) { if (flags & 1) - mem = new_r_Proj(block, callDiv, mode_M, pn_Call_M); + mem = new_r_Proj(callDiv, mode_M, pn_Call_M); opmode = get_irn_op_mode(node); irn = get_intrinsic_address(mtp, op_Mod, opmode, opmode, env); callMod = new_rd_Call(dbg, block, mem, irn, 4, in, mtp); set_irn_pinned(callMod, get_irn_pinned(node)); - resMod = new_r_Proj(block, callMod, mode_T, pn_Call_T_result); + resMod = new_r_Proj(callMod, mode_T, pn_Call_T_result); } /* if */ for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) { @@ -763,13 +772,13 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) { case pn_DivMod_res_div: /* Result of Div. */ idx = get_irn_idx(proj); assert(idx < env->n_entries); - env->entries[idx]->low_word = new_r_Proj(block, resDiv, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(block, resDiv, mode, 1); + env->entries[idx]->low_word = new_r_Proj(resDiv, env->params->low_unsigned, 0); + env->entries[idx]->high_word = new_r_Proj(resDiv, mode, 1); break; case pn_DivMod_res_mod: /* Result of Mod. */ idx = get_irn_idx(proj); - env->entries[idx]->low_word = new_r_Proj(block, resMod, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(block, resMod, mode, 1); + env->entries[idx]->low_word = new_r_Proj(resMod, env->params->low_unsigned, 0); + env->entries[idx]->high_word = new_r_Proj(resMod, mode, 1); break; default: assert(0 && "unexpected Proj number"); @@ -785,7 +794,8 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) { * * Create an intrinsic Call. */ -static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *block, *irn; ir_node *in[4]; dbg_info *dbg; @@ -829,12 +839,12 @@ static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) { irn = new_rd_Call(dbg, block, get_irg_no_mem(current_ir_graph), irn, 4, in, mtp); set_irn_pinned(irn, get_irn_pinned(node)); - irn = new_r_Proj(block, irn, mode_T, pn_Call_T_result); + irn = new_r_Proj(irn, mode_T, pn_Call_T_result); idx = get_irn_idx(node); assert(idx < env->n_entries); - env->entries[idx]->low_word = new_r_Proj(block, irn, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(block, irn, mode, 1); + env->entries[idx]->low_word = new_r_Proj(irn, env->params->low_unsigned, 0); + env->entries[idx]->high_word = new_r_Proj(irn, mode, 1); } /* lower_Binop */ /** @@ -842,7 +852,8 @@ static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) { * * Create an intrinsic Call. */ -static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *block, *irn; ir_node *in[3]; dbg_info *dbg; @@ -878,18 +889,19 @@ static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env) { irn = new_rd_Call(dbg, block, get_irg_no_mem(current_ir_graph), irn, 3, in, mtp); set_irn_pinned(irn, get_irn_pinned(node)); - irn = new_r_Proj(block, irn, mode_T, pn_Call_T_result); + irn = new_r_Proj(irn, mode_T, pn_Call_T_result); idx = get_irn_idx(node); assert(idx < env->n_entries); - env->entries[idx]->low_word = new_r_Proj(block, irn, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(block, irn, mode, 1); + env->entries[idx]->low_word = new_r_Proj(irn, env->params->low_unsigned, 0); + env->entries[idx]->high_word = new_r_Proj(irn, mode, 1); } /* lower_Shiftop */ /** * Translate a Shr and handle special cases. */ -static void lower_Shr(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Shr(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *right = get_Shr_right(node); ir_graph *irg = current_ir_graph; @@ -930,7 +942,8 @@ static void lower_Shr(ir_node *node, ir_mode *mode, lower_env_t *env) { /** * Translate a Shl and handle special cases. */ -static void lower_Shl(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Shl(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *right = get_Shl_right(node); ir_graph *irg = current_ir_graph; @@ -946,7 +959,14 @@ static void lower_Shl(ir_node *node, ir_mode *mode, lower_env_t *env) { long shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode); int idx = get_irn_idx(left); - left = new_r_Conv(block, env->entries[idx]->low_word, mode); + left = env->entries[idx]->low_word; + if (left == NULL) { + /* not ready yet, wait */ + pdeq_putr(env->waitq, node); + return; + } + + left = new_r_Conv(block, left, mode); idx = get_irn_idx(node); mode_l = env->params->low_unsigned; @@ -967,7 +987,8 @@ static void lower_Shl(ir_node *node, ir_mode *mode, lower_env_t *env) { /** * Translate a Shrs and handle special cases. */ -static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *right = get_Shrs_right(node); ir_graph *irg = current_ir_graph; @@ -985,8 +1006,13 @@ static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env) { ir_node *c; left = env->entries[idx]->high_word; - idx = get_irn_idx(node); + if (left == NULL) { + /* not ready yet, wait */ + pdeq_putr(env->waitq, node); + return; + } + idx = get_irn_idx(node); mode_l = env->params->low_unsigned; if (shf_cnt > 0) { c = new_r_Const_long(irg, mode_l, shf_cnt); @@ -1009,7 +1035,8 @@ static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env) { /** * Rebuild Rotl nodes into Or(Shl, Shr) and prepare all nodes. */ -static void prepare_links_and_handle_rotl(ir_node *node, void *env) { +static void prepare_links_and_handle_rotl(ir_node *node, void *env) +{ lower_env_t *lenv = env; if (is_Rotl(node)) { @@ -1066,7 +1093,8 @@ static void prepare_links_and_handle_rotl(ir_node *node, void *env) { /** * Translate a special case Rotl(x, sizeof(w)). */ -static void lower_Rotl(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Rotl(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *right = get_Rotl_right(node); ir_node *left = get_Rotl_left(node); ir_node *h, *l; @@ -1091,7 +1119,8 @@ static void lower_Rotl(ir_node *node, ir_mode *mode, lower_env_t *env) { * * Create an intrinsic Call. */ -static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *block, *irn; ir_node *in[2]; dbg_info *dbg; @@ -1120,12 +1149,12 @@ static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env) { irn = new_rd_Call(dbg, block, get_irg_no_mem(current_ir_graph), irn, 2, in, mtp); set_irn_pinned(irn, get_irn_pinned(node)); - irn = new_r_Proj(block, irn, mode_T, pn_Call_T_result); + irn = new_r_Proj(irn, mode_T, pn_Call_T_result); idx = get_irn_idx(node); assert(idx < env->n_entries); - env->entries[idx]->low_word = new_r_Proj(block, irn, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(block, irn, mode, 1); + env->entries[idx]->low_word = new_r_Proj(irn, env->params->low_unsigned, 0); + env->entries[idx]->high_word = new_r_Proj(irn, mode, 1); } /* lower_Unop */ /** @@ -1193,7 +1222,8 @@ lower_logical(Eor) * * Create two logical Nots. */ -static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *block, *irn; ir_node *op_l, *op_h; dbg_info *dbg; @@ -1225,7 +1255,8 @@ static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env) { /** * Translate a Cond. */ -static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_node *cmp, *left, *right, *block; ir_node *sel = get_Cond_selector(node); ir_mode *m = get_irn_mode(sel); @@ -1242,11 +1273,11 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) { ir_graph *irg; dbg_info *dbg; - if(!is_Proj(sel)) + if (!is_Proj(sel)) return; cmp = get_Proj_pred(sel); - if(!is_Cmp(cmp)) + if (!is_Cmp(cmp)) return; left = get_Cmp_left(cmp); @@ -1300,7 +1331,7 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) { ir_node *or = new_rd_Or(dbg, block, low, high, mode); ir_node *cmp = new_rd_Cmp(dbg, block, or, new_Const_long(mode, 0)); - ir_node *proj = new_r_Proj(block, cmp, mode_b, pnc); + ir_node *proj = new_r_Proj(cmp, mode_b, pnc); set_Cond_selector(node, proj); return; } @@ -1315,30 +1346,30 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) { assert(entry); dst_blk = entry->value; - irn = new_r_Proj(block, cmpH, mode_b, pn_Cmp_Eq); + irn = new_r_Proj(cmpH, mode_b, pn_Cmp_Eq); dbg = get_irn_dbg_info(node); irn = new_rd_Cond(dbg, block, irn); - projHF = new_r_Proj(block, irn, mode_X, pn_Cond_false); + projHF = new_r_Proj(irn, mode_X, pn_Cond_false); mark_irn_visited(projHF); exchange(projF, projHF); - projHT = new_r_Proj(block, irn, mode_X, pn_Cond_true); + projHT = new_r_Proj(irn, mode_X, pn_Cond_true); mark_irn_visited(projHT); new_bl = new_r_Block(irg, 1, &projHT); dbg = get_irn_dbg_info(cmp); cmpL = new_rd_Cmp(dbg, new_bl, lentry->low_word, rentry->low_word); - irn = new_r_Proj(new_bl, cmpL, mode_b, pn_Cmp_Eq); + irn = new_r_Proj(cmpL, mode_b, pn_Cmp_Eq); dbg = get_irn_dbg_info(node); irn = new_rd_Cond(dbg, new_bl, irn); - proj = new_r_Proj(new_bl, irn, mode_X, pn_Cond_false); + proj = new_r_Proj(irn, mode_X, pn_Cond_false); mark_irn_visited(proj); add_block_cf_input(dst_blk, projHF, proj); - proj = new_r_Proj(new_bl, irn, mode_X, pn_Cond_true); + proj = new_r_Proj(irn, mode_X, pn_Cond_true); mark_irn_visited(proj); exchange(projT, proj); } else if (pnc == pn_Cmp_Lg) { @@ -1348,30 +1379,30 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) { assert(entry); dst_blk = entry->value; - irn = new_r_Proj(block, cmpH, mode_b, pn_Cmp_Lg); + irn = new_r_Proj(cmpH, mode_b, pn_Cmp_Lg); dbg = get_irn_dbg_info(node); irn = new_rd_Cond(dbg, block, irn); - projHT = new_r_Proj(block, irn, mode_X, pn_Cond_true); + projHT = new_r_Proj(irn, mode_X, pn_Cond_true); mark_irn_visited(projHT); exchange(projT, projHT); - projHF = new_r_Proj(block, irn, mode_X, pn_Cond_false); + projHF = new_r_Proj(irn, mode_X, pn_Cond_false); mark_irn_visited(projHF); new_bl = new_r_Block(irg, 1, &projHF); dbg = get_irn_dbg_info(cmp); cmpL = new_rd_Cmp(dbg, new_bl, lentry->low_word, rentry->low_word); - irn = new_r_Proj(new_bl, cmpL, mode_b, pn_Cmp_Lg); + irn = new_r_Proj(cmpL, mode_b, pn_Cmp_Lg); dbg = get_irn_dbg_info(node); irn = new_rd_Cond(dbg, new_bl, irn); - proj = new_r_Proj(new_bl, irn, mode_X, pn_Cond_true); + proj = new_r_Proj(irn, mode_X, pn_Cond_true); mark_irn_visited(proj); add_block_cf_input(dst_blk, projHT, proj); - proj = new_r_Proj(new_bl, irn, mode_X, pn_Cond_false); + proj = new_r_Proj(irn, mode_X, pn_Cond_false); mark_irn_visited(proj); exchange(projF, proj); } else { @@ -1387,44 +1418,44 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) { assert(entry); dstF = entry->value; - irn = new_r_Proj(block, cmpH, mode_b, pnc & ~pn_Cmp_Eq); + irn = new_r_Proj(cmpH, mode_b, pnc & ~pn_Cmp_Eq); dbg = get_irn_dbg_info(node); irn = new_rd_Cond(dbg, block, irn); - projHT = new_r_Proj(block, irn, mode_X, pn_Cond_true); + projHT = new_r_Proj(irn, mode_X, pn_Cond_true); mark_irn_visited(projHT); exchange(projT, projHT); projT = projHT; - projHF = new_r_Proj(block, irn, mode_X, pn_Cond_false); + projHF = new_r_Proj(irn, mode_X, pn_Cond_false); mark_irn_visited(projHF); newbl_eq = new_r_Block(irg, 1, &projHF); - irn = new_r_Proj(block, cmpH, mode_b, pn_Cmp_Eq); + irn = new_r_Proj(cmpH, mode_b, pn_Cmp_Eq); irn = new_rd_Cond(dbg, newbl_eq, irn); - proj = new_r_Proj(newbl_eq, irn, mode_X, pn_Cond_false); + proj = new_r_Proj(irn, mode_X, pn_Cond_false); mark_irn_visited(proj); exchange(projF, proj); projF = proj; - proj = new_r_Proj(newbl_eq, irn, mode_X, pn_Cond_true); + proj = new_r_Proj(irn, mode_X, pn_Cond_true); mark_irn_visited(proj); newbl_l = new_r_Block(irg, 1, &proj); dbg = get_irn_dbg_info(cmp); cmpL = new_rd_Cmp(dbg, newbl_l, lentry->low_word, rentry->low_word); - irn = new_r_Proj(newbl_l, cmpL, mode_b, pnc); + irn = new_r_Proj(cmpL, mode_b, pnc); dbg = get_irn_dbg_info(node); irn = new_rd_Cond(dbg, newbl_l, irn); - proj = new_r_Proj(newbl_l, irn, mode_X, pn_Cond_true); + proj = new_r_Proj(irn, mode_X, pn_Cond_true); mark_irn_visited(proj); add_block_cf_input(dstT, projT, proj); - proj = new_r_Proj(newbl_l, irn, mode_X, pn_Cond_false); + proj = new_r_Proj(irn, mode_X, pn_Cond_false); mark_irn_visited(proj); add_block_cf_input(dstF, projF, proj); } /* if */ @@ -1514,10 +1545,10 @@ static void lower_Conv_to_Ll(ir_node *node, lower_env_t *env) irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, env); call = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 1, &op, mtp); set_irn_pinned(call, get_irn_pinned(node)); - irn = new_r_Proj(block, call, mode_T, pn_Call_T_result); + irn = new_r_Proj(call, mode_T, pn_Call_T_result); - entry->low_word = new_r_Proj(block, irn, low_unsigned, 0); - entry->high_word = new_r_Proj(block, irn, low_signed, 1); + entry->low_word = new_r_Proj(irn, low_unsigned, 0); + entry->high_word = new_r_Proj(irn, low_signed, 1); } } @@ -1567,9 +1598,9 @@ static void lower_Conv_from_Ll(ir_node *node, lower_env_t *env) call = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 2, in, mtp); set_irn_pinned(call, get_irn_pinned(node)); - irn = new_r_Proj(block, call, mode_T, pn_Call_T_result); + irn = new_r_Proj(call, mode_T, pn_Call_T_result); - exchange(node, new_r_Proj(block, irn, omode, 0)); + exchange(node, new_r_Proj(irn, omode, 0)); } } @@ -1601,7 +1632,8 @@ static void lower_Conv(ir_node *node, ir_mode *mode, lower_env_t *env) * * @return the lowered type */ -static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) { +static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) +{ pmap_entry *entry; ident *lid; ir_type *res, *value_type; @@ -1731,7 +1763,8 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) { /** * Translate a Return. */ -static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_graph *irg = current_ir_graph; ir_entity *ent = get_irg_entity(irg); ir_type *mtp = get_entity_type(ent); @@ -1789,7 +1822,8 @@ static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) { /** * Translate the parameters. */ -static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_graph *irg = get_irn_irg(node); ir_entity *ent = get_irg_entity(irg); ir_type *tp = get_entity_type(ent); @@ -1868,9 +1902,9 @@ static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) { dbg = get_irn_dbg_info(proj); env->entries[idx]->low_word = - new_rd_Proj(dbg, get_nodes_block(proj), args, low_mode, new_projs[proj_nr]); + new_rd_Proj(dbg, args, low_mode, new_projs[proj_nr]); env->entries[idx]->high_word = - new_rd_Proj(dbg, get_nodes_block(proj), args, mode, new_projs[proj_nr] + 1); + new_rd_Proj(dbg, args, mode, new_projs[proj_nr] + 1); } /* if */ } /* for */ set_optimize(rem); @@ -1879,7 +1913,8 @@ static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) { /** * Translate a Call. */ -static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) +{ ir_type *tp = get_Call_type(node); ir_type *call_tp; ir_node **in, *proj, *results; @@ -2000,9 +2035,9 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) { dbg = get_irn_dbg_info(proj); env->entries[idx]->low_word = - new_rd_Proj(dbg, get_nodes_block(proj), results, low_mode, res_numbers[proj_nr]); + new_rd_Proj(dbg, results, low_mode, res_numbers[proj_nr]); env->entries[idx]->high_word = - new_rd_Proj(dbg, get_nodes_block(proj), results, mode, res_numbers[proj_nr] + 1); + new_rd_Proj(dbg, results, mode, res_numbers[proj_nr] + 1); } /* if */ mark_irn_visited(proj); } /* if */ @@ -2014,7 +2049,8 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) { /** * Translate an Unknown into two. */ -static void lower_Unknown(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Unknown(ir_node *node, ir_mode *mode, lower_env_t *env) +{ int idx = get_irn_idx(node); ir_graph *irg = get_irn_irg(node); ir_mode *low_mode = env->params->low_unsigned; @@ -2028,7 +2064,8 @@ static void lower_Unknown(ir_node *node, ir_mode *mode, lower_env_t *env) { * * First step: just create two templates */ -static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) { +static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) +{ ir_mode *mode_l = env->params->low_unsigned; ir_graph *irg = get_irn_irg(phi); ir_node *block, *unk_l, *unk_h, *phi_l, *phi_h; @@ -2102,7 +2139,8 @@ static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) { /** * Translate a Mux. */ -static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) { +static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) +{ ir_node *block, *val; ir_node *true_l, *true_h, *false_l, *false_h, *sel; dbg_info *dbg; @@ -2147,7 +2185,8 @@ static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) { /** * Translate an ASM node. */ -static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env) { +static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env) +{ ir_mode *his = env->params->high_signed; ir_mode *hiu = env->params->high_unsigned; int i; @@ -2179,7 +2218,8 @@ static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env) { /** * Translate a Sel node. */ -static void lower_Sel(ir_node *sel, ir_mode *mode, lower_env_t *env) { +static void lower_Sel(ir_node *sel, ir_mode *mode, lower_env_t *env) +{ (void) mode; /* we must only lower value parameter Sels if we change the @@ -2198,7 +2238,8 @@ static void lower_Sel(ir_node *sel, ir_mode *mode, lower_env_t *env) { /** * check for opcodes that must always be lowered. */ -static int always_lower(ir_opcode code) { +static int always_lower(ir_opcode code) +{ switch (code) { case iro_ASM: case iro_Proj: @@ -2217,7 +2258,8 @@ static int always_lower(ir_opcode code) { /** * lower boolean Proj(Cmp) */ -static ir_node *lower_boolean_Proj_Cmp(ir_node *proj, ir_node *cmp, lower_env_t *env) { +static ir_node *lower_boolean_Proj_Cmp(ir_node *proj, ir_node *cmp, lower_env_t *env) +{ int lidx, ridx; ir_node *l, *r, *low, *high, *t, *res; pn_Cmp pnc; @@ -2247,23 +2289,23 @@ static ir_node *lower_boolean_Proj_Cmp(ir_node *proj, ir_node *cmp, lower_env_t if (pnc == pn_Cmp_Eq) { /* simple case:a == b <==> a_h == b_h && a_l == b_l */ res = new_rd_And(db, blk, - new_r_Proj(blk, low, mode_b, pnc), - new_r_Proj(blk, high, mode_b, pnc), + new_r_Proj(low, mode_b, pnc), + new_r_Proj(high, mode_b, pnc), mode_b); } else if (pnc == pn_Cmp_Lg) { /* simple case:a != b <==> a_h != b_h || a_l != b_l */ res = new_rd_Or(db, blk, - new_r_Proj(blk, low, mode_b, pnc), - new_r_Proj(blk, high, mode_b, pnc), + new_r_Proj(low, mode_b, pnc), + new_r_Proj(high, mode_b, pnc), mode_b); } else { /* a rel b <==> a_h REL b_h || (a_h == b_h && a_l rel b_l) */ t = new_rd_And(db, blk, - new_r_Proj(blk, low, mode_b, pnc), - new_r_Proj(blk, high, mode_b, pn_Cmp_Eq), + new_r_Proj(low, mode_b, pnc), + new_r_Proj(high, mode_b, pn_Cmp_Eq), mode_b); res = new_rd_Or(db, blk, - new_r_Proj(blk, high, mode_b, pnc & ~pn_Cmp_Eq), + new_r_Proj(high, mode_b, pnc & ~pn_Cmp_Eq), t, mode_b); } /* if */ @@ -2342,7 +2384,8 @@ static void lower_ops(ir_node *node, void *env) /** * Compare two op_mode_entry_t's. */ -static int cmp_op_mode(const void *elt, const void *key, size_t size) { +static int cmp_op_mode(const void *elt, const void *key, size_t size) +{ const op_mode_entry_t *e1 = elt; const op_mode_entry_t *e2 = key; (void) size; @@ -2353,7 +2396,8 @@ static int cmp_op_mode(const void *elt, const void *key, size_t size) { /** * Compare two conv_tp_entry_t's. */ -static int cmp_conv_tp(const void *elt, const void *key, size_t size) { +static int cmp_conv_tp(const void *elt, const void *key, size_t size) +{ const conv_tp_entry_t *e1 = elt; const conv_tp_entry_t *e2 = key; (void) size; @@ -2364,7 +2408,8 @@ static int cmp_conv_tp(const void *elt, const void *key, size_t size) { /** * Enter a lowering function into an ir_op. */ -static void enter_lower_func(ir_op *op, lower_func func) { +static void enter_lower_func(ir_op *op, lower_func func) +{ op->ops.generic = (op_func)func; } /* enter_lower_func */ @@ -2373,7 +2418,8 @@ static void enter_lower_func(ir_op *op, lower_func func) { * * @param mtp the method type */ -static int mtp_must_to_lowered(ir_type *mtp, lower_env_t *env) { +static int mtp_must_to_lowered(ir_type *mtp, lower_env_t *env) +{ int i, n_params; n_params = get_method_n_params(mtp); @@ -2625,7 +2671,8 @@ static int pass_wrapper(ir_prog *irp, void *context) return 0; } -ir_prog_pass_t *lower_dw_ops_pass(const char *name, const lwrdw_param_t *param) { +ir_prog_pass_t *lower_dw_ops_pass(const char *name, const lwrdw_param_t *param) +{ struct pass_t *pass = XMALLOCZ(struct pass_t); pass->param = param; @@ -2653,6 +2700,5 @@ ir_entity *def_create_intrinsic_fkt(ir_type *method, const ir_op *op, ent = new_entity(get_glob_type(), id, method); set_entity_ld_ident(ent, get_entity_ident(ent)); - set_entity_visibility(ent, visibility_external_allocated); return ent; } /* def_create_intrinsic_fkt */