cleanup vrp
[libfirm] / ir / lower / lower_intrinsics.c
index 96540bf..ce28ba4 100644 (file)
@@ -44,6 +44,7 @@
 #include "error.h"
 #include "be.h"
 #include "util.h"
+#include "firmstat_t.h"
 
 /** Walker environment. */
 typedef struct walker_env {
@@ -70,7 +71,7 @@ static void call_mapper(ir_node *node, void *env)
                        return;
 
                ent = get_SymConst_entity(symconst);
-               r   = (const i_call_record*)pmap_get(wenv->c_map, ent);
+               r   = pmap_get(i_call_record const, wenv->c_map, ent);
 
                if (r != NULL) {
                        wenv->nr_of_intrinsics += r->i_mapper(node, r->ctx) ? 1 : 0;
@@ -135,15 +136,7 @@ size_t lower_intrinsics(i_record *list, size_t length, int part_block_used)
                        ir_free_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_PHI_LIST);
 
                if (wenv.nr_of_intrinsics > 0) {
-                       /* Changes detected: we might have added/removed nodes. */
-                       set_irg_callee_info_state(irg, irg_callee_info_inconsistent);
-
-                       /* Exception control flow might have changed / new block might have added. */
-                       clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE);
-
-                       /* verify here */
-                       irg_verify(irg, VERIFY_NORMAL);
-
+                       confirm_irg_properties(irg, IR_GRAPH_PROPERTIES_NONE);
                        nr_of_intrinsics += wenv.nr_of_intrinsics;
                }
        }
@@ -267,7 +260,8 @@ int i_mapper_bswap(ir_node *call, void *ctx)
        ir_node *irn;
        (void) ctx;
 
-       irn = new_rd_Builtin(dbg, block, get_irg_no_mem(current_ir_graph), 1, &op, ir_bk_bswap, tp);
+       ir_graph *const irg = get_Block_irg(block);
+       irn = new_rd_Builtin(dbg, block, get_irg_no_mem(irg), 1, &op, ir_bk_bswap, tp);
        set_irn_pinned(irn, op_pin_state_floats);
        irn = new_r_Proj(irn, get_irn_mode(op), pn_Builtin_max+1);
        replace_call(irn, call, mem, NULL, NULL);
@@ -391,9 +385,16 @@ int i_mapper_pow(ir_node *call, void *ctx)
        dbg = get_irn_dbg_info(call);
 
        if (irn == NULL) {
-               ir_mode *mode = get_irn_mode(left);
+               ir_mode *result_mode = get_irn_mode(left);
                ir_node *div;
 
+               ir_mode *mode             = result_mode;
+               ir_mode *float_arithmetic = be_get_backend_param()->mode_float_arithmetic;
+               if (float_arithmetic != NULL) {
+                       left = new_r_Conv(block, left, float_arithmetic);
+                       mode = float_arithmetic;
+               }
+
                irn  = new_r_Const(irg, get_mode_one(mode));
                div  = new_rd_Div(dbg, block, mem, irn, left, mode, op_pin_state_pinned);
                mem  = new_r_Proj(div, mode_M, pn_Div_M);
@@ -403,6 +404,9 @@ int i_mapper_pow(ir_node *call, void *ctx)
                        exc_jmp = new_r_Proj(div, mode_X, pn_Div_X_except);
                        ir_set_throws_exception(div, true);
                }
+               if (result_mode != mode) {
+                       irn = new_r_Conv(block, irn, result_mode);
+               }
        }
        DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_POW);
        replace_call(irn, call, mem, reg_jmp, exc_jmp);
@@ -487,7 +491,7 @@ static int i_mapper_symmetric_zero_to_one(ir_node *call, void *ctx, int reason)
        ir_node *val     = get_Call_param(call, 0);
        (void) ctx;
 
-       if (is_strictConv(val)) {
+       if (is_Conv(val)) {
                ir_node *op = get_Conv_op(val);
                if (is_Minus(op)) {
                        /* f(-x) = f(x) with strictConv */
@@ -497,10 +501,6 @@ static int i_mapper_symmetric_zero_to_one(ir_node *call, void *ctx, int reason)
 
                        op = get_Minus_op(op);
                        val = new_rd_Conv(dbg, block, op, mode);
-                       if (is_Conv(val)) {
-                               /* still a Conv ? */
-                               set_Conv_strict(val, 1);
-                       }
                        DBG_OPT_ALGSIM2(call, op, call, FS_OPT_RTS_SYMMETRIC);
                        set_Call_param(call, 0, val);
                        changed = 1;
@@ -617,6 +617,29 @@ static ir_entity *get_const_entity(ir_node *ptr)
        return NULL;
 }
 
+static ir_tarval *get_initializer_value(ir_initializer_t *const init, ir_mode *const mode)
+{
+       switch (get_initializer_kind(init)) {
+       case IR_INITIALIZER_NULL:
+               return get_mode_null(mode);
+
+       case IR_INITIALIZER_TARVAL:
+               return get_initializer_tarval_value(init);
+
+       case IR_INITIALIZER_CONST: {
+               ir_node *const irn = get_initializer_const_value(init);
+               if (is_Const(irn))
+                       return get_Const_tarval(irn);
+               break;
+       }
+
+       case IR_INITIALIZER_COMPOUND:
+               break;
+       }
+
+       return get_tarval_undefined();
+}
+
 static bool initializer_val_is_null(ir_initializer_t *init)
 {
        ir_tarval *tv;
@@ -666,25 +689,6 @@ static ir_node *eval_strlen(ir_graph *irg, ir_entity *ent, ir_type *res_tp)
        if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
                return NULL;
 
-       if (!has_entity_initializer(ent)) {
-               size_t i, n;
-
-               n = get_compound_ent_n_values(ent);
-               for (i = 0; i < n; ++i) {
-                       ir_node *irn = get_compound_ent_value(ent, i);
-
-                       if (! is_Const(irn))
-                               return NULL;
-
-                       if (is_Const_null(irn)) {
-                               /* found the length */
-                               ir_tarval *tv = new_tarval_from_long(i, get_type_mode(res_tp));
-                               return new_r_Const(irg, tv);
-                       }
-               }
-               return NULL;
-       }
-
        initializer = get_entity_initializer(ent);
        if (get_initializer_kind(initializer) != IR_INITIALIZER_COMPOUND)
                return NULL;
@@ -740,8 +744,14 @@ int i_mapper_strlen(ir_node *call, void *ctx)
 static ir_node *eval_strcmp(ir_graph *irg, ir_entity *left, ir_entity *right,
                             ir_type *res_tp)
 {
-       ir_type *tp;
-       ir_mode *mode;
+       ir_type          *tp;
+       ir_mode          *mode;
+       ir_initializer_t *init_l;
+       ir_initializer_t *init_r;
+       size_t            size_l;
+       size_t            size_r;
+       size_t            size;
+       size_t            i;
 
        tp = get_entity_type(left);
        if (! is_Array_type(tp))
@@ -767,56 +777,39 @@ static ir_node *eval_strcmp(ir_graph *irg, ir_entity *left, ir_entity *right,
        if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
                return NULL;
 
-       if (!has_entity_initializer(left) && !has_entity_initializer(right)) {
-               /* code that uses deprecated compound_graph_path stuff */
-               size_t n   = get_compound_ent_n_values(left);
-               size_t n_r = get_compound_ent_n_values(right);
-               size_t i;
-               int    res = 0;
-
-               if (n_r < n)
-                       n = n_r;
-               for (i = 0; i < n; ++i) {
-                       ir_node *irn;
-                       long v_l, v_r;
-                       ir_tarval *tv;
-
-                       irn = get_compound_ent_value(left, i);
-                       if (! is_Const(irn))
-                               return NULL;
-                       tv = get_Const_tarval(irn);
-                       v_l = get_tarval_long(tv);
-
-                       irn = get_compound_ent_value(right, i);
-                       if (! is_Const(irn))
-                               return NULL;
-                       tv = get_Const_tarval(irn);
-                       v_r = get_tarval_long(tv);
-
-                       if (v_l < v_r) {
-                               res = -1;
-                               break;
-                       }
-                       if (v_l > v_r) {
-                               res = +1;
-                               break;
-                       }
+       init_l = get_entity_initializer(left);
+       init_r = get_entity_initializer(right);
+       if (get_initializer_kind(init_l) != IR_INITIALIZER_COMPOUND ||
+           get_initializer_kind(init_r) != IR_INITIALIZER_COMPOUND)
+               return NULL;
 
-                       if (v_l == 0) {
-                               res = 0;
-                               break;
-                       }
+       size_l = get_initializer_compound_n_entries(init_l);
+       size_r = get_initializer_compound_n_entries(init_r);
+       size   = size_l < size_r ? size_l : size_r;
+
+       for (i = 0; i != size; ++i) {
+               ir_initializer_t *const val_l = get_initializer_compound_value(init_l, i);
+               ir_tarval        *const tv_l  = get_initializer_value(val_l, mode);
+               ir_initializer_t *const val_r = get_initializer_compound_value(init_r, i);
+               ir_tarval        *const tv_r  = get_initializer_value(val_r, mode);
+
+               if (!tarval_is_constant(tv_l) || !tarval_is_constant(tv_r))
+                       return NULL;
+
+               if (tv_l != tv_r) {
+                       ir_mode   *const res_mode = get_type_mode(res_tp);
+                       ir_tarval *const res_l    = tarval_convert_to(tv_l, res_mode);
+                       ir_tarval *const res_r    = tarval_convert_to(tv_r, res_mode);
+                       ir_tarval *const tv       = tarval_sub(res_l, res_r, res_mode);
+                       return new_r_Const(irg, tv);
                }
-               if (i < n) {
-                       /* we found an end */
-                       ir_tarval *tv = new_tarval_from_long(res, get_type_mode(res_tp));
+
+               if (tarval_is_null(tv_l)) {
+                       ir_tarval *const tv = get_mode_null(get_type_mode(res_tp));
                        return new_r_Const(irg, tv);
                }
-               return NULL;
        }
 
-       /* TODO */
-
        return NULL;
 }
 
@@ -831,7 +824,6 @@ static int is_empty_string(ir_entity *ent)
 {
        ir_type          *tp = get_entity_type(ent);
        ir_mode          *mode;
-       ir_node          *irn;
        ir_initializer_t *initializer;
        ir_initializer_t *init0;
 
@@ -846,16 +838,6 @@ static int is_empty_string(ir_entity *ent)
        if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
                return 0;
 
-       if (!has_entity_initializer(ent)) {
-               /* code for deprecated compound_graph_path stuff */
-               size_t n = get_compound_ent_n_values(ent);
-               if (n < 1)
-                       return 0;
-               irn = get_compound_ent_value(ent, 0);
-
-               return is_Const(irn) && is_Const_null(irn);
-       }
-
        initializer = get_entity_initializer(ent);
        if (get_initializer_kind(initializer) != IR_INITIALIZER_COMPOUND)
                return 0;
@@ -892,11 +874,11 @@ int i_mapper_strcmp(ir_node *call, void *ctx)
                return 0;
        char_tp = get_pointer_points_to_type(char_tp);
 
+       ir_node *mem = get_Call_mem(call);
        if (left == right) {
                /* a strcmp(s, s) ==> 0 */
-               ir_graph *irg  = get_irn_irg(call);
-               ir_node *mem   = get_Call_mem(call);
-               ir_mode *mode  = get_type_mode(res_tp);
+               ir_graph *irg = get_irn_irg(call);
+               ir_mode *mode = get_type_mode(res_tp);
 
                irn = new_r_Const(irg, get_mode_null(mode));
                DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRCMP);
@@ -918,7 +900,7 @@ int i_mapper_strcmp(ir_node *call, void *ctx)
        } else if (ent_r != NULL) {
                if (is_empty_string(ent_r)) {
                        /* s strcmp(s, "") ==> (*s) */
-                       ir_node  *mem, *block;
+                       ir_node  *block;
                        dbg_info *dbg;
                        ir_mode  *mode;
 
@@ -954,7 +936,6 @@ replace_by_call:
        }
 
        if (irn != NULL) {
-               ir_node *mem = get_Call_mem(call);
                DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRCMP);
                replace_call(irn, call, mem, reg, exc);
                return 1;
@@ -1131,11 +1112,10 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt)
        int i, j, arity, first, n_param, n_res;
        long n_proj;
        ir_type *mtp;
-       ir_node *mem, *bl, *call, *addr, *res_proj;
+       ir_node *mem, *call, *addr, *res_proj;
        ir_node **in;
        bool     throws_exception;
        ir_op   *op;
-       ir_graph *irg;
        symconst_symbol sym;
        ir_mode *mode = get_irn_mode(node);
 
@@ -1154,7 +1134,8 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt)
 
        mtp     = get_entity_type(rt->ent);
        n_param = get_method_n_params(mtp);
-       irg     = current_ir_graph;
+       ir_node  *const bl  = get_nodes_block(node);
+       ir_graph *const irg = get_Block_irg(bl);
 
        mem = get_irn_n(node, 0);
        if (get_irn_mode(mem) != mode_M) {
@@ -1198,7 +1179,6 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt)
        }
 
        /* ok, when we are here, the number of predecessors match as well as the parameter modes */
-       bl = get_nodes_block(node);
        op = get_irn_op(node);
 
        in = NULL;