X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_address_mode.c;h=6d72e3388f33803a3ea3be7221d2547a2d8cc5c0;hb=fef8dc3eff6468d7d65485af8e1ac9884c504e1a;hp=2b4ff29b45c146bda2191c3de60771067cd4d9a6;hpb=26d5b80559148908df24bb9c265d83207a62f044;p=libfirm

diff --git a/ir/be/ia32/ia32_address_mode.c b/ir/be/ia32/ia32_address_mode.c
index 2b4ff29b4..6d72e3388 100644
--- a/ir/be/ia32/ia32_address_mode.c
+++ b/ir/be/ia32/ia32_address_mode.c
@@ -22,7 +22,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 +35,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 +66,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 +422,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 +524,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));