becopyheur4: Clean up co_mst_irn_init().

[libfirm] / ir / be / ia32 / ia32_address_mode.c

diff --git a/ir/be/ia32/ia32_address_mode.c b/ir/be/ia32/ia32_address_mode.c
index 2b4ff29..b824d4c 100644 (file)
--- a/ir/be/ia32/ia32_address_mode.c
+++ b/ir/be/ia32/ia32_address_mode.c
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2010 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.
  */
 
 /**
@@ -22,7 +8,6 @@
  * @brief       This file contains functions for matching firm graphs for
  *              nodes that can be used as address mode for x86 instructions
  * @author      Matthias Braun
- * @version     $Id$
  */
 #include "config.h"
 
@@ -36,8 +21,8 @@
 #include "iredges_t.h"
 #include "irgwalk.h"
 
-#include "../benode.h"
-#include "../belive.h"
+#include "benode.h"
+#include "belive.h"
 
 #define AGGRESSIVE_AM
 
@@ -67,7 +52,7 @@ static bool do_is_immediate(const ir_node *node, int *symconsts, bool negate)
 #ifdef DEBUG_libfirm
                        ir_fprintf(stderr,
                                   "Optimisation warning tarval of %+F(%+F) is not a long.\n",
-                                  node, current_ir_graph);
+                                  node, get_irn_irg(node));
 #endif
                        return false;
                }
@@ -423,8 +408,7 @@ int ia32_is_non_address_mode_node(ir_node const *node)
  */
 static int value_last_used_here(be_lv_t *lv, ir_node *here, ir_node *value)
 {
-       ir_node         *block = get_nodes_block(here);
-       const ir_edge_t *edge;
+       ir_node *block = get_nodes_block(here);
 
        /* If the value is live end it is for sure it does not die here */
        if (be_is_live_end(lv, block, value)) return 0;
@@ -526,7 +510,10 @@ static void mark_non_address_nodes(ir_node *node, void *env)
 
 void ia32_calculate_non_address_mode_nodes(ir_graph *irg)
 {
-       be_lv_t  *lv  = be_assure_liveness(irg);
+       be_lv_t *lv;
+
+       be_assure_live_chk(irg);
+       lv = be_get_irg_liveness(irg);
 
        non_address_mode_nodes = bitset_malloc(get_irg_last_idx(irg));