X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_address_mode.c;h=487b5960815bec4f6feb55292f271e1989c08753;hb=eb593ca265a302849042866b57a3cf7a6e9495ab;hp=b186b55c3b190684577614aa54a345e09fd81974;hpb=480ba4f8d550e9ade2c5dee9b57c4613a47a2983;p=libfirm

diff --git a/ir/be/ia32/ia32_address_mode.c b/ir/be/ia32/ia32_address_mode.c
index b186b55c3..487b59608 100644
--- a/ir/be/ia32/ia32_address_mode.c
+++ b/ir/be/ia32/ia32_address_mode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -67,8 +67,9 @@ static int do_is_immediate(const ir_node *node, int *symconsts, int negate)
 		/* Consts are typically immediates */
 		if (!tarval_is_long(get_Const_tarval(node))) {
 #ifdef DEBUG_libfirm
-			ir_fprintf(stderr, "Optimisation warning tarval of %+F(%+F) is not "
-			           "a long.\n", node, current_ir_graph);
+			ir_fprintf(stderr,
+			           "Optimisation warning tarval of %+F(%+F) is not a long.\n",
+			           node, current_ir_graph);
 #endif
 			return 0;
 		}
@@ -90,7 +91,8 @@ static int do_is_immediate(const ir_node *node, int *symconsts, int negate)
 		return 1;
 	case iro_Add:
 	case iro_Sub:
-		/* Add's and Sub's are typically supported as long as both operands are immediates */
+		/* Add's and Sub's are typically supported as long as both operands are
+		 * immediates */
 		if(bitset_is_set(non_address_mode_nodes, get_irn_idx(node)))
 			return 0;
 
@@ -164,8 +166,7 @@ static void eat_immediate(ia32_address_t *addr, ir_node *node, int negate)
 	case iro_SymConst:
 		/* place the entity into the symconst */
 		if (addr->symconst_ent != NULL) {
-			panic("Internal error: more than 1 symconst in address "
-			      "calculation");
+			panic("Internal error: more than 1 symconst in address calculation");
 		}
 		addr->symconst_ent  = get_SymConst_entity(node);
 #ifndef SUPPORT_NEGATIVE_SYMCONSTS
@@ -259,8 +260,7 @@ static int eat_shl(ia32_address_t *addr, ir_node *node)
 		if(val < 0 || val > 3)
 			return 0;
 		if(val == 0) {
-			ir_fprintf(stderr, "Optimisation warning: unoptimized Shl(,0) "
-			           "found\n");
+			ir_fprintf(stderr, "Optimisation warning: unoptimized Shl(,0) found\n");
 		}
 
 		shifted_val = get_Shl_left(node);
@@ -418,6 +418,11 @@ void ia32_mark_non_am(ir_node *node)
 	bitset_set(non_address_mode_nodes, get_irn_idx(node));
 }
 
+int ia32_is_non_address_mode_node(ir_node *node)
+{
+	return bitset_is_set(non_address_mode_nodes, get_irn_idx(node));
+}
+
 static int value_last_used_here(ir_node *here, ir_node *value)
 {
 	ir_node *block = get_nodes_block(here);
@@ -441,7 +446,7 @@ static int value_last_used_here(ir_node *here, ir_node *value)
 
 /**
  * Walker: mark those nodes that cannot be part of an address mode because
- * there value must be access through an register
+ * their value must be accessed through a register
  */
 static void mark_non_address_nodes(ir_node *node, void *env)
 {
@@ -483,7 +488,11 @@ static void mark_non_address_nodes(ir_node *node, void *env)
 		left  = get_binop_left(node);
 		right = get_binop_right(node);
 
-		if (!value_last_used_here(node, left) &&
+		/* 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(node, left) ||
 				!value_last_used_here(node, right)) {
 			return;
 		}