X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_intrinsics.c;h=8df4aeb6a44f37702f1636390fcad6d3c89ed39d;hb=2d4cb2720430d39651ddb33d9b342f69bd757a75;hp=7410b911b4ea73751ce60d500c69da6a5c7689d7;hpb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;p=libfirm diff --git a/ir/be/ia32/ia32_intrinsics.c b/ir/be/ia32/ia32_intrinsics.c index 7410b911b..8df4aeb6a 100644 --- a/ir/be/ia32/ia32_intrinsics.c +++ b/ir/be/ia32/ia32_intrinsics.c @@ -1,20 +1,6 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. - * * This file is part of libFirm. - * - * This file may be distributed and/or modified under the terms of the - * GNU General Public License version 2 as published by the Free Software - * Foundation and appearing in the file LICENSE.GPL included in the - * packaging of this file. - * - * Licensees holding valid libFirm Professional Edition licenses may use - * this file in accordance with the libFirm Commercial License. - * Agreement provided with the Software. - * - * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE. + * Copyright (C) 2012 University of Karlsruhe. */ /** @@ -35,6 +21,7 @@ #include "lower_dw.h" #include "array.h" #include "error.h" +#include "util.h" #include "ia32_new_nodes.h" #include "bearch_ia32_t.h" @@ -73,9 +60,7 @@ void ia32_handle_intrinsics(void) */ static void reroute_result(ir_node *resproj, ir_node *l_res, ir_node *h_res) { - const ir_edge_t *edge, *next; - - foreach_out_edge_safe(resproj, edge, next) { + foreach_out_edge_safe(resproj, edge) { ir_node *proj = get_edge_src_irn(edge); long pn = get_Proj_proj(proj); @@ -106,9 +91,7 @@ static void resolve_call(ir_node *call, ir_node *l_res, ir_node *h_res, ir_graph if (edges_activated(irg)) { /* use rerouting to prevent some warning in the backend */ - const ir_edge_t *edge, *next; - - foreach_out_edge_safe(call, edge, next) { + foreach_out_edge_safe(call, edge) { ir_node *proj = get_edge_src_irn(edge); pn_Call pn = (pn_Call)get_Proj_proj(proj); @@ -166,11 +149,13 @@ static void resolve_call(ir_node *call, ir_node *l_res, ir_node *h_res, ir_graph jmp = new_r_Jmp(block); set_opt_cse(old_cse); - turn_into_tuple(call, pn_Call_max+1); - set_Tuple_pred(call, pn_Call_M, nomem); - set_Tuple_pred(call, pn_Call_X_regular, jmp); - set_Tuple_pred(call, pn_Call_X_except, new_r_Bad(irg, mode_X)); - set_Tuple_pred(call, pn_Call_T_result, res); + ir_node *const in[] = { + [pn_Call_M] = nomem, + [pn_Call_T_result] = res, + [pn_Call_X_regular] = jmp, + [pn_Call_X_except] = new_r_Bad(irg, mode_X), + }; + turn_into_tuple(call, ARRAY_SIZE(in), in); } } @@ -354,58 +339,6 @@ static int map_Minus(ir_node *call, void *ctx) return 1; } -#if 0 -/** - * Map a Abs (a_l, a_h) - */ -static int map_Abs(ir_node *call, void *ctx) -{ - dbg_info *dbg = get_irn_dbg_info(call); - ir_node *block = get_nodes_block(call); - ir_node **params = get_Call_param_arr(call); - ir_type *method = get_Call_type(call); - ir_node *a_l = params[BINOP_Left_Low]; - ir_node *a_h = params[BINOP_Left_High]; - ir_mode *l_mode = get_type_mode(get_method_res_type(method, 0)); - ir_mode *h_mode = get_type_mode(get_method_res_type(method, 1)); - ir_mode *mode_flags = ia32_reg_classes[CLASS_ia32_flags].mode; - ir_node *l_res, *h_res, *sign, *sub_l, *sub_h; - ir_node *sign_l; - ir_node *l_sub; - ir_node *flags; - (void) ctx; - - /* - Code inspired by gcc output :) (although gcc doubles the - operation for t1 as t2 and uses t1 for operations with low part - and t2 for operations with high part which is actually unnecessary - because t1 and t2 represent the same value) - - t1 = SHRS a_h, 31 - t2 = a_l ^ t1 - t3 = a_h ^ t1 - l_res = t2 - t1 - h_res = t3 - t1 - carry - - */ - - /* TODO: give a hint to the backend somehow to not create a cltd here... */ - sign = new_rd_Shrs(dbg, block, a_h, new_r_Const_long(irg, l_mode, 31), h_mode); - sign_l = new_rd_Conv(dbg, block, sign, l_mode); - sub_l = new_rd_Eor(dbg, block, a_l, sign_l, l_mode); - sub_h = new_rd_Eor(dbg, block, a_h, sign, h_mode); - - l_sub = new_bd_ia32_l_Sub(dbg, block, sub_l, sign_l, mode_T); - l_res = new_r_Proj(l_sub, l_mode, pn_ia32_res); - flags = new_r_Proj(l_sub, mode_flags, pn_ia32_flags); - h_res = new_bd_ia32_l_Sbb(dbg, block, sub_h, sign, flags, h_mode); - - resolve_call(call, l_res, h_res, current_ir_graph, block); - - return 1; -} -#endif - #define ID(x) new_id_from_chars(x, sizeof(x)-1) /** @@ -520,8 +453,7 @@ static int map_Conv(ir_node *call, void *ctx) pn_ia32_l_FloattoLL_res_high); } else { /* Convert from float to unsigned 64bit. */ - ir_mode *flt_mode = get_irn_mode(a_f); - ir_tarval *flt_tv = new_tarval_from_str("9223372036854775808", 19, flt_mode); + ir_tarval *flt_tv = new_tarval_from_str("9223372036854775808", 19, ia32_mode_E); ir_node *flt_corr = new_r_Const(irg, flt_tv); ir_node *lower_blk = block; ir_node *upper_blk; @@ -531,6 +463,7 @@ static int map_Conv(ir_node *call, void *ctx) part_block(call); upper_blk = get_nodes_block(call); + a_f = new_rd_Conv(dbg, upper_blk, a_f, ia32_mode_E); cmp = new_rd_Cmp(dbg, upper_blk, a_f, flt_corr, ir_relation_less); cond = new_rd_Cond(dbg, upper_blk, cmp); in[0] = new_r_Proj(cond, mode_X, pn_Cond_true); @@ -547,14 +480,15 @@ static int map_Conv(ir_node *call, void *ctx) int_phi = new_r_Phi(lower_blk, 2, in, h_res_mode); in[0] = a_f; - in[1] = new_rd_Sub(dbg, upper_blk, a_f, flt_corr, flt_mode); + in[1] = new_rd_Sub(dbg, upper_blk, a_f, flt_corr, ia32_mode_E); - flt_phi = new_r_Phi(lower_blk, 2, in, flt_mode); + flt_phi = new_r_Phi(lower_blk, 2, in, ia32_mode_E); /* fix Phi links for next part_block() */ - set_Block_phis(lower_blk, int_phi); - set_Phi_next(int_phi, flt_phi); - set_Phi_next(flt_phi, NULL); + if (is_Phi(int_phi)) + add_Block_phi(lower_blk, int_phi); + if (is_Phi(flt_phi)) + add_Block_phi(lower_blk, flt_phi); float_to_ll = new_bd_ia32_l_FloattoLL(dbg, lower_blk, flt_phi); @@ -645,9 +579,7 @@ ir_entity *ia32_create_intrinsic_fkt(ir_type *method, const ir_op *op, } if (ent && ! *ent) { -#define IDENT(s) new_id_from_chars(s, sizeof(s)-1) - - ident *id = id_mangle(IDENT("L"), get_op_ident(op)); + ident *id = id_mangle(ID("L"), get_op_ident(op)); *ent = new_entity(get_glob_type(), id, method); set_entity_visibility(*ent, ir_visibility_private); }