Small cleanups.

[r16353]

diff --git a/ir/be/becopyheur4.c b/ir/be/becopyheur4.c
index f370b86..7ad496e 100644 (file)
--- a/ir/be/becopyheur4.c
+++ b/ir/be/becopyheur4.c
@@ -1191,7 +1191,7 @@ static void color_aff_chunk(co_mst_env_t *env, aff_chunk_t *c) {
                for (idx = 0, len = ARR_LEN(c->n); idx < len; ++idx) {
                        ir_node      *irn  = c->n[idx];
                        co_mst_irn_t *node = get_co_mst_irn(env, irn);
-                       int          good  = 0;
+                       int          good;
 
                        assert(! node->fixed && "Node must not have a fixed color.");
                        DB((dbg, LEVEL_4, "\t\tBringing %+F from color %d to color %d ...\n", irn, node->col, col));

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index b1c3b70..c48353a 100644 (file)
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -524,17 +524,8 @@ static void build_address_ptr(ia32_address_t *addr, ir_node *ptr, ir_node *mem)
        memset(addr, 0, sizeof(addr[0]));
        ia32_create_address_mode(addr, ptr, /*force=*/0);
 
-       if(addr->base == NULL) {
-               addr->base = noreg_gp;
-       } else {
-               addr->base = be_transform_node(addr->base);
-       }
-
-       if(addr->index == NULL) {
-               addr->index = noreg_gp;
-       } else {
-               addr->index = be_transform_node(addr->index);
-       }
+       addr->base  = addr->base  ? be_transform_node(addr->base)  : noreg_gp;
+       addr->index = addr->index ? be_transform_node(addr->index) : noreg_gp;
        addr->mem   = be_transform_node(mem);
 }
 
@@ -546,8 +537,6 @@ static void build_address(ia32_address_mode_t *am, ir_node *node)
        ir_node        *ptr;
        ir_node        *mem;
        ir_node        *new_mem;
-       ir_node        *base;
-       ir_node        *index;
 
        if(is_Const(node)) {
                ir_entity *entity  = create_float_const_entity(node);
@@ -571,23 +560,9 @@ static void build_address(ia32_address_mode_t *am, ir_node *node)
 
        /* construct load address */
        ia32_create_address_mode(addr, ptr, /*force=*/0);
-       base  = addr->base;
-       index = addr->index;
 
-       if(base == NULL) {
-               base = noreg_gp;
-       } else {
-               base = be_transform_node(base);
-       }
-
-       if(index == NULL) {
-               index = noreg_gp;
-       } else {
-               index = be_transform_node(index);
-       }
-
-       addr->base  = base;
-       addr->index = index;
+       addr->base  = addr->base  ? be_transform_node(addr->base)  : noreg_gp;
+       addr->index = addr->index ? be_transform_node(addr->index) : noreg_gp;
        addr->mem   = new_mem;
 }
 
@@ -1194,16 +1169,13 @@ static ir_node *gen_Mulh(ir_node *node)
        ir_node  *op2       = get_Mulh_right(node);
        ir_node  *proj_EDX;
        ir_node  *new_node;
-       match_flags_t        flags;
        ia32_address_mode_t  am;
        ia32_address_t      *addr = &am.addr;
 
-       flags = match_commutative | match_am;
-
        assert(!mode_is_float(mode) && "Mulh with float not supported");
        assert(get_mode_size_bits(mode) == 32);
 
-       match_arguments(&am, block, op1, op2, flags);
+       match_arguments(&am, block, op1, op2, match_commutative | match_am);
 
        if (mode_is_signed(mode)) {
                new_node = new_rd_ia32_IMul1OP(dbgi, irg, new_block, addr->base,