removed GNU extension: void * are not allowed in arithmetic

[libfirm] / ir / lower / lower_dw.c

diff --git a/ir/lower/lower_dw.c b/ir/lower/lower_dw.c
index 0404cfd..4555529 100644 (file)
--- a/ir/lower/lower_dw.c
+++ b/ir/lower/lower_dw.c
@@ -355,6 +355,7 @@ 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);
@@ -377,7 +378,7 @@ static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) {
 
        /* create two loads */
        dbg  = get_irn_dbg_info(node);
-       low  = new_rd_Load(dbg, irg, block, mem, low,  mode);
+       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);
 
@@ -403,8 +404,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, 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(irg, block, low,  low_mode, pn_Load_res);
+                       env->entries[idx]->high_word = new_r_Proj(irg, block, high, mode,     pn_Load_res);
                        break;
                default:
                        assert(0 && "unexpected Proj number");
@@ -1127,7 +1128,7 @@ 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, mode);
+       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);
 }  /* lower_Binop_logical */
 
@@ -1173,7 +1174,7 @@ static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env) {
 
        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, mode);
+       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);
 }  /* lower_Not */
 
@@ -1427,7 +1428,8 @@ static void lower_Conv_to_Ls(ir_node *node, lower_env_t *env) {
                        env->entries[idx]->low_word  = op;
 
                        if (mode_is_signed(imode)) {
-                               env->entries[idx]->high_word = new_rd_Shrs(dbg, irg, block, op,
+                               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));
@@ -2219,7 +2221,7 @@ static void lower_ops(ir_node *node, void *env)
        int          idx = get_irn_idx(node);
        ir_mode      *mode = get_irn_mode(node);
 
-       if (mode == mode_b || get_irn_op(node) == op_Psi) {
+       if (mode == mode_b || is_Psi(node)) {
                int i;
 
                for (i = get_irn_arity(node) - 1; i >= 0; --i) {
@@ -2263,13 +2265,6 @@ static void lower_ops(ir_node *node, void *env)
 
                        DB((dbg, LEVEL_1, "  %+F\n", node));
                        func(node, mode, lenv);
-                       if (entry) {
-                               ir_node *low_node = entry->low_word;
-                               if (low_node && mode_is_signed(get_irn_mode(low_node))) {
-                                       ir_fprintf(stderr, "WARNING: lower mode of %+F of lowered %+F is signed\n",
-                                             low_node, node);
-                               }
-                       }
                }  /* if */
        }  /* if */
 }  /* lower_ops */