becopyilp: Do not advertise the switch to dump the solution, because this is not...

[libfirm] / ir / lower / lower_dw.c

diff --git a/ir/lower/lower_dw.c b/ir/lower/lower_dw.c
index 16637ab..78e48d3 100644 (file)
--- a/ir/lower/lower_dw.c
+++ b/ir/lower/lower_dw.c
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -200,14 +186,14 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode)
  */
 static void add_block_cf_input_nr(ir_node *block, int nr, ir_node *cf)
 {
-       int i, arity = get_irn_arity(block);
+       int i, arity = get_Block_n_cfgpreds(block);
        ir_node **in;
 
        assert(nr < arity);
 
        NEW_ARR_A(ir_node *, in, arity + 1);
        for (i = 0; i < arity; ++i)
-               in[i] = get_irn_n(block, i);
+               in[i] = get_Block_cfgpred(block, i);
        in[i] = cf;
 
        set_irn_in(block, i + 1, in);
@@ -231,11 +217,11 @@ static void add_block_cf_input_nr(ir_node *block, int nr, ir_node *cf)
  */
 static void add_block_cf_input(ir_node *block, ir_node *tmpl, ir_node *cf)
 {
-       int i, arity = get_irn_arity(block);
+       int i, arity = get_Block_n_cfgpreds(block);
        int nr = 0;
 
        for (i = 0; i < arity; ++i) {
-               if (get_irn_n(block, i) == tmpl) {
+               if (get_Block_cfgpred(block, i) == tmpl) {
                        nr = i;
                        break;
                }
@@ -2647,9 +2633,11 @@ static void lower_reduce_builtin(ir_node *builtin, ir_mode *mode)
                panic("unexpected builtin");
        }
 
-       turn_into_tuple(builtin, 2);
-       set_irn_n(builtin, pn_Builtin_M, mem);
-       set_irn_n(builtin, pn_Builtin_max+1, res);
+       ir_node *const in[] = {
+               [pn_Builtin_M]       = mem,
+               [pn_Builtin_max + 1] = res,
+       };
+       turn_into_tuple(builtin, ARRAY_SIZE(in), in);
        }
 }
 
@@ -2967,8 +2955,7 @@ static void lower_irg(ir_graph *irg)
        n_idx = get_irg_last_idx(irg);
        n_idx = n_idx + (n_idx >> 2);  /* add 25% */
        env->n_entries = n_idx;
-       env->entries   = NEW_ARR_F(lower64_entry_t*, n_idx);
-       memset(env->entries, 0, sizeof(env->entries[0]) * n_idx);
+       env->entries   = NEW_ARR_FZ(lower64_entry_t*, n_idx);
 
        env->irg            = irg;
        env->flags          = 0;