X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=e3ddcf61fc431a42fa5beecec827159085f4e8be;hb=4c875e72735d6f438c64a9e0d8de71a5ceb838c8;hp=c323d382a5e05fbc64aa0f206d8f1c8721480723;hpb=75e3b5fe17402ca27fc671dd404ff958664506b1;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index c323d382a..e3ddcf61f 100644
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.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.
  *
@@ -26,9 +26,7 @@
  * This file implements the creation of the achitecture specific firm opcodes
  * and the corresponding node constructors for the ia32 assembler irg.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -96,13 +94,27 @@ static void dump_reg_req(FILE *F, ir_node *n, const arch_register_req_t **reqs,
 			}
 
 			if (reqs[i]->type & arch_register_req_type_should_be_same) {
-				ir_fprintf(F, " same as %+F", get_irn_n(n, reqs[i]->other_same[0]));
-				if (reqs[i]->other_same[1] != -1)
-					ir_fprintf(F, " or %+F", get_irn_n(n, reqs[i]->other_same[1]));
+				unsigned other = reqs[i]->other_same;
+				int i;
+
+				ir_fprintf(F, " same as");
+				for (i = 0; 1U << i <= other; ++i) {
+					if (other & (1U << i)) {
+						ir_fprintf(F, " %+F", get_irn_n(n, i));
+					}
+				}
 			}
 
-			if (reqs[i]->type & arch_register_req_type_should_be_different) {
-				ir_fprintf(F, " different from %+F", get_irn_n(n, reqs[i]->other_different));
+			if (reqs[i]->type & arch_register_req_type_must_be_different) {
+				unsigned other = reqs[i]->other_different;
+				int i;
+
+				ir_fprintf(F, " different from");
+				for (i = 0; 1U << i <= other; ++i) {
+					if (other & (1U << i)) {
+						ir_fprintf(F, " %+F", get_irn_n(n, i));
+					}
+				}
 			}
 
 			fprintf(F, "\n");
@@ -139,7 +151,7 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 
 				fputc(' ', F);
 				if(attr->symconst) {
-					if(attr->attr.data.am_sc_sign) {
+					if(attr->sc_sign) {
 						fputc('-', F);
 					}
 					fputs(get_entity_name(attr->symconst), F);
@@ -151,8 +163,7 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 					fprintf(F, "%ld", attr->offset);
 				}
 			}
-
-			{
+			else {
 				const ia32_attr_t *attr = get_ia32_attr_const(n);
 
 				if(attr->am_sc != NULL || attr->am_offs != 0)
@@ -177,10 +188,9 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			break;
 
 		case dump_node_mode_txt:
-			if (is_ia32_Ld(n) || is_ia32_St(n)) {
-				mode = get_ia32_ls_mode(n);
-				fprintf(F, "[%s]", mode ? get_mode_name(mode) : "?NOMODE?");
-			}
+			mode = get_ia32_ls_mode(n);
+			if (mode != NULL)
+				fprintf(F, "[%s]", get_mode_name(mode));
 			break;
 
 		case dump_node_nodeattr_txt:
@@ -244,23 +254,14 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			/* dump supported am */
 			fprintf(F, "AM support = ");
 			switch (get_ia32_am_support(n)) {
-				case ia32_am_None:
-					fprintf(F, "none");
-					break;
-				case ia32_am_Source:
-					fprintf(F, "source only (Load)");
-					break;
-				case ia32_am_Dest:
-					fprintf(F, "dest only (Load+Store)");
-					break;
-				case ia32_am_Full:
-					fprintf(F, "full");
-					break;
+				case ia32_am_none:   fputs("none\n",            F); break;
+				case ia32_am_unary:  fputs("source (unary)\n",  F); break;
+				case ia32_am_binary: fputs("source (binary)\n", F); break;
+
 				default:
-					fprintf(F, "unknown (%d)", get_ia32_am_support(n));
+					fprintf(F, "unknown (%d)\n", get_ia32_am_support(n));
 					break;
 			}
-			fprintf(F, "\n");
 
 			/* dump AM offset */
 			if(get_ia32_am_offs_int(n) != 0) {
@@ -278,29 +279,24 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			fprintf(F, "AM scale = %d\n", get_ia32_am_scale(n));
 
 			/* dump pn code */
-			if(is_ia32_SwitchJmp(n) || is_ia32_CopyB(n) || is_ia32_CopyB_i(n)) {
-				fprintf(F, "pn_code = %ld\n", get_ia32_pncode(n));
-			} else {
-				fprintf(F, "pn_code = %ld (%s)\n", get_ia32_pncode(n),
-				        get_pnc_string(get_ia32_pncode(n)));
+			if (is_ia32_SwitchJmp(n)) {
+				fprintf(F, "pn_code = %ld\n", get_ia32_condcode(n));
+			} else if (is_ia32_CMov(n) || is_ia32_Set(n) || is_ia32_Jcc(n)) {
+				ia32_attr_t *attr = get_ia32_attr(n);
+				long pnc = get_ia32_condcode(n);
+				fprintf(F, "pn_code = 0x%lX (%s)\n", pnc, get_pnc_string(pnc & pn_Cmp_True));
+				fprintf(F, "ins_permuted = %u \n", attr->data.ins_permuted);
+				fprintf(F, "cmp_unsigned = %u \n", attr->data.cmp_unsigned);
+			}
+			else if (is_ia32_CopyB(n) || is_ia32_CopyB_i(n)) {
+				fprintf(F, "size = %u\n", get_ia32_copyb_size(n));
 			}
 
-			/* dump n_res */
 			fprintf(F, "n_res = %d\n", get_ia32_n_res(n));
-
-			/* dump use_frame */
 			fprintf(F, "use_frame = %d\n", is_ia32_use_frame(n));
-
-			/* commutative */
 			fprintf(F, "commutative = %d\n", is_ia32_commutative(n));
-
-			/* got lea */
-			fprintf(F, "got loea = %d\n", is_ia32_got_lea(n));
-
-			/* need stackent */
 			fprintf(F, "need stackent = %d\n", is_ia32_need_stackent(n));
-
-			/* dump latency */
+			fprintf(F, "is reload = %d\n", is_ia32_is_reload(n));
 			fprintf(F, "latency = %d\n", get_ia32_latency(n));
 
 			/* dump flags */
@@ -322,6 +318,9 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 				if (flags & arch_irn_flags_modify_sp) {
 					fprintf(F, " modify_sp");
 				}
+				if (flags & arch_irn_flags_modify_flags) {
+					fprintf(F, " modify_flags");
+				}
 			}
 			fprintf(F, " (%d)\n", flags);
 
@@ -407,13 +406,63 @@ const ia32_asm_attr_t *get_ia32_asm_attr_const(const ir_node *node) {
 	return asm_attr;
 }
 
+ia32_immediate_attr_t *get_ia32_immediate_attr(ir_node *node) {
+	ia32_attr_t           *attr      = get_ia32_attr(node);
+	ia32_immediate_attr_t *imm_attr  = CAST_IA32_ATTR(ia32_immediate_attr_t, attr);
+
+	return imm_attr;
+}
+
 const ia32_immediate_attr_t *get_ia32_immediate_attr_const(const ir_node *node)
 {
-	const ia32_attr_t     *attr     = get_ia32_attr_const(node);
-	const ia32_immediate_attr_t *immediate_attr
-		= CONST_CAST_IA32_ATTR(ia32_immediate_attr_t, attr);
+	const ia32_attr_t           *attr     = get_ia32_attr_const(node);
+	const ia32_immediate_attr_t *imm_attr = CONST_CAST_IA32_ATTR(ia32_immediate_attr_t, attr);
 
-	return immediate_attr;
+	return imm_attr;
+}
+
+ia32_condcode_attr_t *get_ia32_condcode_attr(ir_node *node) {
+	ia32_attr_t          *attr    = get_ia32_attr(node);
+	ia32_condcode_attr_t *cc_attr = CAST_IA32_ATTR(ia32_condcode_attr_t, attr);
+
+	return cc_attr;
+}
+
+const ia32_condcode_attr_t *get_ia32_condcode_attr_const(const ir_node *node) {
+	const ia32_attr_t          *attr    = get_ia32_attr_const(node);
+	const ia32_condcode_attr_t *cc_attr = CONST_CAST_IA32_ATTR(ia32_condcode_attr_t, attr);
+
+	return cc_attr;
+}
+
+ia32_call_attr_t *get_ia32_call_attr(ir_node *node)
+{
+	ia32_attr_t      *attr      = get_ia32_attr(node);
+	ia32_call_attr_t *call_attr = CAST_IA32_ATTR(ia32_call_attr_t, attr);
+
+	return call_attr;
+}
+
+const ia32_call_attr_t *get_ia32_call_attr_const(const ir_node *node)
+{
+	const ia32_attr_t      *attr      = get_ia32_attr_const(node);
+	const ia32_call_attr_t *call_attr = CONST_CAST_IA32_ATTR(ia32_call_attr_t, attr);
+
+	return call_attr;
+}
+
+ia32_copyb_attr_t *get_ia32_copyb_attr(ir_node *node) {
+	ia32_attr_t       *attr       = get_ia32_attr(node);
+	ia32_copyb_attr_t *copyb_attr = CAST_IA32_ATTR(ia32_copyb_attr_t, attr);
+
+	return copyb_attr;
+}
+
+const ia32_copyb_attr_t *get_ia32_copyb_attr_const(const ir_node *node) {
+	const ia32_attr_t       *attr       = get_ia32_attr_const(node);
+	const ia32_copyb_attr_t *copyb_attr = CONST_CAST_IA32_ATTR(ia32_copyb_attr_t, attr);
+
+	return copyb_attr;
 }
 
 /**
@@ -432,15 +481,8 @@ void set_ia32_op_type(ir_node *node, ia32_op_type_t tp) {
 	attr->data.tp     = tp;
 }
 
-/**
- * Gets the supported address mode of an ia32 node
- */
-ia32_am_type_t get_ia32_am_support(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.am_support;
-}
-
-ia32_am_arity_t get_ia32_am_arity(const ir_node *node) {
+ia32_am_type_t get_ia32_am_support(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.am_arity;
 }
@@ -448,15 +490,10 @@ ia32_am_arity_t get_ia32_am_arity(const ir_node *node) {
 /**
  * Sets the supported address mode of an ia32 node
  */
-void set_ia32_am_support(ir_node *node, ia32_am_type_t am_tp,
-                         ia32_am_arity_t arity) {
-	ia32_attr_t *attr     = get_ia32_attr(node);
-	attr->data.am_support = am_tp;
-	attr->data.am_arity   = arity;
-
-	assert((am_tp == ia32_am_None && arity == ia32_am_arity_none) ||
-	       (am_tp != ia32_am_None &&
-	       ((arity == ia32_am_unary) || (arity == ia32_am_binary) || (arity == ia32_am_ternary))));
+void set_ia32_am_support(ir_node *node, ia32_am_type_t arity)
+{
+	ia32_attr_t *attr   = get_ia32_attr(node);
+	attr->data.am_arity = arity;
 }
 
 /**
@@ -532,7 +569,8 @@ int get_ia32_am_scale(const ir_node *node) {
  * Sets the index register scale for address mode.
  */
 void set_ia32_am_scale(ir_node *node, int scale) {
-	ia32_attr_t *attr   = get_ia32_attr(node);
+	ia32_attr_t *attr = get_ia32_attr(node);
+	assert(0 <= scale && scale < 4 && "AM scale out of range");
 	attr->data.am_scale = scale;
 }
 
@@ -597,30 +635,6 @@ int is_ia32_commutative(const ir_node *node) {
 	return attr->data.is_commutative;
 }
 
-/**
- * Sets node got_lea.
- */
-void set_ia32_got_lea(ir_node *node) {
-	ia32_attr_t *attr  = get_ia32_attr(node);
-	attr->data.got_lea = 1;
-}
-
-/**
- * Clears node got_lea.
- */
-void clear_ia32_got_lea(ir_node *node) {
-	ia32_attr_t *attr  = get_ia32_attr(node);
-	attr->data.got_lea = 0;
-}
-
-/**
- * Checks if node got lea.
- */
-int is_ia32_got_lea(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.got_lea;
-}
-
 void set_ia32_need_stackent(ir_node *node) {
 	ia32_attr_t *attr     = get_ia32_attr(node);
 	attr->data.need_stackent = 1;
@@ -636,6 +650,36 @@ int is_ia32_need_stackent(const ir_node *node) {
 	return attr->data.need_stackent;
 }
 
+void set_ia32_is_reload(ir_node *node) {
+	ia32_attr_t *attr = get_ia32_attr(node);
+	attr->data.is_reload = 1;
+}
+
+int is_ia32_is_reload(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->data.is_reload;
+}
+
+void set_ia32_is_spill(ir_node *node) {
+	ia32_attr_t *attr = get_ia32_attr(node);
+	attr->data.is_spill = 1;
+}
+
+int is_ia32_is_spill(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->data.is_spill;
+}
+
+void set_ia32_is_remat(ir_node *node) {
+	ia32_attr_t *attr = get_ia32_attr(node);
+	attr->data.is_remat = 1;
+}
+
+int is_ia32_is_remat(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->data.is_remat;
+}
+
 /**
  * Gets the mode of the stored/loaded value (only set for Store/Load)
  */
@@ -677,16 +721,9 @@ void set_ia32_frame_ent(ir_node *node, ir_entity *ent) {
  * Gets the instruction latency.
  */
 unsigned get_ia32_latency(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->latency;
-}
-
-/**
-* Sets the instruction latency.
-*/
-void set_ia32_latency(ir_node *node, unsigned latency) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->latency     = latency;
+	const ir_op *op               = get_irn_op(node);
+	const ia32_op_attr_t *op_attr = (ia32_op_attr_t*) get_op_attr(op);
+	return op_attr->latency;
 }
 
 /**
@@ -775,6 +812,11 @@ void set_ia32_flags(ir_node *node, arch_irn_flags_t flags) {
 	attr->data.flags  = flags;
 }
 
+void add_ia32_flags(ir_node *node, arch_irn_flags_t flags) {
+	ia32_attr_t *attr  = get_ia32_attr(node);
+	attr->data.flags  |= flags;
+}
+
 /**
  * Returns the result register slots of an ia32 node.
  */
@@ -792,21 +834,30 @@ int get_ia32_n_res(const ir_node *node) {
 }
 
 /**
- * Returns the projnum code.
+ * Returns the condition code of a node.
  */
-long get_ia32_pncode(const ir_node *node)
+long get_ia32_condcode(const ir_node *node)
 {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	const ia32_condcode_attr_t *attr = get_ia32_condcode_attr_const(node);
 	return attr->pn_code;
 }
 
 /**
- * Sets the projnum code
+ * Sets the condition code of a node
  */
-void set_ia32_pncode(ir_node *node, long code)
+void set_ia32_condcode(ir_node *node, long code)
 {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->pn_code     = code;
+	ia32_condcode_attr_t *attr = get_ia32_condcode_attr(node);
+	attr->pn_code = code;
+}
+
+/**
+ * Returns the condition code of a node.
+ */
+unsigned get_ia32_copyb_size(const ir_node *node)
+{
+	const ia32_copyb_attr_t *attr = get_ia32_copyb_attr_const(node);
+	return attr->size;
 }
 
 /**
@@ -840,7 +891,7 @@ const be_execution_unit_t ***get_ia32_exec_units(const ir_node *node) {
  */
 unsigned get_ia32_exc_label(const ir_node *node) {
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.except_label;
+	return attr->data.has_except_label;
 }
 
 /**
@@ -848,7 +899,27 @@ unsigned get_ia32_exc_label(const ir_node *node) {
  */
 void set_ia32_exc_label(ir_node *node, unsigned flag) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->data.except_label = flag;
+	attr->data.has_except_label = flag;
+}
+
+/**
+ * Return the exception label id.
+ */
+ir_label_t get_ia32_exc_label_id(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+
+	assert(attr->data.has_except_label);
+	return attr->exc_label;
+}
+
+/**
+ * Assign the exception label id.
+ */
+void set_ia32_exc_label_id(ir_node *node, ir_label_t id) {
+	ia32_attr_t *attr = get_ia32_attr(node);
+
+	assert(attr->data.has_except_label);
+	attr->exc_label = id;
 }
 
 #ifndef NDEBUG
@@ -882,24 +953,6 @@ void set_ia32_orig_node(ir_node *node, const char *name) {
  *     |_|
  ******************************************************************************************************/
 
-/**
- * Sets the AddrMode(S|D) attribute
- */
-void set_ia32_AddrMode(ir_node *node, char direction) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-
-	switch (direction) {
-		case 'D':
-			attr->data.tp = ia32_AddrModeD;
-			break;
-		case 'S':
-			attr->data.tp = ia32_AddrModeS;
-			break;
-		default:
-			assert(0 && "wrong AM type");
-	}
-}
-
 /**
  * Returns whether or not the node is an AddrModeS node.
  */
@@ -916,54 +969,6 @@ int is_ia32_AddrModeD(const ir_node *node) {
 	return (attr->data.tp == ia32_AddrModeD);
 }
 
-/**
- * Checks if node is a Load or xLoad/vfLoad.
- */
-int is_ia32_Ld(const ir_node *node) {
-	int op = get_ia32_irn_opcode(node);
-	return op == iro_ia32_Load ||
-	       op == iro_ia32_xLoad ||
-	       op == iro_ia32_vfld ||
-	       op == iro_ia32_fld;
-}
-
-/**
- * Checks if node is a Store or xStore/vfStore.
- */
-int is_ia32_St(const ir_node *node) {
-	int op = get_ia32_irn_opcode(node);
-	return op == iro_ia32_Store ||
-	       op == iro_ia32_Store8Bit ||
-	       op == iro_ia32_xStore ||
-	       op == iro_ia32_vfst ||
-	       op == iro_ia32_fst ||
-	       op == iro_ia32_fstp;
-}
-
-/**
- * Returns the name of the OUT register at position pos.
- */
-const char *get_ia32_out_reg_name(const ir_node *node, int pos) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-
-	assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position.");
-	assert(attr->slots[pos]  && "No register assigned");
-
-	return arch_register_get_name(attr->slots[pos]);
-}
-
-/**
- * Returns the index of the OUT register at position pos within its register class.
- */
-int get_ia32_out_regnr(const ir_node *node, int pos) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-
-	assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position.");
-	assert(attr->slots[pos]  && "No register assigned");
-
-	return arch_register_get_index(attr->slots[pos]);
-}
-
 void ia32_swap_left_right(ir_node *node)
 {
 	ia32_attr_t *attr  = get_ia32_attr(node);
@@ -995,7 +1000,7 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
                           const arch_register_req_t **in_reqs,
                           const arch_register_req_t **out_reqs,
                           const be_execution_unit_t ***execution_units,
-                          int n_res, unsigned latency)
+                          int n_res)
 {
 	ir_graph        *irg  = get_irn_irg(node);
 	struct obstack  *obst = get_irg_obstack(irg);
@@ -1004,7 +1009,6 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
 	set_ia32_flags(node, flags);
 	set_ia32_in_req_all(node, in_reqs);
 	set_ia32_out_req_all(node, out_reqs);
-	set_ia32_latency(node, latency);
 
 	attr->exec_units  = execution_units;
 #ifndef NDEBUG
@@ -1049,24 +1053,42 @@ init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
 	ia32_immediate_attr_t *attr = get_irn_generic_attr(res);
 
 #ifndef NDEBUG
-	attr->attr.attr_type   |= IA32_ATTR_ia32_immediate_attr_t;
+	attr->attr.attr_type  |= IA32_ATTR_ia32_immediate_attr_t;
 #endif
-	attr->symconst             = symconst;
-	attr->attr.data.am_sc_sign = symconst_sign;
-	attr->offset               = offset;
+	attr->symconst = symconst;
+	attr->sc_sign  = symconst_sign;
+	attr->offset   = offset;
 }
 
-ir_node *get_ia32_result_proj(const ir_node *node)
+void init_ia32_call_attributes(ir_node *const res, unsigned const pop, ir_type *const call_tp)
 {
-	const ir_edge_t *edge;
+	ia32_call_attr_t *attr = get_irn_generic_attr(res);
 
-	foreach_out_edge(node, edge) {
-		ir_node *proj = get_edge_src_irn(edge);
-		if(get_Proj_proj(proj) == 0) {
-			return proj;
-		}
-	}
-	return NULL;
+#ifndef NDEBUG
+	attr->attr.attr_type  |= IA32_ATTR_ia32_call_attr_t;
+#endif
+	attr->pop     = pop;
+	attr->call_tp = call_tp;
+}
+
+void
+init_ia32_copyb_attributes(ir_node *res, unsigned size) {
+	ia32_copyb_attr_t *attr = get_irn_generic_attr(res);
+
+#ifndef NDEBUG
+	attr->attr.attr_type  |= IA32_ATTR_ia32_copyb_attr_t;
+#endif
+	attr->size = size;
+}
+
+void
+init_ia32_condcode_attributes(ir_node *res, long pnc) {
+	ia32_condcode_attr_t *attr = get_irn_generic_attr(res);
+
+#ifndef NDEBUG
+	attr->attr.attr_type  |= IA32_ATTR_ia32_condcode_attr_t;
+#endif
+	attr->pn_code = pnc;
 }
 
 /***************************************************************************************
@@ -1102,13 +1124,10 @@ int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) {
 	    || a->frame_ent != b->frame_ent)
 		return 1;
 
-	if(a->pn_code != b->pn_code)
-		return 1;
-
 	if (a->data.tp != b->data.tp)
 		return 1;
 
-	if (a->data.except_label != b->data.except_label)
+	if (a->data.has_except_label != b->data.has_except_label)
 		return 1;
 
 	if (a->data.ins_permuted != b->data.ins_permuted
@@ -1118,6 +1137,7 @@ int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) {
 	return 0;
 }
 
+/** Compare nodes attributes for all "normal" nodes. */
 static
 int ia32_compare_nodes_attr(ir_node *a, ir_node *b)
 {
@@ -1127,12 +1147,66 @@ int ia32_compare_nodes_attr(ir_node *a, ir_node *b)
 	return ia32_compare_attr(attr_a, attr_b);
 }
 
+/** Compare node attributes for nodes with condition code. */
 static
-int ia32_compare_x87_attr(ir_node *a, ir_node *b)
+int ia32_compare_condcode_attr(ir_node *a, ir_node *b)
 {
-	return ia32_compare_nodes_attr(a, b);
+	const ia32_condcode_attr_t *attr_a;
+	const ia32_condcode_attr_t *attr_b;
+
+	if (ia32_compare_nodes_attr(a, b))
+		return 1;
+
+	attr_a = get_ia32_condcode_attr_const(a);
+	attr_b = get_ia32_condcode_attr_const(b);
+
+	if(attr_a->pn_code != attr_b->pn_code)
+		return 1;
+
+	return 0;
+}
+
+static int ia32_compare_call_attr(ir_node *a, ir_node *b)
+{
+	const ia32_call_attr_t *attr_a;
+	const ia32_call_attr_t *attr_b;
+
+	if (ia32_compare_nodes_attr(a, b))
+		return 1;
+
+	attr_a = get_ia32_call_attr_const(a);
+	attr_b = get_ia32_call_attr_const(b);
+
+	if (attr_a->pop != attr_b->pop)
+		return 1;
+
+	if (attr_a->call_tp != attr_b->call_tp)
+		return 1;
+
+	return 0;
 }
 
+/** Compare node attributes for CopyB nodes. */
+static
+int ia32_compare_copyb_attr(ir_node *a, ir_node *b)
+{
+	const ia32_copyb_attr_t *attr_a;
+	const ia32_copyb_attr_t *attr_b;
+
+	if (ia32_compare_nodes_attr(a, b))
+		return 1;
+
+	attr_a = get_ia32_copyb_attr_const(a);
+	attr_b = get_ia32_copyb_attr_const(b);
+
+	if(attr_a->size != attr_b->size)
+		return 1;
+
+	return 0;
+}
+
+
+/** Compare ASM node attributes. */
 static
 int ia32_compare_asm_attr(ir_node *a, ir_node *b)
 {
@@ -1151,6 +1225,16 @@ int ia32_compare_asm_attr(ir_node *a, ir_node *b)
 	return 0;
 }
 
+/**
+ * Hash function for Immediates
+ */
+static unsigned ia32_hash_Immediate(const ir_node *irn) {
+	const ia32_immediate_attr_t *a = get_ia32_immediate_attr_const(irn);
+
+	return HASH_PTR(a->symconst) + (a->sc_sign << 16) + a->offset;
+}
+
+/** Compare node attributes for Immediates. */
 static
 int ia32_compare_immediate_attr(ir_node *a, ir_node *b)
 {
@@ -1158,13 +1242,21 @@ int ia32_compare_immediate_attr(ir_node *a, ir_node *b)
 	const ia32_immediate_attr_t *attr_b = get_ia32_immediate_attr_const(b);
 
 	if(attr_a->symconst != attr_b->symconst	||
-	   attr_a->attr.data.am_sc_sign != attr_b->attr.data.am_sc_sign ||
+	   attr_a->sc_sign != attr_b->sc_sign ||
 	   attr_a->offset != attr_b->offset)
 		return 1;
 
 	return 0;
 }
 
+/** Compare node attributes for x87 nodes. */
+static
+int ia32_compare_x87_attr(ir_node *a, ir_node *b)
+{
+	return ia32_compare_nodes_attr(a, b);
+}
+
+
 /* copies the ia32 attributes */
 static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node)
 {