tv: Remove mul_table[][][] and simply use * and <<.
[libfirm] / ir / be / ia32 / ia32_intrinsics.c
index e5b1581..12728b9 100644 (file)
@@ -22,7 +22,6 @@
  * @brief       This file implements the mapping of 64Bit intrinsic
  *              functions to code or library calls.
  * @author      Michael Beck
- * @version     $Id$
  */
 #include "config.h"
 
@@ -74,9 +73,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);
 
@@ -107,9 +104,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);
 
@@ -355,58 +350,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)
 
 /**
@@ -521,8 +464,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;
@@ -532,6 +474,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);
@@ -548,14 +491,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);
 
@@ -646,9 +590,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);
        }