X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=3c7db40716499cdec92c30c2b1853a9cbde5d464;hb=6981dd3274e6753e50f66c8cbe17b37bd41708e5;hp=e1e95e4c16c7c275e57b60d646ce9a99b4d7e6a7;hpb=110ec5d1a49775f26757ae3c28608e3d893235a9;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index e1e95e4c1..3c7db4071 100644
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -29,6 +29,8 @@
 #include "firm_common_t.h"
 #include "irvrfy_t.h"
 #include "irprintf.h"
+#include "iredges.h"
+#include "error.h"
 
 #include "../bearch.h"
 
@@ -37,31 +39,36 @@
 #include "gen_ia32_regalloc_if.h"
 #include "gen_ia32_machine.h"
 
+/**
+ * Returns the ident of an entity
+ * @param ent The entity
+ * @return The ident of the entity
+ */
+ident *ia32_get_ent_ident(ir_entity *ent) {
+	ir_type *owner = get_entity_owner(ent);
+	ident   *id    = get_entity_ld_ident(ent);
+
+	if (owner == get_tls_type()) {
+		if (get_entity_visibility(ent) == visibility_external_allocated)
+			id = mangle(id, new_id_from_chars("@INDNTPOFF", 10));
+		else
+			id = mangle(id, new_id_from_chars("@NTPOFF", 7));
+	}
+	return id;
+}
+
 /**
  * Returns the ident of a SymConst.
  * @param symc  The SymConst
  * @return The ident of the SymConst
  */
 static ident *get_sc_ident(ir_node *symc) {
-	ir_entity *ent;
-	ir_type   *owner;
-	ident     *id;
-
 	switch (get_SymConst_kind(symc)) {
 		case symconst_addr_name:
 			return get_SymConst_name(symc);
 
 		case symconst_addr_ent:
-			ent   = get_SymConst_entity(symc);
-			owner = get_entity_owner(ent);
-			id    = get_entity_ld_ident(ent);
-			if (owner == get_tls_type()) {
-				if (get_entity_visibility(ent) == visibility_external_allocated)
-					id = mangle(id, new_id_from_chars("@INDNTPOFF", 10));
-				else
-					id = mangle(id, new_id_from_chars("@NTPOFF", 7));
-			}
-			return id;
+			return ia32_get_ent_ident(get_SymConst_entity(symc));
 
 		default:
 			assert(0 && "Unsupported SymConst");
@@ -194,11 +201,17 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			break;
 
 		case dump_node_nodeattr_txt:
-			if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n) || is_ia32_Cnst(n)) {
-				char       *pref = is_ia32_ImmSymConst(n) || (get_ia32_op_type(n) == ia32_SymConst) ? "SymC " : "";
-				const char *cnst = get_ia32_cnst(n);
-
-				fprintf(F, "[%s%s]", pref, cnst ? cnst : "NONE");
+			if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n)) {
+				if(is_ia32_ImmSymConst(n)) {
+					ident *id = get_ia32_Immop_symconst(n);
+					fprintf(F, "[SymC %s]", get_id_str(id));
+				} else {
+					char buf[128];
+					tarval *tv = get_ia32_Immop_tarval(n);
+
+					tarval_snprintf(buf, sizeof(buf), tv);
+					fprintf(F, "[%s]", buf);
+				}
 			}
 
 			if (! is_ia32_Lea(n)) {
@@ -251,12 +264,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 				case ia32_Normal:
 					fprintf(F, "Normal");
 					break;
-				case ia32_Const:
-					fprintf(F, "Const");
-					break;
-				case ia32_SymConst:
-					fprintf(F, "SymConst");
-					break;
 				case ia32_AddrModeD:
 					fprintf(F, "AM Dest (Load+Store)");
 					break;
@@ -331,20 +338,26 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			fprintf(F, " (%d)\n", am_flav);
 
 			/* dump AM offset */
-			fprintf(F, "AM offset = ");
-			if (get_ia32_am_offs(n)) {
-				fprintf(F, "%s", get_ia32_am_offs(n));
+			if(get_ia32_am_offs_int(n) != 0) {
+				fprintf(F, "AM offset = %d\n", get_ia32_am_offs_int(n));
 			}
-			else {
-				fprintf(F, "n/a");
+
+			/* dump AM symconst */
+			if(get_ia32_am_sc(n) != NULL) {
+				fprintf(F, "AM symconst = %s\n", get_id_str(get_ia32_am_sc(n)));
 			}
-			fprintf(F, "\n");
 
 			/* dump AM scale */
 			fprintf(F, "AM scale = %d\n", get_ia32_am_scale(n));
 
 			/* dump pn code */
-			fprintf(F, "pn_code = %ld\n", get_ia32_pncode(n));
+			if(get_ia32_pncode(n) & ia32_pn_Cmp_Unsigned) {
+				fprintf(F, "pn_code = %d (%s, unsigned)\n", get_ia32_pncode(n),
+				        get_pnc_string(get_ia32_pncode(n) & ~ia32_pn_Cmp_Unsigned));
+			} else {
+				fprintf(F, "pn_code = %d (%s)\n", get_ia32_pncode(n),
+				        get_pnc_string(get_ia32_pncode(n)));
+			}
 
 			/* dump n_res */
 			fprintf(F, "n_res = %d\n", get_ia32_n_res(n));
@@ -361,8 +374,8 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			/* got lea */
 			fprintf(F, "got loea = %d\n", is_ia32_got_lea(n));
 
-			/* got reload */
-			fprintf(F, "got reload = %d\n", is_ia32_got_reload(n));
+			/* need stackent */
+			fprintf(F, "need stackent = %d\n", is_ia32_need_stackent(n));
 
 			/* dump latency */
 			fprintf(F, "latency = %d\n", get_ia32_latency(n));
@@ -409,33 +422,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			}
 			fprintf(F, "\n");
 
-			fprintf(F, "res_mode = ");
-			if (get_ia32_res_mode(n)) {
-				ir_fprintf(F, "%+F", get_ia32_res_mode(n));
-			}
-			else {
-				fprintf(F, "n/a");
-			}
-			fprintf(F, "\n");
-
-			fprintf(F, "src_mode = ");
-			if (get_ia32_src_mode(n)) {
-				ir_fprintf(F, "%+F", get_ia32_src_mode(n));
-			}
-			else {
-				fprintf(F, "n/a");
-			}
-			fprintf(F, "\n");
-
-			fprintf(F, "tgt_mode = ");
-			if (get_ia32_tgt_mode(n)) {
-				ir_fprintf(F, "%+F", get_ia32_tgt_mode(n));
-			}
-			else {
-				fprintf(F, "n/a");
-			}
-			fprintf(F, "\n");
-
 #ifndef NDEBUG
 			/* dump original ir node name */
 			fprintf(F, "orig node = ");
@@ -469,16 +455,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
  *                                       |___/
  ***************************************************************************************************/
 
-/**
- * Returns an ident for the given tarval tv.
- */
-static ident *get_ident_for_tv(tarval *tv) {
-	char buf[1024];
-	int len = tarval_snprintf(buf, sizeof(buf), tv);
-	assert(len);
-	return new_id_from_str(buf);
-}
-
 /**
  * Wraps get_irn_generic_attr() as it takes no const ir_node, so we need to do a cast.
  * Firm was made by people hating const :-(
@@ -512,14 +488,6 @@ ia32_immop_type_t get_ia32_immop_type(const ir_node *node) {
 	return attr->data.imm_tp;
 }
 
-/**
- * Sets the immediate op type of an ia32 node.
- */
-void set_ia32_immop_type(ir_node *node, ia32_immop_type_t tp) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->data.imm_tp = tp;
-}
-
 /**
  * Gets the supported addrmode of an ia32 node
  */
@@ -553,19 +521,7 @@ void set_ia32_am_flavour(ir_node *node, ia32_am_flavour_t am_flavour) {
 }
 
 /**
- * Joins all offsets to one string with adds.
- */
-char *get_ia32_am_offs(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	static char res[64];
-
-	snprintf(res, sizeof(res), "%+d", attr->am_offs);
-
-	return res;
-}
-
-/**
- * Gets the addressmode offset as long.
+ * Gets the addressmode offset as int.
  */
 int get_ia32_am_offs_int(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
@@ -573,34 +529,11 @@ int get_ia32_am_offs_int(const ir_node *node) {
 }
 
 /**
- * Add an offset for addrmode.
+ * Sets the addressmode offset from an int.
  */
-static void extend_ia32_am_offs(ir_node *node, char *offset, char op) {
+void set_ia32_am_offs_int(ir_node *node, int offset) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	int res, o;
-
-	if (offset == NULL || offset[0] == '\0')
-		return;
-
-	if (offset[0] == '-')
-		res = sscanf(offset, "%d", &o);
-	else
-		res = sscanf(offset, "%u", &o);
-	assert(res == 1);
-
-	if (op == '-')
-		attr->am_offs -= o;
-	else if (op == '+')
-		attr->am_offs += o;
-	else
-		assert(0);
-}
-
-/**
- * Add an offset for addrmode.
- */
-void add_ia32_am_offs(ir_node *node, const char *offset) {
-	extend_ia32_am_offs(node, (char *)offset, '+');
+	attr->am_offs = offset;
 }
 
 void add_ia32_am_offs_int(ir_node *node, int offset) {
@@ -608,13 +541,6 @@ void add_ia32_am_offs_int(ir_node *node, int offset) {
 	attr->am_offs += offset;
 }
 
-/**
- * Sub an offset for addrmode.
- */
-void sub_ia32_am_offs(ir_node *node, const char *offset) {
-	extend_ia32_am_offs(node, (char *)offset, '-');
-}
-
 /**
  * Returns the symconst ident associated to addrmode.
  */
@@ -676,6 +602,7 @@ void set_ia32_am_scale(ir_node *node, int scale) {
  */
 tarval *get_ia32_Immop_tarval(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
+	assert(attr->data.imm_tp == ia32_ImmConst);
     return attr->cnst_val.tv;
 }
 
@@ -684,42 +611,20 @@ tarval *get_ia32_Immop_tarval(const ir_node *node) {
  */
 void set_ia32_Immop_tarval(ir_node *node, tarval *tv) {
 	ia32_attr_t *attr = get_ia32_attr(node);
+	attr->data.imm_tp = ia32_ImmConst;
 	attr->cnst_val.tv = tv;
-	attr->cnst        = get_ident_for_tv(tv);
-}
-
-/**
- * Gets the string representation of the internal const (tv or symconst)
- */
-const char *get_ia32_cnst(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	if (! attr->cnst)
-		return NULL;
-	return get_id_str(attr->cnst);
-}
-
-/**
- * Sets the string representation of the internal const.
- */
-void set_ia32_cnst(ir_node *node, const char *cnst) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->cnst        = new_id_from_str(cnst);
 }
 
-/**
- * Gets the ident representation of the internal const (tv or symconst)
- */
-ident *get_ia32_id_cnst(const ir_node *node) {
+void set_ia32_Immop_symconst(ir_node *node, ident *ident) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->cnst;
+	attr->data.imm_tp = ia32_ImmSymConst;
+	attr->cnst_val.sc = ident;
 }
 
-/**
- * Sets the ident representation of the internal const.
- */
-void set_ia32_id_cnst(ir_node *node, ident *cnst) {
+ident *get_ia32_Immop_symconst(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->cnst        = cnst;
+	assert(attr->data.imm_tp == ia32_ImmSymConst);
+	return attr->cnst_val.sc;
 }
 
 /**
@@ -818,28 +723,19 @@ int is_ia32_got_lea(const ir_node *node) {
 	return attr->data.got_lea;
 }
 
-/**
- * Sets node got_reload.
- */
-void set_ia32_got_reload(ir_node *node) {
+void set_ia32_need_stackent(ir_node *node) {
 	ia32_attr_t *attr     = get_ia32_attr(node);
-	attr->data.got_reload = 1;
+	attr->data.need_stackent = 1;
 }
 
-/**
- * Clears node got_reload.
- */
-void clear_ia32_got_reload(ir_node *node) {
+void clear_ia32_need_stackent(ir_node *node) {
 	ia32_attr_t *attr     = get_ia32_attr(node);
-	attr->data.got_reload = 0;
+	attr->data.need_stackent = 0;
 }
 
-/**
- * Checks if node got reload.
- */
-int is_ia32_got_reload(const ir_node *node) {
+int is_ia32_need_stackent(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.got_reload;
+	return attr->data.need_stackent;
 }
 
 /**
@@ -858,54 +754,6 @@ void set_ia32_ls_mode(ir_node *node, ir_mode *mode) {
 	attr->ls_mode     = mode;
 }
 
-/**
- * Gets the mode of the result.
- */
-ir_mode *get_ia32_res_mode(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->res_mode;
-}
-
-/**
- * Sets the mode of the result.
- */
-void set_ia32_res_mode(ir_node *node, ir_mode *mode) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->res_mode    = mode;
-}
-
-/**
- * Gets the source mode of conversion.
- */
-ir_mode *get_ia32_src_mode(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->src_mode;
-}
-
-/**
- * Sets the source mode of conversion.
- */
-void set_ia32_src_mode(ir_node *node, ir_mode *mode) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->src_mode    = mode;
-}
-
-/**
- * Gets the target mode of conversion.
- */
-ir_mode *get_ia32_tgt_mode(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->tgt_mode;
-}
-
-/**
- * Sets the target mode of conversion.
- */
-void set_ia32_tgt_mode(ir_node *node, ir_mode *mode) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->tgt_mode    = mode;
-}
-
 /**
  * Gets the frame entity assigned to this node.
  */
@@ -920,7 +768,10 @@ ir_entity *get_ia32_frame_ent(const ir_node *node) {
 void set_ia32_frame_ent(ir_node *node, ir_entity *ent) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->frame_ent   = ent;
-	set_ia32_use_frame(node);
+	if(ent != NULL)
+		set_ia32_use_frame(node);
+	else
+		clear_ia32_use_frame(node);
 }
 
 
@@ -1063,7 +914,7 @@ void set_ia32_flavour(ir_node *node, ia32_op_flavour_t op_flav) {
 /**
  * Returns the projnum code.
  */
-long get_ia32_pncode(const ir_node *node) {
+pn_Cmp get_ia32_pncode(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	return attr->pn_code;
 }
@@ -1071,7 +922,7 @@ long get_ia32_pncode(const ir_node *node) {
 /**
  * Sets the projnum code
  */
-void set_ia32_pncode(ir_node *node, long code) {
+void set_ia32_pncode(ir_node *node, pn_Cmp code) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->pn_code     = code;
 }
@@ -1132,72 +983,20 @@ void set_ia32_orig_node(ir_node *node, const char *name) {
  *     |_|
  ******************************************************************************************************/
 
-/**
- * Gets the type of an ia32_Const.
- */
-unsigned get_ia32_Const_type(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-
-	assert(is_ia32_Cnst(node) && "Need ia32_Const to get type");
-
-	return attr->data.tp;
-}
-
-/**
- * Sets the type of an ia32_Const.
- */
-void set_ia32_Const_type(ir_node *node, int type) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-
-	assert(is_ia32_Cnst(node) && "Need ia32_Const to set type");
-	assert((type == ia32_Const || type == ia32_SymConst) && "Unsupported ia32_Const type");
-
-	attr->data.tp = type;
-}
-
 /**
  * Copy the attributes from an ia32_Const to an Immop (Add_i, Sub_i, ...) node
  */
-void set_ia32_Immop_attr(ir_node *node, ir_node *cnst) {
-	ia32_attr_t *na = get_ia32_attr(node);
-	ia32_attr_t *ca = get_ia32_attr(cnst);
-
-	switch(get_ia32_Const_type(cnst)) {
-		case ia32_Const:
-			na->cnst_val.tv = ca->cnst_val.tv;
-			na->cnst        = ca->cnst;
-			set_ia32_immop_type(node, ia32_ImmConst);
-			break;
-		case ia32_SymConst:
-			na->cnst_val.sc = ca->cnst_val.sc;
-			na->cnst        = na->cnst_val.sc;
-			set_ia32_immop_type(node, ia32_ImmSymConst);
-			break;
-		default:
-			assert(0 && "Need ia32_Const to set Immop attr");
-	}
-}
-
-/**
- * Copy the attributes from Immop to an Immop
- */
-void copy_ia32_Immop_attr(ir_node *dst, ir_node *src) {
-	ia32_attr_t *da = get_ia32_attr(dst);
-	ia32_attr_t *sa = get_ia32_attr(src);
-
-	switch(get_ia32_immop_type(src)) {
-		case ia32_ImmConst:
-			da->cnst_val.tv = sa->cnst_val.tv;
-			da->cnst        = sa->cnst;
-			set_ia32_immop_type(dst, ia32_ImmConst);
-			break;
-		case ia32_ImmSymConst:
-			da->cnst_val.sc = sa->cnst_val.sc;
-			da->cnst        = sa->cnst;
-			set_ia32_immop_type(dst, ia32_ImmSymConst);
-			break;
-		default:
-			assert(0 && "Need Immop to copy Immop attr");
+void copy_ia32_Immop_attr(ir_node *node, ir_node *from) {
+	ia32_immop_type_t immop_type = get_ia32_immop_type(from);
+
+	if(immop_type == ia32_ImmConst) {
+		set_ia32_Immop_tarval(node, get_ia32_Immop_tarval(from));
+	} else if(immop_type == ia32_ImmSymConst) {
+		set_ia32_Immop_symconst(node, get_ia32_Immop_symconst(from));
+	} else {
+		ia32_attr_t *attr = get_ia32_attr(node);
+		assert(immop_type == ia32_ImmNone);
+		attr->data.imm_tp = ia32_ImmNone;
 	}
 }
 
@@ -1205,26 +1004,14 @@ void copy_ia32_Immop_attr(ir_node *dst, ir_node *src) {
  * Copy the attributes from a Firm Const/SymConst to an ia32_Const
  */
 void set_ia32_Const_attr(ir_node *ia32_cnst, ir_node *cnst) {
-	ia32_attr_t *attr = get_ia32_attr(ia32_cnst);
-	ir_mode *mode;
-
 	assert(is_ia32_Cnst(ia32_cnst) && "Need ia32_Const to set Const attr");
 
 	switch (get_irn_opcode(cnst)) {
 		case iro_Const:
-			attr->data.tp     = ia32_Const;
-			attr->cnst_val.tv = get_Const_tarval(cnst);
-			mode = get_tarval_mode(attr->cnst_val.tv);
-			if (mode_is_reference(mode) &&
-			    get_mode_null(mode) == attr->cnst_val.tv) {
-				attr->cnst_val.tv = get_mode_null(mode_Iu);
-			}
-			attr->cnst        = get_ident_for_tv(attr->cnst_val.tv);
+			set_ia32_Const_tarval(ia32_cnst, get_Const_tarval(cnst));
 			break;
 		case iro_SymConst:
-			attr->data.tp     = ia32_SymConst;
-			attr->cnst_val.sc = get_sc_ident(cnst);
-			attr->cnst        = attr->cnst_val.sc;
+			set_ia32_Immop_symconst(ia32_cnst, get_sc_ident(cnst));
 			break;
 		case iro_Unknown:
 			assert(0 && "Unknown Const NYI");
@@ -1234,6 +1021,23 @@ void set_ia32_Const_attr(ir_node *ia32_cnst, ir_node *cnst) {
 	}
 }
 
+void set_ia32_Const_tarval(ir_node *ia32_cnst, tarval *tv) {
+	if(mode_is_reference(get_tarval_mode(tv))) {
+		if(tarval_is_null(tv)) {
+			tv = get_tarval_null(mode_Iu);
+		} else {
+			panic("Can't convert reference tarval to mode_Iu at %+F", ia32_cnst);
+		}
+	} else {
+		tv = tarval_convert_to(tv, mode_Iu);
+	}
+
+	assert(tv != get_tarval_bad() && tv != get_tarval_undefined()
+			&& tv != NULL);
+	set_ia32_Immop_tarval(ia32_cnst, tv);
+}
+
+
 /**
  * Sets the AddrMode(S|D) attribute
  */
@@ -1367,6 +1171,19 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, const ia32_regi
 	memset((void *)attr->slots, 0, n_res * sizeof(attr->slots[0]));
 }
 
+ir_node *get_ia32_result_proj(const ir_node *node)
+{
+	const ir_edge_t *edge;
+
+	foreach_out_edge(node, edge) {
+		ir_node *proj = get_edge_src_irn(edge);
+		if(get_Proj_proj(proj) == 0) {
+			return proj;
+		}
+	}
+	return NULL;
+}
+
 /***************************************************************************************
  *                  _                            _                   _
  *                 | |                          | |                 | |
@@ -1377,28 +1194,42 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, const ia32_regi
  *
  ***************************************************************************************/
 
-/* default compare operation to compare immediate ops */
-int ia32_compare_immop_attr(ia32_attr_t *a, ia32_attr_t *b) {
-	int equ = 0;
+/* default compare operation to compare attributes */
+int ia32_compare_attr(ia32_attr_t *a, ia32_attr_t *b) {
+	if (a->data.tp != b->data.tp
+			|| a->data.imm_tp != b->data.imm_tp)
+		return 1;
 
-	if (a->data.tp == b->data.tp) {
-		equ = (a->cnst == b->cnst);
-		equ = equ ? (a->data.use_frame == b->data.use_frame) : 0;
+	if (a->data.imm_tp == ia32_ImmConst
+			&& a->cnst_val.tv != b->cnst_val.tv)
+		return 1;
 
-		if (equ && a->data.use_frame && b->data.use_frame)
-			equ = (a->frame_ent == b->frame_ent);
-	}
+	if (a->data.imm_tp == ia32_ImmSymConst
+			&& a->cnst_val.sc != b->cnst_val.sc)
+		return 1;
 
-	return !equ;
-}
+	if (a->data.am_flavour != b->data.am_flavour
+	        || a->data.am_scale != b->data.am_scale
+	        || a->data.offs_sign != b->data.offs_sign
+	        || a->data.am_sc_sign != b->data.am_sc_sign
+	        || a->am_offs != b->am_offs
+	        || a->am_sc != b->am_sc
+			|| a->ls_mode != b->ls_mode)
+		return 1;
+
+	if (a->data.use_frame != b->data.use_frame
+	        || a->data.use_frame != b->data.use_frame
+	        || a->frame_ent != b->frame_ent)
+		return 1;
 
-/* compare converts */
-int ia32_compare_conv_attr(ia32_attr_t *a, ia32_attr_t *b) {
-	int equ = ! ia32_compare_immop_attr(a, b);
+	if(a->pn_code != b->pn_code)
+		return 1;
 
-	equ = equ ? (a->src_mode == b->src_mode) && (a->tgt_mode == b->tgt_mode) : equ;
+	if (a->data.tp != b->data.tp
+	        || a->data.op_flav != b->data.op_flav)
+		return 1;
 
-	return !equ;
+	return 0;
 }
 
 /* copies the ia32 attributes */
@@ -1410,7 +1241,8 @@ static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node) {
 	memcpy(attr_new, attr_old, get_op_attr_size(get_irn_op(old_node)));
 
 	/* copy out flags */
-	DUP_ARR_D(int, get_irg_obstack(get_irn_irg(new_node)), attr_old->out_flags);
+	attr_new->out_flags =
+		DUP_ARR_D(int, get_irg_obstack(get_irn_irg(new_node)), attr_old->out_flags);
 }
 
 /**