X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_dw.c;h=1eba62520cf280cac3f59d1f624a4bb74a3ead3e;hb=3da5ed2598245b896255bc444aaa1768f6098cfe;hp=6f63196ff9c1d7debe19e76b60e8d4df565e9128;hpb=e07b61c6ed5d198a484761f8a40a4f26520d964d;p=libfirm diff --git a/ir/lower/lower_dw.c b/ir/lower/lower_dw.c index 6f63196ff..1eba62520 100644 --- a/ir/lower/lower_dw.c +++ b/ir/lower/lower_dw.c @@ -24,17 +24,10 @@ * @author Michael Beck * @version $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifdef HAVE_STRING_H -# include -#endif -#ifdef HAVE_STDLIB_H -# include -#endif +#include "config.h" +#include +#include #include #include "error.h" @@ -59,6 +52,7 @@ #include "pdeq.h" #include "irdump.h" #include "array_t.h" +#include "irpass_t.h" /** A map from mode to a primitive type. */ static pmap *prim_types; @@ -117,19 +111,24 @@ enum lower_flags { typedef struct _lower_env_t { node_entry_t **entries; /**< entries per node */ struct obstack obst; /**< an obstack holding the temporary data */ + ir_type *l_mtp; /**< lowered method type of the current method */ tarval *tv_mode_bytes; /**< a tarval containing the number of bytes in the lowered modes */ tarval *tv_mode_bits; /**< a tarval containing the number of bits in the lowered modes */ pdeq *waitq; /**< a wait queue of all nodes that must be handled later */ pmap *proj_2_block; /**< a map from ProjX to its destination blocks */ + ident *first_id; /**< .l for little and .h for big endian */ + ident *next_id; /**< .h for little and .l for big endian */ const lwrdw_param_t *params; /**< transformation parameter */ unsigned flags; /**< some flags */ int n_entries; /**< number of entries */ + ir_type *value_param_tp; /**< the old value param type */ } 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]; @@ -138,7 +137,7 @@ static ir_type *get_primitive_type(ir_mode *mode) { return entry->value; snprintf(buf, sizeof(buf), "_prim_%s", get_mode_name(mode)); - tp = new_type_primitive(new_id_from_str(buf), mode); + tp = new_type_primitive(mode); pmap_insert(prim_types, mode, tp); return tp; @@ -147,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; @@ -158,7 +158,6 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode, lower_env_t *env) entry = set_insert(conv_types, &key, sizeof(key), HASH_PTR(imode) ^ HASH_PTR(omode)); if (! entry->mtd) { int n_param = 1, n_res = 1; - char buf[64]; if (imode == env->params->high_signed || imode == env->params->high_unsigned) n_param = 2; @@ -166,8 +165,7 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode, lower_env_t *env) n_res = 2; /* create a new one */ - snprintf(buf, sizeof(buf), "LConv%s%s", get_mode_name(imode), get_mode_name(omode)); - mtd = new_type_method(new_id_from_str(buf), n_param, n_res); + mtd = new_type_method(n_param, n_res); /* set param types and result types */ n_param = 0; @@ -219,7 +217,7 @@ static void add_block_cf_input_nr(ir_node *block, int nr, ir_node *cf) set_irn_in(block, i + 1, in); - for (phi = get_irn_link(block); phi; phi = get_irn_link(phi)) { + for (phi = get_Block_phis(block); phi != NULL; phi = get_Phi_next(phi)) { for (i = 0; i < arity; ++i) in[i] = get_irn_n(phi, i); in[i] = in[nr]; @@ -283,9 +281,7 @@ static void prepare_links(ir_node *node, void *env) if (mode == lenv->params->high_signed || mode == lenv->params->high_unsigned) { /* ok, found a node that will be lowered */ - link = obstack_alloc(&lenv->obst, sizeof(*link)); - - memset(link, 0, sizeof(*link)); + link = OALLOCZ(&lenv->obst, node_entry_t); idx = get_irn_idx(node); if (idx >= lenv->n_entries) { @@ -322,9 +318,7 @@ static void prepare_links(ir_node *node, void *env) } else if (is_Phi(node)) { /* link all Phi nodes to its block */ ir_node *block = get_nodes_block(node); - - set_irn_link(node, get_irn_link(block)); - set_irn_link(block, node); + add_Block_phi(block, node); } else if (is_Block(node)) { /* fill the Proj -> Block map */ for (i = get_Block_n_cfgpreds(node) - 1; i >= 0; --i) { @@ -339,11 +333,11 @@ 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); - ir_node *block = get_nodes_block(node); int idx; ir_graph *irg = current_ir_graph; ir_mode *low_mode = env->params->low_unsigned; @@ -351,10 +345,10 @@ static void lower_Const(ir_node *node, ir_mode *mode, lower_env_t *env) { tv = get_Const_tarval(node); tv_l = tarval_convert_to(tv, low_mode); - low = new_rd_Const(dbg, irg, block, low_mode, tv_l); + low = new_rd_Const(dbg, irg, tv_l); tv_h = tarval_convert_to(tarval_shrs(tv, env->tv_mode_bits), mode); - high = new_rd_Const(dbg, irg, block, mode, tv_h); + high = new_rd_Const(dbg, irg, tv_h); idx = get_irn_idx(node); assert(idx < env->n_entries); @@ -365,36 +359,32 @@ 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) { - ir_mode *low_mode = env->params->low_unsigned; - ir_graph *irg = current_ir_graph; - ir_node *adr = get_Load_ptr(node); - ir_node *mem = get_Load_mem(node); - ir_node *low, *high, *proj; - dbg_info *dbg; - ir_node *block = get_nodes_block(node); - int idx; +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); + ir_node *mem = get_Load_mem(node); + ir_node *low, *high, *proj; + dbg_info *dbg; + ir_node *block = get_nodes_block(node); + int idx; + ir_cons_flags volatility = get_Load_volatility(node) == volatility_is_volatile + ? cons_volatile : 0; if (env->params->little_endian) { low = adr; - high = new_r_Add(irg, block, adr, - new_r_Const(irg, block, get_tarval_mode(env->tv_mode_bytes), env->tv_mode_bytes), - get_irn_mode(adr)); + high = new_r_Add(block, adr, new_r_Const(irg, env->tv_mode_bytes), get_irn_mode(adr)); } else { - low = new_r_Add(irg, block, adr, - new_r_Const(irg, block, get_tarval_mode(env->tv_mode_bytes), env->tv_mode_bytes), - get_irn_mode(adr)); + low = new_r_Add(block, adr, new_r_Const(irg, env->tv_mode_bytes), get_irn_mode(adr)); high = adr; } /* if */ /* create two loads */ dbg = get_irn_dbg_info(node); - low = new_rd_Load(dbg, irg, block, mem, low, low_mode); - proj = new_r_Proj(irg, block, low, mode_M, pn_Load_M); - high = new_rd_Load(dbg, irg, block, proj, high, mode); - - set_Load_volatility(low, get_Load_volatility(node)); - set_Load_volatility(high, get_Load_volatility(node)); + low = new_rd_Load(dbg, block, mem, low, low_mode, volatility); + 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); assert(idx < env->n_entries); @@ -415,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(irg, block, low, low_mode, pn_Load_res); - env->entries[idx]->high_word = new_r_Proj(irg, 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"); @@ -430,14 +420,16 @@ 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) { - ir_graph *irg; - ir_node *block, *adr, *mem; - ir_node *low, *high, *irn, *proj; - dbg_info *dbg; - int idx; +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; + dbg_info *dbg; + int idx; node_entry_t *entry; - (void) node; + ir_cons_flags volatility = get_Store_volatility(node) == volatility_is_volatile + ? cons_volatile : 0; (void) mode; irn = get_Store_value(node); @@ -457,24 +449,17 @@ static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) { if (env->params->little_endian) { low = adr; - high = new_r_Add(irg, block, adr, - new_r_Const(irg, block, get_tarval_mode(env->tv_mode_bytes), env->tv_mode_bytes), - get_irn_mode(adr)); + high = new_r_Add(block, adr, new_r_Const(irg, env->tv_mode_bytes), get_irn_mode(adr)); } else { - low = new_r_Add(irg, block, adr, - new_r_Const(irg, block, get_tarval_mode(env->tv_mode_bytes), env->tv_mode_bytes), - get_irn_mode(adr)); + low = new_r_Add(block, adr, new_r_Const(irg, env->tv_mode_bytes), get_irn_mode(adr)); high = adr; } /* if */ /* create two Stores */ dbg = get_irn_dbg_info(node); - low = new_rd_Store(dbg, irg, block, mem, low, entry->low_word); - proj = new_r_Proj(irg, block, low, mode_M, pn_Store_M); - high = new_rd_Store(dbg, irg, block, proj, high, entry->high_word); - - set_Store_volatility(low, get_Store_volatility(node)); - set_Store_volatility(high, get_Store_volatility(node)); + low = new_rd_Store(dbg, block, mem, low, entry->low_word, volatility); + 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); assert(idx < env->n_entries); @@ -509,12 +494,12 @@ static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) { * @param op the emulated ir_op * @param imode the input mode of the emulated opcode * @param omode the output mode of the emulated opcode - * @param block where the new mode is created * @param env the lower environment */ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op, ir_mode *imode, ir_mode *omode, - ir_node *block, lower_env_t *env) { + lower_env_t *env) +{ symconst_symbol sym; ir_entity *ent; op_mode_entry_t key, *entry; @@ -536,7 +521,7 @@ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op, ent = entry->ent; } /* if */ sym.entity_p = ent; - return new_r_SymConst(current_ir_graph, block, mode_P_code, sym, symconst_addr_ent); + return new_r_SymConst(current_ir_graph, mode_P_code, sym, symconst_addr_ent); } /* get_intrinsic_address */ /** @@ -544,14 +529,14 @@ 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; dbg_info *dbg; ir_type *mtp; int idx; - ir_graph *irg; node_entry_t *entry; irn = get_Div_left(node); @@ -582,22 +567,20 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) { dbg = get_irn_dbg_info(node); block = get_nodes_block(node); - irg = current_ir_graph; mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u; opmode = get_irn_op_mode(node); - irn = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode, block, env); - call = new_rd_Call(dbg, irg, block, get_Div_mem(node), - irn, 4, in, mtp); + 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(irg, 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)) { case pn_Div_M: /* Memory result. */ /* reroute to the call */ set_Proj_pred(proj, call); - set_Proj_proj(proj, pn_Call_M_except); + set_Proj_proj(proj, pn_Call_M); break; case pn_Div_X_except: /* Execution result if exception occurred. */ /* reroute to the call */ @@ -607,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(current_ir_graph, block, irn, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(current_ir_graph, 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"); @@ -624,14 +607,14 @@ 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; dbg_info *dbg; ir_type *mtp; int idx; - ir_graph *irg; node_entry_t *entry; irn = get_Mod_left(node); @@ -662,22 +645,20 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) { dbg = get_irn_dbg_info(node); block = get_nodes_block(node); - irg = current_ir_graph; mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u; opmode = get_irn_op_mode(node); - irn = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode, block, env); - call = new_rd_Call(dbg, irg, block, get_Mod_mem(node), - irn, 4, in, mtp); + 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(irg, 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)) { case pn_Mod_M: /* Memory result. */ /* reroute to the call */ set_Proj_pred(proj, call); - set_Proj_proj(proj, pn_Call_M_except); + set_Proj_proj(proj, pn_Call_M); break; case pn_Mod_X_except: /* Execution result if exception occurred. */ /* reroute to the call */ @@ -687,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(irg, block, irn, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(irg, 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"); @@ -704,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; @@ -715,7 +697,6 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) { int idx; node_entry_t *entry; unsigned flags = 0; - ir_graph *irg; /* check if both results are needed */ for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) { @@ -754,7 +735,6 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) { dbg = get_irn_dbg_info(node); block = get_nodes_block(node); - irg = current_ir_graph; mem = get_DivMod_mem(node); @@ -762,21 +742,19 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) { mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u; if (flags & 1) { opmode = get_irn_op_mode(node); - irn = get_intrinsic_address(mtp, op_Div, opmode, opmode, block, env); - callDiv = new_rd_Call(dbg, irg, block, mem, - irn, 4, in, mtp); + 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(irg, 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(irg, 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, block, env); - callMod = new_rd_Call(dbg, irg, block, mem, - irn, 4, in, mtp); + 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(irg, 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)) { @@ -784,7 +762,7 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) { case pn_DivMod_M: /* Memory result. */ /* reroute to the first call */ set_Proj_pred(proj, callDiv ? callDiv : (callMod ? callMod : mem)); - set_Proj_proj(proj, pn_Call_M_except); + set_Proj_proj(proj, pn_Call_M); break; case pn_DivMod_X_except: /* Execution result if exception occurred. */ /* reroute to the first call */ @@ -794,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(irg, block, resDiv, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(irg, 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(irg, block, resMod, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(irg, 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"); @@ -816,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; @@ -856,16 +835,16 @@ static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) { irg = current_ir_graph; mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u; - irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, block, env); - irn = new_rd_Call(dbg, irg, block, get_irg_no_mem(current_ir_graph), + irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, 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(irg, 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(irg, block, irn, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(irg, 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 */ /** @@ -873,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; @@ -897,28 +877,31 @@ static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env) { /* The shift count is always mode_Iu in firm, so there is no need for lowering */ in[2] = get_binop_right(node); + assert(get_irn_mode(in[2]) != env->params->high_signed + && get_irn_mode(in[2]) != env->params->high_unsigned); dbg = get_irn_dbg_info(node); block = get_nodes_block(node); irg = current_ir_graph; mtp = mode_is_signed(mode) ? shiftop_tp_s : shiftop_tp_u; - irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, block, env); - irn = new_rd_Call(dbg, irg, block, get_irg_no_mem(current_ir_graph), + irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, 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(irg, 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(irg, block, irn, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(irg, 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; @@ -934,15 +917,21 @@ static void lower_Shr(ir_node *node, ir_mode *mode, lower_env_t *env) { int idx = get_irn_idx(left); left = env->entries[idx]->high_word; + if (left == NULL) { + /* not ready yet, wait */ + pdeq_putr(env->waitq, node); + return; + } + idx = get_irn_idx(node); if (shf_cnt > 0) { - c = new_r_Const_long(irg, block, mode_Iu, shf_cnt); - env->entries[idx]->low_word = new_r_Shr(irg, block, left, c, mode); + c = new_r_Const_long(irg, env->params->low_unsigned, shf_cnt); + env->entries[idx]->low_word = new_r_Shr(block, left, c, mode); } else { env->entries[idx]->low_word = left; } /* if */ - env->entries[idx]->high_word = new_r_Const(irg, block, mode, get_mode_null(mode)); + env->entries[idx]->high_word = new_r_Const(irg, get_mode_null(mode)); return; } /* if */ @@ -953,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; @@ -969,17 +959,24 @@ 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(irg, 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; if (shf_cnt > 0) { - c = new_r_Const_long(irg, block, mode_Iu, shf_cnt); - env->entries[idx]->high_word = new_r_Shl(irg, block, left, c, mode); + c = new_r_Const_long(irg, mode_l, shf_cnt); + env->entries[idx]->high_word = new_r_Shl(block, left, c, mode); } else { env->entries[idx]->high_word = left; } /* if */ - mode_l = env->params->low_unsigned; - env->entries[idx]->low_word = new_r_Const(irg, block, mode_l, get_mode_null(mode_l)); + env->entries[idx]->low_word = new_r_Const(irg, get_mode_null(mode_l)); return; } /* if */ @@ -990,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; @@ -1003,23 +1001,30 @@ static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env) { ir_node *left = get_Shrs_left(node); long shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode); int idx = get_irn_idx(left); + ir_mode *mode_l; ir_node *low; 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, block, mode_Iu, shf_cnt); - low = new_r_Shrs(irg, block, left, c, mode); + c = new_r_Const_long(irg, mode_l, shf_cnt); + low = new_r_Shrs(block, left, c, mode); } else { low = left; } /* if */ - /* low word is expected to have mode_Iu */ - env->entries[idx]->low_word = new_r_Conv(irg, block, low, mode_Iu); + /* low word is expected to have mode_l */ + env->entries[idx]->low_word = new_r_Conv(block, low, mode_l); - c = new_r_Const_long(irg, block, mode_Iu, get_mode_size_bits(mode) - 1); - env->entries[idx]->high_word = new_r_Shrs(irg, block, left, c, mode); + c = new_r_Const_long(irg, mode_l, get_mode_size_bits(mode) - 1); + env->entries[idx]->high_word = new_r_Shrs(block, left, c, mode); return; } /* if */ @@ -1030,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)) { @@ -1040,7 +1046,6 @@ static void prepare_links_and_handle_rotl(ir_node *node, void *env) { ir_node *right = get_Rotl_right(node); ir_node *left, *shl, *shr, *or, *block, *sub, *c; ir_mode *omode, *rmode; - ir_graph *irg; dbg_info *dbg; optimization_state_t state; @@ -1058,18 +1063,17 @@ static void prepare_links_and_handle_rotl(ir_node *node, void *env) { dbg = get_irn_dbg_info(node); omode = get_irn_mode(node); left = get_Rotl_left(node); - irg = current_ir_graph; block = get_nodes_block(node); - shl = new_rd_Shl(dbg, irg, block, left, right, omode); + shl = new_rd_Shl(dbg, block, left, right, omode); rmode = get_irn_mode(right); c = new_Const_long(rmode, get_mode_size_bits(omode)); - sub = new_rd_Sub(dbg, irg, block, c, right, rmode); - shr = new_rd_Shr(dbg, irg, block, left, sub, omode); + sub = new_rd_Sub(dbg, block, c, right, rmode); + shr = new_rd_Shr(dbg, block, left, sub, omode); /* optimization must be switched off here, or we will get the Rotl back */ save_optimization_state(&state); set_opt_algebraic_simplification(0); - or = new_rd_Or(dbg, irg, block, shl, shr, omode); + or = new_rd_Or(dbg, block, shl, shr, omode); restore_optimization_state(&state); exchange(node, or); @@ -1089,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; @@ -1114,13 +1119,13 @@ 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; ir_type *mtp; int idx; - ir_graph *irg; node_entry_t *entry; irn = get_unop_op(node); @@ -1138,19 +1143,18 @@ static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env) { dbg = get_irn_dbg_info(node); block = get_nodes_block(node); - irg = current_ir_graph; mtp = mode_is_signed(mode) ? unop_tp_s : unop_tp_u; - irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, block, env); - irn = new_rd_Call(dbg, irg, block, get_irg_no_mem(current_ir_graph), + irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, 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(irg, 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(irg, block, irn, env->params->low_unsigned, 0); - env->entries[idx]->high_word = new_r_Proj(irg, 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 */ /** @@ -1159,7 +1163,7 @@ static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env) { * Create two logical Binops. */ static void lower_Binop_logical(ir_node *node, ir_mode *mode, lower_env_t *env, - ir_node *(*constr_rd)(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *op1, ir_node *op2, ir_mode *mode) ) { + ir_node *(*constr_rd)(dbg_info *db, ir_node *block, ir_node *op1, ir_node *op2, ir_mode *mode) ) { ir_node *block, *irn; ir_node *lop_l, *lop_h, *rop_l, *rop_h; dbg_info *dbg; @@ -1199,8 +1203,8 @@ static void lower_Binop_logical(ir_node *node, ir_mode *mode, lower_env_t *env, idx = get_irn_idx(node); assert(idx < env->n_entries); irg = current_ir_graph; - env->entries[idx]->low_word = constr_rd(dbg, irg, block, lop_l, rop_l, env->params->low_unsigned); - env->entries[idx]->high_word = constr_rd(dbg, irg, block, lop_h, rop_h, mode); + env->entries[idx]->low_word = constr_rd(dbg, block, lop_l, rop_l, env->params->low_unsigned); + env->entries[idx]->high_word = constr_rd(dbg, block, lop_h, rop_h, mode); } /* lower_Binop_logical */ /** create a logical operation transformation */ @@ -1218,12 +1222,12 @@ 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; int idx; - ir_graph *irg; node_entry_t *entry; irn = get_Not_op(node); @@ -1241,18 +1245,18 @@ static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env) { dbg = get_irn_dbg_info(node); block = get_nodes_block(node); - irg = current_ir_graph; idx = get_irn_idx(node); assert(idx < env->n_entries); - env->entries[idx]->low_word = new_rd_Not(dbg, current_ir_graph, block, op_l, env->params->low_unsigned); - env->entries[idx]->high_word = new_rd_Not(dbg, current_ir_graph, block, op_h, mode); + env->entries[idx]->low_word = new_rd_Not(dbg, block, op_l, env->params->low_unsigned); + env->entries[idx]->high_word = new_rd_Not(dbg, block, op_h, mode); } /* lower_Not */ /** * 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); @@ -1265,15 +1269,15 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) { ir_node *new_bl, *cmpH, *cmpL, *irn; ir_node *projHF, *projHT; ir_node *dst_blk; - ir_graph *irg; pn_Cmp pnc; + 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); @@ -1314,26 +1318,26 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) { /* create a new high compare */ block = get_nodes_block(node); + irg = get_Block_irg(block); dbg = get_irn_dbg_info(cmp); - irg = current_ir_graph; pnc = get_Proj_proj(sel); if (is_Const(right) && is_Const_null(right)) { if (pnc == pn_Cmp_Eq || pnc == pn_Cmp_Lg) { /* x ==/!= 0 ==> or(low,high) ==/!= 0 */ ir_mode *mode = env->params->low_unsigned; - ir_node *low = new_r_Conv(irg, block, lentry->low_word, mode); - ir_node *high = new_r_Conv(irg, block, lentry->high_word, mode); - ir_node *or = new_rd_Or(dbg, irg, block, low, high, mode); - ir_node *cmp = new_rd_Cmp(dbg, irg, block, or, new_Const_long(mode, 0)); + ir_node *low = new_r_Conv(block, lentry->low_word, mode); + ir_node *high = new_r_Conv(block, lentry->high_word, mode); + 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(irg, block, cmp, mode_b, pnc); + ir_node *proj = new_r_Proj(cmp, mode_b, pnc); set_Cond_selector(node, proj); return; } } - cmpH = new_rd_Cmp(dbg, irg, block, lentry->high_word, rentry->high_word); + cmpH = new_rd_Cmp(dbg, block, lentry->high_word, rentry->high_word); if (pnc == pn_Cmp_Eq) { /* simple case:a == b <==> a_h == b_h && a_l == b_l */ @@ -1342,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(irg, 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, irg, block, irn); + irn = new_rd_Cond(dbg, block, irn); - projHF = new_r_Proj(irg, 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(irg, 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, irg, new_bl, lentry->low_word, rentry->low_word); - irn = new_r_Proj(irg, new_bl, cmpL, mode_b, pn_Cmp_Eq); + cmpL = new_rd_Cmp(dbg, new_bl, lentry->low_word, rentry->low_word); + irn = new_r_Proj(cmpL, mode_b, pn_Cmp_Eq); dbg = get_irn_dbg_info(node); - irn = new_rd_Cond(dbg, irg, new_bl, irn); + irn = new_rd_Cond(dbg, new_bl, irn); - proj = new_r_Proj(irg, 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(irg, 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) { @@ -1375,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(irg, 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, irg, block, irn); + irn = new_rd_Cond(dbg, block, irn); - projHT = new_r_Proj(irg, 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(irg, 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, irg, new_bl, lentry->low_word, rentry->low_word); - irn = new_r_Proj(irg, new_bl, cmpL, mode_b, pn_Cmp_Lg); + cmpL = new_rd_Cmp(dbg, new_bl, lentry->low_word, rentry->low_word); + irn = new_r_Proj(cmpL, mode_b, pn_Cmp_Lg); dbg = get_irn_dbg_info(node); - irn = new_rd_Cond(dbg, irg, new_bl, irn); + irn = new_rd_Cond(dbg, new_bl, irn); - proj = new_r_Proj(irg, 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(irg, 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 { @@ -1414,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(irg, 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, irg, block, irn); + irn = new_rd_Cond(dbg, block, irn); - projHT = new_r_Proj(irg, 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(irg, 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(irg, newbl_eq, cmpH, mode_b, pn_Cmp_Eq); - irn = new_rd_Cond(dbg, irg, newbl_eq, irn); + irn = new_r_Proj(cmpH, mode_b, pn_Cmp_Eq); + irn = new_rd_Cond(dbg, newbl_eq, irn); - proj = new_r_Proj(irg, 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(irg, 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, irg, newbl_l, lentry->low_word, rentry->low_word); - irn = new_r_Proj(irg, newbl_l, cmpL, mode_b, pnc); + cmpL = new_rd_Cmp(dbg, newbl_l, lentry->low_word, rentry->low_word); + irn = new_r_Proj(cmpL, mode_b, pnc); dbg = get_irn_dbg_info(node); - irn = new_rd_Cond(dbg, irg, newbl_l, irn); + irn = new_rd_Cond(dbg, newbl_l, irn); - proj = new_r_Proj(irg, 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(irg, 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 */ @@ -1482,232 +1486,157 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) { /** * Translate a Conv to higher_signed */ -static void lower_Conv_to_Ls(ir_node *node, lower_env_t *env) { - ir_node *op = get_Conv_op(node); - ir_mode *imode = get_irn_mode(op); - ir_mode *dst_mode_l = env->params->low_unsigned; - ir_mode *dst_mode_h = env->params->low_signed; - int idx = get_irn_idx(node); - ir_graph *irg = current_ir_graph; - ir_node *block = get_nodes_block(node); - dbg_info *dbg = get_irn_dbg_info(node); - - assert(idx < env->n_entries); - - if (mode_is_int(imode) || mode_is_reference(imode)) { - if (imode == env->params->high_unsigned) { - /* a Conv from Lu to Ls */ - int op_idx = get_irn_idx(op); - - if (! env->entries[op_idx]->low_word) { - /* not ready yet, wait */ - pdeq_putr(env->waitq, node); - return; - } /* if */ - env->entries[idx]->low_word = new_rd_Conv(dbg, irg, block, env->entries[op_idx]->low_word, dst_mode_l); - env->entries[idx]->high_word = new_rd_Conv(dbg, irg, block, env->entries[op_idx]->high_word, dst_mode_h); - } else { - /* simple case: create a high word */ - if (imode != dst_mode_l) - op = new_rd_Conv(dbg, irg, block, op, dst_mode_l); - - env->entries[idx]->low_word = op; - - if (mode_is_signed(imode)) { - ir_node *op_conv = new_rd_Conv(dbg, irg, block, op, dst_mode_h); - env->entries[idx]->high_word = new_rd_Shrs(dbg, irg, block, op_conv, - new_Const_long(mode_Iu, get_mode_size_bits(dst_mode_h) - 1), dst_mode_h); - } else { - env->entries[idx]->high_word = new_Const(dst_mode_h, get_mode_null(dst_mode_h)); - } /* if */ - } /* if */ - } else { - ir_node *irn, *call; - ir_mode *omode = env->params->high_signed; - ir_type *mtp = get_conv_type(imode, omode, env); - - irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, block, env); - call = new_rd_Call(dbg, irg, block, get_irg_no_mem(irg), irn, 1, &op, mtp); - set_irn_pinned(call, get_irn_pinned(node)); - irn = new_r_Proj(irg, block, call, mode_T, pn_Call_T_result); - - env->entries[idx]->low_word = new_r_Proj(irg, block, irn, dst_mode_l, 0); - env->entries[idx]->high_word = new_r_Proj(irg, block, irn, dst_mode_h, 1); - } /* if */ -} /* lower_Conv_to_Ls */ - -/** - * Translate a Conv to higher_unsigned - */ -static void lower_Conv_to_Lu(ir_node *node, lower_env_t *env) { - ir_node *op = get_Conv_op(node); - ir_mode *imode = get_irn_mode(op); - ir_mode *dst_mode = env->params->low_unsigned; - int idx = get_irn_idx(node); - ir_graph *irg = current_ir_graph; - ir_node *block = get_nodes_block(node); - dbg_info *dbg = get_irn_dbg_info(node); +static void lower_Conv_to_Ll(ir_node *node, lower_env_t *env) +{ + ir_mode *omode = get_irn_mode(node); + ir_node *op = get_Conv_op(node); + ir_mode *imode = get_irn_mode(op); + int idx = get_irn_idx(node); + ir_graph *irg = current_ir_graph; + ir_node *block = get_nodes_block(node); + dbg_info *dbg = get_irn_dbg_info(node); + node_entry_t *entry = env->entries[idx]; + ir_mode *low_unsigned = env->params->low_unsigned; + ir_mode *low_signed + = mode_is_signed(omode) ? env->params->low_signed : low_unsigned; assert(idx < env->n_entries); if (mode_is_int(imode) || mode_is_reference(imode)) { - if (imode == env->params->high_signed) { - /* a Conv from Ls to Lu */ - int op_idx = get_irn_idx(op); + if (imode == env->params->high_signed + || imode == env->params->high_unsigned) { + /* a Conv from Lu to Ls or Ls to Lu */ + int op_idx = get_irn_idx(op); + node_entry_t *op_entry = env->entries[op_idx]; - if (! env->entries[op_idx]->low_word) { + if (! op_entry->low_word) { /* not ready yet, wait */ pdeq_putr(env->waitq, node); return; - } /* if */ - env->entries[idx]->low_word = new_rd_Conv(dbg, irg, block, env->entries[op_idx]->low_word, dst_mode); - env->entries[idx]->high_word = new_rd_Conv(dbg, irg, block, env->entries[op_idx]->high_word, dst_mode); + } + entry->low_word = op_entry->low_word; + entry->high_word = new_rd_Conv(dbg, block, op_entry->high_word, + low_signed); } else { /* simple case: create a high word */ - if (imode != dst_mode) - op = new_rd_Conv(dbg, irg, block, op, dst_mode); + if (imode != low_unsigned) + op = new_rd_Conv(dbg, block, op, low_unsigned); - env->entries[idx]->low_word = op; + entry->low_word = op; if (mode_is_signed(imode)) { - env->entries[idx]->high_word = new_rd_Shrs(dbg, irg, block, op, - new_Const_long(mode_Iu, get_mode_size_bits(dst_mode) - 1), dst_mode); + int c = get_mode_size_bits(low_signed) - 1; + ir_node *cnst = new_Const_long(low_unsigned, c); + if (get_irn_mode(op) != low_signed) + op = new_rd_Conv(dbg, block, op, low_signed); + entry->high_word = new_rd_Shrs(dbg, block, op, cnst, + low_signed); } else { - env->entries[idx]->high_word = new_Const(dst_mode, get_mode_null(dst_mode)); - } /* if */ - } /* if */ + entry->high_word = new_Const(get_mode_null(low_signed)); + } + } + } else if (imode == mode_b) { + entry->low_word = new_rd_Conv(dbg, block, op, low_unsigned); + entry->high_word = new_Const(get_mode_null(low_signed)); } else { ir_node *irn, *call; - ir_mode *omode = env->params->high_unsigned; - ir_type *mtp = get_conv_type(imode, omode, env); - - /* do an intrinsic call */ - irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, block, env); - call = new_rd_Call(dbg, irg, block, get_irg_no_mem(irg), irn, 1, &op, mtp); - set_irn_pinned(call, get_irn_pinned(node)); - irn = new_r_Proj(irg, block, call, mode_T, pn_Call_T_result); - - env->entries[idx]->low_word = new_r_Proj(irg, block, irn, dst_mode, 0); - env->entries[idx]->high_word = new_r_Proj(irg, block, irn, dst_mode, 1); - } /* if */ -} /* lower_Conv_to_Lu */ - -/** - * Translate a Conv from higher_signed - */ -static void lower_Conv_from_Ls(ir_node *node, lower_env_t *env) { - ir_node *op = get_Conv_op(node); - ir_mode *omode = get_irn_mode(node); - ir_node *block = get_nodes_block(node); - dbg_info *dbg = get_irn_dbg_info(node); - int idx = get_irn_idx(op); - ir_graph *irg = current_ir_graph; - - assert(idx < env->n_entries); - - if (! env->entries[idx]->low_word) { - /* not ready yet, wait */ - pdeq_putr(env->waitq, node); - return; - } /* if */ - - if (mode_is_int(omode) || mode_is_reference(omode)) { - op = env->entries[idx]->low_word; - - /* simple case: create a high word */ - if (omode != env->params->low_signed) - op = new_rd_Conv(dbg, irg, block, op, omode); - - set_Conv_op(node, op); - } else { - ir_node *irn, *call, *in[2]; - ir_mode *imode = env->params->high_signed; ir_type *mtp = get_conv_type(imode, omode, env); - irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, block, env); - in[0] = env->entries[idx]->low_word; - in[1] = env->entries[idx]->high_word; - - call = new_rd_Call(dbg, irg, block, get_irg_no_mem(irg), irn, 2, in, mtp); + 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(irg, block, call, mode_T, pn_Call_T_result); + irn = new_r_Proj(call, mode_T, pn_Call_T_result); - exchange(node, new_r_Proj(irg, block, irn, omode, 0)); - } /* if */ -} /* lower_Conv_from_Ls */ + entry->low_word = new_r_Proj(irn, low_unsigned, 0); + entry->high_word = new_r_Proj(irn, low_signed, 1); + } +} /** * Translate a Conv from higher_unsigned */ -static void lower_Conv_from_Lu(ir_node *node, lower_env_t *env) { - ir_node *op = get_Conv_op(node); - ir_mode *omode = get_irn_mode(node); - ir_node *block = get_nodes_block(node); - dbg_info *dbg = get_irn_dbg_info(node); - int idx = get_irn_idx(op); - ir_graph *irg = current_ir_graph; +static void lower_Conv_from_Ll(ir_node *node, lower_env_t *env) +{ + ir_node *op = get_Conv_op(node); + ir_mode *omode = get_irn_mode(node); + ir_node *block = get_nodes_block(node); + dbg_info *dbg = get_irn_dbg_info(node); + int idx = get_irn_idx(op); + ir_graph *irg = current_ir_graph; + node_entry_t *entry = env->entries[idx]; assert(idx < env->n_entries); - if (! env->entries[idx]->low_word) { + if (! entry->low_word) { /* not ready yet, wait */ pdeq_putr(env->waitq, node); return; - } /* if */ + } if (mode_is_int(omode) || mode_is_reference(omode)) { - op = env->entries[idx]->low_word; + op = entry->low_word; /* simple case: create a high word */ if (omode != env->params->low_unsigned) - op = new_rd_Conv(dbg, irg, block, op, omode); + op = new_rd_Conv(dbg, block, op, omode); set_Conv_op(node, op); + } else if (omode == mode_b) { + /* llu ? true : false <=> (low|high) ? true : false */ + ir_mode *mode = env->params->low_unsigned; + ir_node *or = new_rd_Or(dbg, block, entry->low_word, entry->high_word, + mode); + set_Conv_op(node, or); } else { ir_node *irn, *call, *in[2]; - ir_mode *imode = env->params->high_unsigned; - ir_type *mtp = get_conv_type(imode, omode, env); + ir_mode *imode = get_irn_mode(op); + ir_type *mtp = get_conv_type(imode, omode, env); - irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, block, env); - in[0] = env->entries[idx]->low_word; - in[1] = env->entries[idx]->high_word; + irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, env); + in[0] = entry->low_word; + in[1] = entry->high_word; - call = new_rd_Call(dbg, irg, block, get_irg_no_mem(irg), irn, 2, in, mtp); + 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(irg, block, call, mode_T, pn_Call_T_result); + irn = new_r_Proj(call, mode_T, pn_Call_T_result); - exchange(node, new_r_Proj(irg, block, irn, omode, 0)); - } /* if */ -} /* lower_Conv_from_Lu */ + exchange(node, new_r_Proj(irn, omode, 0)); + } +} /** * Translate a Conv. */ -static void lower_Conv(ir_node *node, ir_mode *mode, lower_env_t *env) { +static void lower_Conv(ir_node *node, ir_mode *mode, lower_env_t *env) +{ mode = get_irn_mode(node); - if (mode == env->params->high_signed) { - lower_Conv_to_Ls(node, env); - } else if (mode == env->params->high_unsigned) { - lower_Conv_to_Lu(node, env); + if (mode == env->params->high_signed + || mode == env->params->high_unsigned) { + lower_Conv_to_Ll(node, env); } else { ir_mode *mode = get_irn_mode(get_Conv_op(node)); - if (mode == env->params->high_signed) { - lower_Conv_from_Ls(node, env); - } else if (mode == env->params->high_unsigned) { - lower_Conv_from_Lu(node, env); - } /* if */ - } /* if */ -} /* lower_Conv */ + if (mode == env->params->high_signed + || mode == env->params->high_unsigned) { + lower_Conv_from_Ll(node, env); + } + } +} /** * Lower the method type. + * + * @param mtp the method type to lower + * @param ent the lower environment + * + * @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 *id; - ir_type *res; + ident *lid; + ir_type *res, *value_type; if (is_lowered_type(mtp)) return mtp; @@ -1744,8 +1673,7 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) { } /* if */ } /* for */ - id = mangle_u(new_id_from_chars("L", 1), get_type_ident(mtp)); - res = new_type_method(id, n_param, n_res); + res = new_type_method(n_param, n_res); /* set param types and result types */ for (i = n_param = 0; i < n; ++i) { @@ -1788,6 +1716,44 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) { } /* for */ set_lowered_type(mtp, res); pmap_insert(lowered_type, mtp, res); + + value_type = get_method_value_param_type(mtp); + if (value_type != NULL) { + /* this creates a new value parameter type */ + (void)get_method_value_param_ent(res, 0); + + /* set new param positions */ + for (i = n_param = 0; i < n; ++i) { + ir_type *tp = get_method_param_type(mtp, i); + ident *id = get_method_param_ident(mtp, i); + ir_entity *ent = get_method_value_param_ent(mtp, i); + + set_entity_link(ent, INT_TO_PTR(n_param)); + if (is_Primitive_type(tp)) { + ir_mode *mode = get_type_mode(tp); + + if (mode == env->params->high_signed || mode == env->params->high_unsigned) { + if (id != NULL) { + lid = id_mangle(id, env->first_id); + set_method_param_ident(res, n_param, lid); + set_entity_ident(get_method_value_param_ent(res, n_param), lid); + lid = id_mangle(id, env->next_id); + set_method_param_ident(res, n_param + 1, lid); + set_entity_ident(get_method_value_param_ent(res, n_param + 1), lid); + } /* if */ + n_param += 2; + continue; + } /* if */ + } /* if */ + if (id != NULL) { + set_method_param_ident(res, n_param, id); + set_entity_ident(get_method_value_param_ent(res, n_param), id); + } /* if */ + ++n_param; + } /* for */ + + set_lowered_type(value_type, get_method_value_param_type(res)); + } /* if */ } else { res = entry->value; } /* if */ @@ -1797,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); @@ -1855,8 +1822,9 @@ 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) { - ir_graph *irg = current_ir_graph; +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); ir_type *mtp; @@ -1934,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, irg, 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, irg, 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); @@ -1945,8 +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) { - ir_graph *irg = current_ir_graph; +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; @@ -2067,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, irg, 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, irg, 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 */ @@ -2081,9 +2049,10 @@ 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 = current_ir_graph; + ir_graph *irg = get_irn_irg(node); ir_mode *low_mode = env->params->low_unsigned; env->entries[idx]->low_word = new_r_Unknown(irg, low_mode); @@ -2095,9 +2064,10 @@ 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 = current_ir_graph; + ir_graph *irg = get_irn_irg(phi); ir_node *block, *unk_l, *unk_h, *phi_l, *phi_h; ir_node **inl, **inh; dbg_info *dbg; @@ -2150,13 +2120,15 @@ static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) { idx = get_irn_idx(phi); assert(idx < env->n_entries); - env->entries[idx]->low_word = phi_l = new_rd_Phi(dbg, irg, block, arity, inl, mode_l); - env->entries[idx]->high_word = phi_h = new_rd_Phi(dbg, irg, block, arity, inh, mode); + env->entries[idx]->low_word = phi_l = new_rd_Phi(dbg, block, arity, inl, mode_l); + env->entries[idx]->high_word = phi_h = new_rd_Phi(dbg, block, arity, inh, mode); - /* Don't forget to link the new Phi nodes into the block! */ - set_irn_link(phi_l, get_irn_link(block)); - set_irn_link(phi_h, phi_l); - set_irn_link(block, phi_h); + /* Don't forget to link the new Phi nodes into the block. + * Beware that some Phis might be optimized away. */ + if (is_Phi(phi_l)) + add_Block_phi(block, phi_l); + if (is_Phi(phi_h)) + add_Block_phi(block, phi_h); if (enq) { /* not yet finished */ @@ -2167,8 +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) { - ir_graph *irg = current_ir_graph; +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; @@ -2206,10 +2178,13 @@ static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) { idx = get_irn_idx(mux); assert(idx < env->n_entries); - env->entries[idx]->low_word = new_rd_Mux(dbg, irg, block, sel, false_l, true_l, mode); - env->entries[idx]->high_word = new_rd_Mux(dbg, irg, block, sel, false_h, true_h, mode); + env->entries[idx]->low_word = new_rd_Mux(dbg, block, sel, false_l, true_l, mode); + env->entries[idx]->high_word = new_rd_Mux(dbg, block, sel, false_h, true_h, mode); } /* lower_Mux */ +/** + * Translate an ASM node. + */ static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env) { ir_mode *his = env->params->high_signed; @@ -2223,8 +2198,8 @@ static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env) ir_mode *op_mode = get_irn_mode(get_irn_n(asmn, i)); if (op_mode == his || op_mode == hiu) { panic("lowering ASM unimplemented"); - } - } + } /* if */ + } /* for */ for (n = asmn;;) { ir_mode *proj_mode; @@ -2236,14 +2211,35 @@ static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env) proj_mode = get_irn_mode(n); if (proj_mode == his || proj_mode == hiu) { panic("lowering ASM unimplemented"); - } - } -} + } /* if */ + } /* for */ +} /* lower_ASM */ + +/** + * Translate a Sel node. + */ +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 + value parameter type. */ + if (env->value_param_tp != NULL) { + ir_entity *ent = get_Sel_entity(sel); + if (get_entity_owner(ent) == env->value_param_tp) { + int pos = PTR_TO_INT(get_entity_link(ent)); + + ent = get_method_value_param_ent(env->l_mtp, pos); + set_Sel_entity(sel, ent); + } /* if */ + } /* if */ +} /* lower_Sel */ /** * 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: @@ -2252,6 +2248,7 @@ static int always_lower(ir_opcode code) { case iro_Return: case iro_Cond: case iro_Conv: + case iro_Sel: return 1; default: return 0; @@ -2261,12 +2258,12 @@ 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; ir_node *blk; - ir_graph *irg = current_ir_graph; dbg_info *db; l = get_Cmp_left(cmp); @@ -2286,29 +2283,29 @@ static ir_node *lower_boolean_Proj_Cmp(ir_node *proj, ir_node *cmp, lower_env_t pnc = get_Proj_proj(proj); blk = get_nodes_block(cmp); db = get_irn_dbg_info(cmp); - low = new_rd_Cmp(db, irg, blk, env->entries[lidx]->low_word, env->entries[ridx]->low_word); - high = new_rd_Cmp(db, irg, blk, env->entries[lidx]->high_word, env->entries[ridx]->high_word); + low = new_rd_Cmp(db, blk, env->entries[lidx]->low_word, env->entries[ridx]->low_word); + high = new_rd_Cmp(db, blk, env->entries[lidx]->high_word, env->entries[ridx]->high_word); if (pnc == pn_Cmp_Eq) { /* simple case:a == b <==> a_h == b_h && a_l == b_l */ - res = new_rd_And(db, irg, blk, - new_r_Proj(irg, blk, low, mode_b, pnc), - new_r_Proj(irg, blk, high, mode_b, pnc), + res = new_rd_And(db, blk, + 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, irg, blk, - new_r_Proj(irg, blk, low, mode_b, pnc), - new_r_Proj(irg, blk, high, mode_b, pnc), + res = new_rd_Or(db, blk, + 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, irg, blk, - new_r_Proj(irg, blk, low, mode_b, pnc), - new_r_Proj(irg, blk, high, mode_b, pn_Cmp_Eq), + t = new_rd_And(db, blk, + new_r_Proj(low, mode_b, pnc), + new_r_Proj(high, mode_b, pn_Cmp_Eq), mode_b); - res = new_rd_Or(db, irg, blk, - new_r_Proj(irg, blk, high, mode_b, pnc & ~pn_Cmp_Eq), + res = new_rd_Or(db, blk, + new_r_Proj(high, mode_b, pnc & ~pn_Cmp_Eq), t, mode_b); } /* if */ @@ -2387,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; @@ -2398,20 +2396,50 @@ 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; return (e1->imode - e2->imode) | (e1->omode - e2->omode); -} /* static int cmp_conv_tp */ +} /* cmp_conv_tp */ /** * 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 */ + +/** + * Returns non-zero if a method type must be lowered. + * + * @param mtp the method type + */ +static int mtp_must_to_lowered(ir_type *mtp, lower_env_t *env) +{ + int i, n_params; + + n_params = get_method_n_params(mtp); + if (n_params <= 0) + return 0; + + /* first check if we have parameters that must be fixed */ + for (i = 0; i < n_params; ++i) { + ir_type *tp = get_method_param_type(mtp, i); + + if (is_Primitive_type(tp)) { + ir_mode *mode = get_type_mode(tp); + + if (mode == env->params->high_signed || + mode == env->params->high_unsigned) + return 1; + } /* if */ + } /* for */ + return 0; +} /* mtp_must_to_lowered */ /* * Do the lowering. @@ -2419,8 +2447,8 @@ static void enter_lower_func(ir_op *op, lower_func func) { void lower_dw_ops(const lwrdw_param_t *param) { lower_env_t lenv; - int i; - ir_graph *rem; + int i; + ir_graph *rem; if (! param) return; @@ -2452,7 +2480,7 @@ void lower_dw_ops(const lwrdw_param_t *param) /* create method types for the created binop calls */ if (! binop_tp_u) { - binop_tp_u = new_type_method(IDENT("binop_u_intrinsic"), 4, 2); + binop_tp_u = new_type_method(4, 2); set_method_param_type(binop_tp_u, 0, tp_u); set_method_param_type(binop_tp_u, 1, tp_u); set_method_param_type(binop_tp_u, 2, tp_u); @@ -2461,7 +2489,7 @@ void lower_dw_ops(const lwrdw_param_t *param) set_method_res_type(binop_tp_u, 1, tp_u); } /* if */ if (! binop_tp_s) { - binop_tp_s = new_type_method(IDENT("binop_s_intrinsic"), 4, 2); + binop_tp_s = new_type_method(4, 2); set_method_param_type(binop_tp_s, 0, tp_u); set_method_param_type(binop_tp_s, 1, tp_s); set_method_param_type(binop_tp_s, 2, tp_u); @@ -2470,7 +2498,7 @@ void lower_dw_ops(const lwrdw_param_t *param) set_method_res_type(binop_tp_s, 1, tp_s); } /* if */ if (! shiftop_tp_u) { - shiftop_tp_u = new_type_method(IDENT("shiftop_u_intrinsic"), 3, 2); + shiftop_tp_u = new_type_method(3, 2); set_method_param_type(shiftop_tp_u, 0, tp_u); set_method_param_type(shiftop_tp_u, 1, tp_u); set_method_param_type(shiftop_tp_u, 2, tp_u); @@ -2478,33 +2506,34 @@ void lower_dw_ops(const lwrdw_param_t *param) set_method_res_type(shiftop_tp_u, 1, tp_u); } /* if */ if (! shiftop_tp_s) { - shiftop_tp_s = new_type_method(IDENT("shiftop_s_intrinsic"), 3, 2); + shiftop_tp_s = new_type_method(3, 2); set_method_param_type(shiftop_tp_s, 0, tp_u); set_method_param_type(shiftop_tp_s, 1, tp_s); - /* beware: shift count is always mode_Iu */ set_method_param_type(shiftop_tp_s, 2, tp_u); set_method_res_type(shiftop_tp_s, 0, tp_u); set_method_res_type(shiftop_tp_s, 1, tp_s); } /* if */ if (! unop_tp_u) { - unop_tp_u = new_type_method(IDENT("unop_u_intrinsic"), 2, 2); + unop_tp_u = new_type_method(2, 2); set_method_param_type(unop_tp_u, 0, tp_u); set_method_param_type(unop_tp_u, 1, tp_u); set_method_res_type(unop_tp_u, 0, tp_u); set_method_res_type(unop_tp_u, 1, tp_u); } /* if */ if (! unop_tp_s) { - unop_tp_s = new_type_method(IDENT("unop_s_intrinsic"), 2, 2); + unop_tp_s = new_type_method(2, 2); set_method_param_type(unop_tp_s, 0, tp_u); set_method_param_type(unop_tp_s, 1, tp_s); set_method_res_type(unop_tp_s, 0, tp_u); set_method_res_type(unop_tp_s, 1, tp_s); } /* if */ - lenv.tv_mode_bytes = new_tarval_from_long(get_mode_size_bytes(param->low_unsigned), mode_Iu); - lenv.tv_mode_bits = new_tarval_from_long(get_mode_size_bits(param->low_unsigned), mode_Iu); + lenv.tv_mode_bytes = new_tarval_from_long(get_mode_size_bytes(param->low_unsigned), param->low_unsigned); + lenv.tv_mode_bits = new_tarval_from_long(get_mode_size_bits(param->low_unsigned), param->low_unsigned); lenv.waitq = new_pdeq(); lenv.params = param; + lenv.first_id = new_id_from_chars(param->little_endian ? ".l" : ".h", 2); + lenv.next_id = new_id_from_chars(param->little_endian ? ".h" : ".l", 2); /* first clear the generic function pointer for all ops */ clear_irp_opcodes_generic_func(); @@ -2541,6 +2570,7 @@ void lower_dw_ops(const lwrdw_param_t *param) LOWER(DivMod); LOWER(Div); LOWER(Mod); + LOWER(Sel); LOWER_UN(Abs); LOWER_UN(Minus); @@ -2554,7 +2584,9 @@ void lower_dw_ops(const lwrdw_param_t *param) /* transform all graphs */ rem = current_ir_graph; for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - ir_graph *irg = get_irp_irg(i); + ir_graph *irg = get_irp_irg(i); + ir_entity *ent; + ir_type *mtp; int n_idx; obstack_init(&lenv.obst); @@ -2565,10 +2597,25 @@ void lower_dw_ops(const lwrdw_param_t *param) lenv.entries = NEW_ARR_F(node_entry_t *, n_idx); memset(lenv.entries, 0, n_idx * sizeof(lenv.entries[0])); - /* first step: link all nodes and allocate data */ - lenv.flags = 0; + lenv.l_mtp = NULL; + lenv.flags = 0; lenv.proj_2_block = pmap_create(); - irg_walk_graph(irg, firm_clear_link, prepare_links_and_handle_rotl, &lenv); + lenv.value_param_tp = NULL; + ir_reserve_resources(irg, IR_RESOURCE_PHI_LIST | IR_RESOURCE_IRN_LINK); + + ent = get_irg_entity(irg); + mtp = get_entity_type(ent); + + if (mtp_must_to_lowered(mtp, &lenv)) { + ir_type *ltp = lower_mtp(mtp, &lenv); + lenv.flags |= MUST_BE_LOWERED; + set_entity_type(ent, ltp); + lenv.l_mtp = ltp; + lenv.value_param_tp = get_method_value_param_type(mtp); + } /* if */ + + /* first step: link all nodes and allocate data */ + irg_walk_graph(irg, firm_clear_node_and_phi_links, prepare_links_and_handle_rotl, &lenv); if (lenv.flags & MUST_BE_LOWERED) { DB((dbg, LEVEL_1, "Lowering graph %+F\n", irg)); @@ -2585,6 +2632,8 @@ void lower_dw_ops(const lwrdw_param_t *param) lower_ops(node, &lenv); } /* while */ + ir_free_resources(irg, IR_RESOURCE_PHI_LIST | IR_RESOURCE_IRN_LINK); + /* outs are invalid, we changed the graph */ set_irg_outs_inconsistent(irg); @@ -2594,6 +2643,8 @@ void lower_dw_ops(const lwrdw_param_t *param) set_irg_extblk_inconsistent(irg); set_irg_loopinfo_inconsistent(irg); } /* if */ + } else { + ir_free_resources(irg, IR_RESOURCE_PHI_LIST | IR_RESOURCE_IRN_LINK); } /* if */ pmap_destroy(lenv.proj_2_block); DEL_ARR_F(lenv.entries); @@ -2603,6 +2654,32 @@ void lower_dw_ops(const lwrdw_param_t *param) current_ir_graph = rem; } /* lower_dw_ops */ +struct pass_t { + ir_prog_pass_t pass; + const lwrdw_param_t *param; +}; + +/** + * Creates a wrapper around lower_dw_ops(). + */ +static int pass_wrapper(ir_prog *irp, void *context) +{ + struct pass_t *pass = context; + + (void)irp; + lower_dw_ops(pass->param); + return 0; +} + +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; + return def_prog_pass_constructor( + &pass->pass, name ? name : "lower_dw", pass_wrapper); +} /* lower_dw_ops_pass */ + /* Default implementation. */ ir_entity *def_create_intrinsic_fkt(ir_type *method, const ir_op *op, const ir_mode *imode, const ir_mode *omode, @@ -2623,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 */