Remove enum tarval_classification_t.

[libfirm] / ir / ir / irarch.c

diff --git a/ir/ir/irarch.c b/ir/ir/irarch.c
index 9347202..2431931 100644 (file)
--- a/ir/ir/irarch.c
+++ b/ir/ir/irarch.c
@@ -70,40 +70,11 @@ static const ir_settings_arch_dep_t *params = NULL;
 /** The bit mask, which optimizations to apply. */
 static arch_dep_opts_t opts;
 
-/* we need this new pseudo op */
-static ir_op *op_Mulh = NULL;
-
-/**
- * construct a Mulh: Mulh(a,b) = (a * b) >> w, w is the with in bits of a, b
- */
-static ir_node *
-new_rd_Mulh (dbg_info *db, ir_graph *irg, ir_node *block,
-       ir_node *op1, ir_node *op2, ir_mode *mode) {
-       ir_node *in[2];
-       ir_node *res;
-
-       in[0] = op1;
-       in[1] = op2;
-       res = new_ir_node(db, irg, block, op_Mulh, mode, 2, in);
-       res = optimize_node(res);
-       IRN_VRFY_IRG(res, irg);
-       return res;
-}
-
-ir_op *get_op_Mulh(void)  { return op_Mulh; }
-
 void arch_dep_init(arch_dep_params_factory_t factory) {
        opts = arch_dep_none;
 
        if (factory != NULL)
                params = factory();
-
-       if (! op_Mulh) {
-               int mulh_opc = get_next_ir_opcode();
-
-               /* create the Mulh operation */
-               op_Mulh = new_ir_op(mulh_opc, "Mulh",  op_pin_state_floats, irop_flag_commutative, oparity_binary, 0, 0, NULL);
-       }
 }
 
 void arch_dep_set_opts(arch_dep_opts_t the_opts) {
@@ -138,7 +109,7 @@ struct instruction {
 typedef struct _mul_env {
        struct obstack obst;       /**< an obstack for local space. */
        ir_mode        *mode;      /**< the mode of the multiplication constant */
-       int            bits;       /**< number of bits in the mode */
+       unsigned       bits;       /**< number of bits in the mode */
        unsigned       max_S;      /**< the maximum LEA shift value. */
        instruction    *root;      /**< the root of the instruction tree */
        ir_node        *op;        /**< the operand that is multiplied */
@@ -152,9 +123,12 @@ typedef struct _mul_env {
 } mul_env;
 
 /**
- * Some kind of default evaluator.
+ * Some kind of default evaluator. Return the cost of
+ * instructions.
  */
 static int default_evaluate(insn_kind kind, tarval *tv) {
+       (void) tv;
+
        if (kind == MUL)
                return 13;
        return 1;
@@ -348,6 +322,7 @@ static instruction *basic_decompose_mul(mul_env *env, unsigned char *R, int r, t
 static instruction *decompose_simple_cases(mul_env *env, unsigned char *R, int r, tarval *N) {
        instruction *ins, *ins2;
 
+       (void) N;
        if (r == 1) {
                return emit_SHIFT(env, env->root, R[0]);
        } else {
@@ -559,7 +534,7 @@ static ir_node *do_decomposition(ir_node *irn, ir_node *operand, tarval *tv) {
 
        obstack_init(&env.obst);
        env.mode     = get_tarval_mode(tv);
-       env.bits     = get_mode_size_bits(env.mode);
+       env.bits     = (unsigned)get_mode_size_bits(env.mode);
        env.max_S    = 3;
        env.root     = emit_ROOT(&env, operand);
        env.fail     = 0;
@@ -596,7 +571,6 @@ ir_node *arch_dep_replace_mul_with_shifts(ir_node *irn) {
                return irn;
 
        if (is_Mul(irn) && mode_is_int(mode)) {
-               ir_node *block   = get_nodes_block(irn);
                ir_node *left    = get_binop_left(irn);
                ir_node *right   = get_binop_right(irn);
                tarval *tv       = NULL;
@@ -923,7 +897,7 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) {
                tv = get_Const_tarval(c);
 
                /* check for division by zero */
-               if (classify_tarval(tv) == TV_CLASSIFY_NULL)
+               if (tarval_is_null(tv))
                        return irn;
 
                left  = get_Div_left(irn);
@@ -1014,7 +988,7 @@ ir_node *arch_dep_replace_mod_by_const(ir_node *irn) {
                tv = get_Const_tarval(c);
 
                /* check for division by zero */
-               if (classify_tarval(tv) == TV_CLASSIFY_NULL)
+               if (tarval_is_null(tv))
                        return irn;
 
                left  = get_Mod_left(irn);
@@ -1108,7 +1082,7 @@ void arch_dep_replace_divmod_by_const(ir_node **div, ir_node **mod, ir_node *irn
                tv = get_Const_tarval(c);
 
                /* check for division by zero */
-               if (classify_tarval(tv) == TV_CLASSIFY_NULL)
+               if (tarval_is_null(tv))
                        return;
 
                left  = get_DivMod_left(irn);
@@ -1196,6 +1170,7 @@ static const ir_settings_arch_dep_t default_params = {
        1,  /* also use subs */
        4,  /* maximum shifts */
        31, /* maximum shift amount */
+       default_evaluate,  /* default evaluator */
 
        0,  /* allow Mulhs */
        0,  /* allow Mulus */