X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_address_mode.c;h=6d72e3388f33803a3ea3be7221d2547a2d8cc5c0;hb=8057f671ea7f286a27e40bfe1aa45d85e0990cbe;hp=5e2aea2aff515f4a2544f5b66fcb39909c36589e;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm

diff --git a/ir/be/ia32/ia32_address_mode.c b/ir/be/ia32/ia32_address_mode.c
index 5e2aea2af..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;
 		}
@@ -418,12 +417,12 @@ int ia32_is_non_address_mode_node(ir_node const *node)
 }
 
 /**
- * Check if a given value is last used (i.e. die after) the block of some other node.
+ * Check if a given value is last used (i.e. die after) the block of some
+ * other 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;
@@ -441,6 +440,12 @@ static int value_last_used_here(be_lv_t *lv, ir_node *here, ir_node *value)
 	return 1;
 }
 
+static bool simple_is_immediate(const ir_node *node)
+{
+	int symconsts = 0;
+	return do_is_immediate(node, &symconsts, false);
+}
+
 /**
  * Walker: mark those nodes that cannot be part of an address mode because
  * their value must be accessed through a register
@@ -486,12 +491,17 @@ static void mark_non_address_nodes(ir_node *node, void *env)
 		left  = get_binop_left(node);
 		right = get_binop_right(node);
 
-		/* Fold AM if any of the two operands does not die here.  This duplicates
+		/* if any of the operands is an immediate then this will not
+		 * increase register pressure */
+		if (simple_is_immediate(left) || simple_is_immediate(right))
+			return;
+
+		/* Fold AM if any of the two operands does not die here. This duplicates
 		 * an addition and has the same register pressure for the case that only
 		 * one operand dies, but is faster (on Pentium 4).
 		 * && instead of || only folds AM if both operands do not die here */
 		if (!value_last_used_here(lv, node, left) ||
-				!value_last_used_here(lv, node, right)) {
+		    !value_last_used_here(lv, node, right)) {
 			return;
 		}
 
@@ -514,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));