X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=f58c3a95d45627a7ddd9547e389d85c5e72bb416;hb=0fbcef83aa6060534172bb13e71cdadb04428806;hp=169fea6b74ea01543d7fdac5b9947761fc040f23;hpb=7f81d2a2c9293cf34e4db08fc402a5c33ef919eb;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index 169fea6b7..f58c3a95d 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.
  *
@@ -24,11 +24,9 @@
  * @version     $Id$
  *
  * This file implements the creation of the achitecture specific firm opcodes
- * and the coresponding node constructors for the ia32 assembler irg.
+ * and the corresponding node constructors for the ia32 assembler irg.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -55,14 +53,6 @@
 #include "gen_ia32_regalloc_if.h"
 #include "gen_ia32_machine.h"
 
-/**
- * returns true if a node has x87 registers
- */
-int ia32_has_x87_register(const ir_node *n) {
-	assert(is_ia32_irn(n) && "Need ia32 node.");
-	return is_irn_machine_user(n, 0);
-}
-
 /***********************************************************************************
  *      _                                   _       _             __
  *     | |                                 (_)     | |           / _|
@@ -104,11 +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));
+				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");
@@ -131,46 +137,68 @@ static void dump_reg_req(FILE *F, ir_node *n, const arch_register_req_t **reqs,
 static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 	ir_mode     *mode = NULL;
 	int          bad  = 0;
-	int          i, n_res, am_flav, flags;
-	const ia32_attr_t *attr = get_ia32_attr_const(n);
+	int          i, n_res, flags;
 	const arch_register_req_t **reqs;
 	const arch_register_t     **slots;
 
 	switch (reason) {
 		case dump_node_opcode_txt:
 			fprintf(F, "%s", get_irn_opname(n));
+
+			if(is_ia32_Immediate(n) || is_ia32_Const(n)) {
+				const ia32_immediate_attr_t *attr
+					= get_ia32_immediate_attr_const(n);
+
+				fputc(' ', F);
+				if(attr->symconst) {
+					if(attr->sc_sign) {
+						fputc('-', F);
+					}
+					fputs(get_entity_name(attr->symconst), F);
+				}
+				if(attr->offset != 0 || attr->symconst == NULL) {
+					if(attr->offset > 0 && attr->symconst != NULL) {
+						fputc('+', F);
+					}
+					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)
+					fputs(" [", F);
+
+				if(attr->am_sc != NULL) {
+					if(attr->data.am_sc_sign) {
+						fputc('-', F);
+					}
+					fputs(get_entity_name(attr->am_sc), F);
+				}
+				if(attr->am_offs != 0) {
+					if(attr->am_offs > 0 && attr->am_sc != NULL) {
+						fputc('+', F);
+					}
+					fprintf(F, "%d", attr->am_offs);
+				}
+
+				if(attr->am_sc != NULL || attr->am_offs != 0)
+					fputc(']', F);
+			}
 			break;
 
 		case dump_node_mode_txt:
-			mode = get_irn_mode(n);
-
 			if (is_ia32_Ld(n) || is_ia32_St(n)) {
 				mode = get_ia32_ls_mode(n);
+				fprintf(F, "[%s]", mode ? get_mode_name(mode) : "?NOMODE?");
 			}
-
-			fprintf(F, "[%s]", mode ? get_mode_name(mode) : "?NOMODE?");
 			break;
 
 		case dump_node_nodeattr_txt:
-			if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n)) {
-				if(is_ia32_ImmSymConst(n)) {
-					ir_entity *ent = get_ia32_Immop_symconst(n);
-					ident *id = get_entity_ld_ident(ent);
-					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)) {
 				if (is_ia32_AddrModeS(n)) {
 					fprintf(F, "[AM S] ");
-				}
-				else if (is_ia32_AddrModeD(n)) {
+				} else if (is_ia32_AddrModeD(n)) {
 					fprintf(F, "[AM D] ");
 				}
 			}
@@ -199,11 +227,7 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 				for (i = 0; i < n_res; i++) {
 					const arch_register_t *reg;
 
-					/* retrieve "real" x87 register */
-					if (ia32_has_x87_register(n))
-						reg = get_ia32_attr(n)->x87[i + 2];
-					else
-						reg = slots[i];
+					reg = slots[i];
 
 					fprintf(F, "reg #%d = %s\n", i, reg ? arch_register_get_name(reg) : "n/a");
 				}
@@ -228,70 +252,17 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			}
 			fprintf(F, "\n");
 
-			/* dump immop type */
-			fprintf(F, "immediate = ");
-			switch (get_ia32_immop_type(n)) {
-				case ia32_ImmNone:
-					fprintf(F, "None");
-					break;
-				case ia32_ImmConst:
-					fprintf(F, "Const");
-					break;
-				case ia32_ImmSymConst:
-					fprintf(F, "SymConst");
-					break;
-				case ia32_ImmAsm:
-					fprintf(F, "Asm '%s'\n",
-					        get_id_str(attr->cnst_val.asm_text));
-					break;
-				default:
-					fprintf(F, "unknown (%d)", get_ia32_immop_type(n));
-					break;
-			}
-			fprintf(F, "\n");
-
 			/* 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 flavour */
-			fprintf(F, "AM flavour =");
-			am_flav = get_ia32_am_flavour(n);
-			if (am_flav == ia32_am_N) {
-				fprintf(F, " none");
-			}
-			else {
-				if (am_flav & ia32_O) {
-					fprintf(F, " O");
-				}
-				if (am_flav & ia32_B) {
-					fprintf(F, " B");
-				}
-				if (am_flav & ia32_I) {
-					fprintf(F, " I");
-				}
-				if (am_flav & ia32_S) {
-					fprintf(F, " S");
-				}
-			}
-			fprintf(F, " (%d)\n", am_flav);
 
 			/* dump AM offset */
 			if(get_ia32_am_offs_int(n) != 0) {
@@ -309,38 +280,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)) {
-				fprintf(F, "pn_code = %d\n", get_ia32_pncode(n));
-			} else {
-				if(get_ia32_pncode(n) & ia32_pn_Cmp_Unsigned) {
-					int pnc = get_ia32_pncode(n);
-					fprintf(F, "pn_code = %d (%s, unsigned)\n",
-					        pnc, get_pnc_string(pnc & ~ia32_pn_Cmp_Unsigned));
-				} else {
-					fprintf(F, "pn_code = %d (%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));
-
-			/* emit cl */
-			fprintf(F, "emit cl instead of ecx = %d\n", is_ia32_emit_cl(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 */
@@ -362,6 +319,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);
 
@@ -428,6 +388,84 @@ const ia32_attr_t *get_ia32_attr_const(const ir_node *node) {
 	return (const ia32_attr_t*) get_irn_generic_attr_const(node);
 }
 
+ia32_x87_attr_t *get_ia32_x87_attr(ir_node *node) {
+	ia32_attr_t     *attr     = get_ia32_attr(node);
+	ia32_x87_attr_t *x87_attr = CAST_IA32_ATTR(ia32_x87_attr_t, attr);
+	return x87_attr;
+}
+
+const ia32_x87_attr_t *get_ia32_x87_attr_const(const ir_node *node) {
+	const ia32_attr_t     *attr     = get_ia32_attr_const(node);
+	const ia32_x87_attr_t *x87_attr = CONST_CAST_IA32_ATTR(ia32_x87_attr_t, attr);
+	return x87_attr;
+}
+
+const ia32_asm_attr_t *get_ia32_asm_attr_const(const ir_node *node) {
+	const ia32_attr_t     *attr     = get_ia32_attr_const(node);
+	const ia32_asm_attr_t *asm_attr = CONST_CAST_IA32_ATTR(ia32_asm_attr_t, attr);
+
+	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 *imm_attr = CONST_CAST_IA32_ATTR(ia32_immediate_attr_t, 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;
+}
+
 /**
  * Gets the type of an ia32 node.
  */
@@ -444,44 +482,19 @@ void set_ia32_op_type(ir_node *node, ia32_op_type_t tp) {
 	attr->data.tp     = tp;
 }
 
-/**
- * Gets the immediate op type of an ia32 node.
- */
-ia32_immop_type_t get_ia32_immop_type(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.imm_tp;
-}
-
-/**
- * Gets the supported address mode of an ia32 node
- */
-ia32_am_type_t get_ia32_am_support(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_support;
+	return attr->data.am_arity;
 }
 
 /**
  * Sets the supported address mode of an ia32 node
  */
-void set_ia32_am_support(ir_node *node, ia32_am_type_t am_tp) {
-	ia32_attr_t *attr     = get_ia32_attr(node);
-	attr->data.am_support = am_tp;
-}
-
-/**
- * Gets the address mode flavour of an ia32 node
- */
-ia32_am_flavour_t get_ia32_am_flavour(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.am_flavour;
-}
-
-/**
- * Sets the address mode flavour of an ia32 node
- */
-void set_ia32_am_flavour(ir_node *node, ia32_am_flavour_t am_flavour) {
-	ia32_attr_t *attr     = get_ia32_attr(node);
-	attr->data.am_flavour = am_flavour;
+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;
 }
 
 /**
@@ -557,38 +570,22 @@ 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);
-	attr->data.am_scale = scale;
-}
-
-/**
- * Return the tarval of an immediate operation or NULL in case of SymConst
- */
-tarval *get_ia32_Immop_tarval(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	assert(attr->data.imm_tp == ia32_ImmConst);
-    return attr->cnst_val.tv;
-}
-
-/**
- * Sets the attributes of an immediate operation to the specified tarval
- */
-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;
-}
-
-void set_ia32_Immop_symconst(ir_node *node, ir_entity *entity) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->data.imm_tp = ia32_ImmSymConst;
-	attr->cnst_val.sc = entity;
+	assert(0 <= scale && scale < 4 && "AM scale out of range");
+	attr->data.am_scale = scale;
 }
 
-ir_entity *get_ia32_Immop_symconst(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	assert(attr->data.imm_tp == ia32_ImmSymConst);
-	return attr->cnst_val.sc;
+void ia32_copy_am_attrs(ir_node *to, const ir_node *from)
+{
+	set_ia32_ls_mode(to, get_ia32_ls_mode(from));
+	set_ia32_am_scale(to, get_ia32_am_scale(from));
+	set_ia32_am_sc(to, get_ia32_am_sc(from));
+	if(is_ia32_am_sc_sign(from))
+		set_ia32_am_sc_sign(to);
+	add_ia32_am_offs_int(to, get_ia32_am_offs_int(from));
+	set_ia32_frame_ent(to, get_ia32_frame_ent(from));
+	if (is_ia32_use_frame(from))
+		set_ia32_use_frame(to);
 }
 
 /**
@@ -639,67 +636,49 @@ int is_ia32_commutative(const ir_node *node) {
 	return attr->data.is_commutative;
 }
 
-/**
- * Sets node emit_cl.
- */
-void set_ia32_emit_cl(ir_node *node) {
-	ia32_attr_t *attr  = get_ia32_attr(node);
-	attr->data.emit_cl = 1;
+void set_ia32_need_stackent(ir_node *node) {
+	ia32_attr_t *attr     = get_ia32_attr(node);
+	attr->data.need_stackent = 1;
 }
 
-/**
- * Clears node emit_cl.
- */
-void clear_ia32_emit_cl(ir_node *node) {
-	ia32_attr_t *attr  = get_ia32_attr(node);
-	attr->data.emit_cl = 0;
+void clear_ia32_need_stackent(ir_node *node) {
+	ia32_attr_t *attr     = get_ia32_attr(node);
+	attr->data.need_stackent = 0;
 }
 
-/**
- * Checks if node needs %cl.
- */
-int is_ia32_emit_cl(const ir_node *node) {
+int is_ia32_need_stackent(const ir_node *node) {
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.emit_cl;
+	return attr->data.need_stackent;
 }
 
-/**
- * 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;
+void set_ia32_is_reload(ir_node *node) {
+	ia32_attr_t *attr = get_ia32_attr(node);
+	attr->data.is_reload = 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;
+int is_ia32_is_reload(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->data.is_reload;
 }
 
-/**
- * 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_is_spill(ir_node *node) {
+	ia32_attr_t *attr = get_ia32_attr(node);
+	attr->data.is_spill = 1;
 }
 
-void set_ia32_need_stackent(ir_node *node) {
-	ia32_attr_t *attr     = get_ia32_attr(node);
-	attr->data.need_stackent = 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 clear_ia32_need_stackent(ir_node *node) {
-	ia32_attr_t *attr     = get_ia32_attr(node);
-	attr->data.need_stackent = 0;
+void set_ia32_is_remat(ir_node *node) {
+	ia32_attr_t *attr = get_ia32_attr(node);
+	attr->data.is_remat = 1;
 }
 
-int is_ia32_need_stackent(const ir_node *node) {
+int is_ia32_is_remat(const ir_node *node) {
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.need_stackent;
+	return attr->data.is_remat;
 }
 
 /**
@@ -743,16 +722,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;
 }
 
 /**
@@ -841,6 +813,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.
  */
@@ -858,35 +835,30 @@ int get_ia32_n_res(const ir_node *node) {
 }
 
 /**
- * Returns the flavour of an ia32 node,
+ * Returns the condition code of a node.
  */
-ia32_op_flavour_t get_ia32_flavour(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->data.op_flav;
-}
-
-/**
- * Sets the flavour of an ia32 node to flavour_Div/Mod/DivMod/Mul/Mulh.
- */
-void set_ia32_flavour(ir_node *node, ia32_op_flavour_t op_flav) {
-	ia32_attr_t *attr  = get_ia32_attr(node);
-	attr->data.op_flav = op_flav;
+long get_ia32_condcode(const ir_node *node)
+{
+	const ia32_condcode_attr_t *attr = get_ia32_condcode_attr_const(node);
+	return attr->pn_code;
 }
 
 /**
- * Returns the projnum code.
+ * Sets the condition code of a node
  */
-pn_Cmp get_ia32_pncode(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->pn_code;
+void set_ia32_condcode(ir_node *node, long code)
+{
+	ia32_condcode_attr_t *attr = get_ia32_condcode_attr(node);
+	attr->pn_code = code;
 }
 
 /**
- * Sets the projnum code
+ * Returns the condition code of a node.
  */
-void set_ia32_pncode(ir_node *node, pn_Cmp code) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->pn_code     = code;
+unsigned get_ia32_copyb_size(const ir_node *node)
+{
+	const ia32_copyb_attr_t *attr = get_ia32_copyb_attr_const(node);
+	return attr->size;
 }
 
 /**
@@ -920,7 +892,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;
 }
 
 /**
@@ -928,7 +900,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
@@ -962,105 +954,6 @@ void set_ia32_orig_node(ir_node *node, const char *name) {
  *     |_|
  ******************************************************************************************************/
 
-/**
- * Copy the attributes from an ia32_Const to an Immop (Add_i, Sub_i, ...) node
- */
-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;
-	}
-}
-
-/**
- * Copy the attributes from a Firm Const/SymConst to an ia32_Const
- */
-void set_ia32_Const_attr(ir_node *ia32_cnst, ir_node *cnst) {
-	assert(is_ia32_Cnst(ia32_cnst) && "Need ia32_Const to set Const attr");
-
-	switch (get_irn_opcode(cnst)) {
-		case iro_Const:
-			set_ia32_Const_tarval(ia32_cnst, get_Const_tarval(cnst));
-			break;
-		case iro_SymConst:
-			assert(get_SymConst_kind(cnst) == symconst_addr_ent);
-			set_ia32_Immop_symconst(ia32_cnst, get_SymConst_entity(cnst));
-			break;
-		case iro_Unknown:
-			assert(0 && "Unknown Const NYI");
-			break;
-		default:
-			assert(0 && "Cannot create ia32_Const for this opcode");
-	}
-}
-
-void set_ia32_Const_tarval(ir_node *ia32_cnst, tarval *tv) {
-#if 0
-	if(mode_is_reference(get_tarval_mode(tv))) {
-		if(tarval_is_null(tv)) {
-			tv = get_tarval_null(mode_Iu);
-		} else {
-			long val;
-			/* workaround... */
-			if(!tarval_is_long(tv))
-				panic("Can't convert reference tarval to mode_Iu at %+F", ia32_cnst);
-			val = get_tarval_long(tv);
-			tv = new_tarval_from_long(val, mode_Iu);
-		}
-	} else {
-		tv = tarval_convert_to(tv, mode_Iu);
-	}
-#else
-	tv = tarval_convert_to(tv, mode_Iu);
-#endif
-
-	assert(tv != get_tarval_bad() && tv != get_tarval_undefined()
-			&& tv != NULL);
-	set_ia32_Immop_tarval(ia32_cnst, tv);
-}
-
-
-/**
- * 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 immediate operation with Const.
- */
-int is_ia32_ImmConst(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return (attr->data.imm_tp == ia32_ImmConst);
-}
-
-/**
- * Returns whether or not the node is an immediate operation with SymConst.
- */
-int is_ia32_ImmSymConst(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return (attr->data.imm_tp == ia32_ImmSymConst);
-}
-
 /**
  * Returns whether or not the node is an AddrModeS node.
  */
@@ -1101,14 +994,6 @@ int is_ia32_St(const ir_node *node) {
 	       op == iro_ia32_fstp;
 }
 
-/**
- * Checks if node is a Const or xConst/vfConst.
- */
-int is_ia32_Cnst(const ir_node *node) {
-	int op = get_ia32_irn_opcode(node);
-	return op == iro_ia32_Const || op == iro_ia32_xConst || op == iro_ia32_vfConst;
-}
-
 /**
  * Returns the name of the OUT register at position pos.
  */
@@ -1133,6 +1018,18 @@ int get_ia32_out_regnr(const ir_node *node, int pos) {
 	return arch_register_get_index(attr->slots[pos]);
 }
 
+void ia32_swap_left_right(ir_node *node)
+{
+	ia32_attr_t *attr  = get_ia32_attr(node);
+	ir_node     *left  = get_irn_n(node, n_ia32_binary_left);
+	ir_node     *right = get_irn_n(node, n_ia32_binary_right);
+
+	assert(is_ia32_commutative(node));
+	attr->data.ins_permuted = !attr->data.ins_permuted;
+	set_irn_n(node, n_ia32_binary_left,  right);
+	set_irn_n(node, n_ia32_binary_right, left);
+}
+
 /**
  * Returns the OUT register at position pos.
  */
@@ -1152,24 +1049,95 @@ 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);
-	ia32_attr_t    *attr = get_ia32_attr(node);
+	ir_graph        *irg  = get_irn_irg(node);
+	struct obstack  *obst = get_irg_obstack(irg);
+	ia32_attr_t     *attr = get_ia32_attr(node);
 
 	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;
+	attr->exec_units  = execution_units;
+#ifndef NDEBUG
+	attr->attr_type  |= IA32_ATTR_ia32_attr_t;
+#endif
 
 	attr->out_flags = NEW_ARR_D(int, obst, n_res);
 	memset(attr->out_flags, 0, n_res * sizeof(attr->out_flags[0]));
 
 	attr->slots = NEW_ARR_D(const arch_register_t*, obst, n_res);
-	memset(attr->slots, 0, n_res * sizeof(attr->slots[0]));
+	/* void* cast to suppress an incorrect warning on MSVC */
+	memset((void*)attr->slots, 0, n_res * sizeof(attr->slots[0]));
+}
+
+void
+init_ia32_x87_attributes(ir_node *res)
+{
+#ifndef NDEBUG
+	ia32_attr_t *attr  = get_ia32_attr(res);
+	attr->attr_type   |= IA32_ATTR_ia32_x87_attr_t;
+#else
+	(void) res;
+#endif
+	ia32_current_cg->do_x87_sim = 1;
+}
+
+void
+init_ia32_asm_attributes(ir_node *res)
+{
+#ifndef NDEBUG
+	ia32_attr_t *attr  = get_ia32_attr(res);
+	attr->attr_type   |= IA32_ATTR_ia32_asm_attr_t;
+#else
+	(void) res;
+#endif
+}
+
+void
+init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
+                               int symconst_sign, long offset)
+{
+	ia32_immediate_attr_t *attr = get_irn_generic_attr(res);
+
+#ifndef NDEBUG
+	attr->attr.attr_type  |= IA32_ATTR_ia32_immediate_attr_t;
+#endif
+	attr->symconst = symconst;
+	attr->sc_sign  = symconst_sign;
+	attr->offset   = offset;
+}
+
+void init_ia32_call_attributes(ir_node *const res, unsigned const pop, ir_type *const call_tp)
+{
+	ia32_call_attr_t *attr = get_irn_generic_attr(res);
+
+#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;
 }
 
 ir_node *get_ia32_result_proj(const ir_node *node)
@@ -1197,47 +1165,160 @@ ir_node *get_ia32_result_proj(const ir_node *node)
 
 /* default compare operation to compare attributes */
 int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) {
-	if (a->data.tp != b->data.tp
-			|| a->data.imm_tp != b->data.imm_tp)
-		return 1;
-
-	if (a->data.imm_tp == ia32_ImmConst
-			&& a->cnst_val.tv != b->cnst_val.tv)
+	if (a->data.tp != b->data.tp)
 		return 1;
 
-	if (a->data.imm_tp == ia32_ImmSymConst
-			&& a->cnst_val.sc != b->cnst_val.sc)
-		return 1;
-	if(a->data.imm_tp == ia32_ImmAsm
-			&& a->cnst_val.asm_text != b->cnst_val.asm_text)
-		return 1;
-
-	if (a->data.am_flavour != b->data.am_flavour
-	    || a->data.am_scale != b->data.am_scale
+	if (a->data.am_scale != b->data.am_scale
 	    || 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;
 
+	/* nodes with not yet assigned entities shouldn't be CSEd (important for
+	 * unsigned int -> double conversions */
+	if(a->data.use_frame && a->frame_ent == NULL)
+		return 1;
+	if(b->data.use_frame && b->frame_ent == NULL)
+		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;
 
-	if(a->pn_code != b->pn_code)
+	if (a->data.tp != b->data.tp)
+		return 1;
+
+	if (a->data.has_except_label != b->data.has_except_label)
 		return 1;
 
-	if (a->data.tp != b->data.tp
-	    || a->data.op_flav != b->data.op_flav)
+	if (a->data.ins_permuted != b->data.ins_permuted
+			|| a->data.cmp_unsigned != b->data.cmp_unsigned)
 		return 1;
 
-	if (a->data.except_label != b->data.except_label)
+	return 0;
+}
+
+/** Compare nodes attributes for all "normal" nodes. */
+static
+int ia32_compare_nodes_attr(ir_node *a, ir_node *b)
+{
+	const ia32_attr_t* attr_a = get_ia32_attr_const(a);
+	const ia32_attr_t* attr_b = get_ia32_attr_const(b);
+
+	return ia32_compare_attr(attr_a, attr_b);
+}
+
+/** Compare node attributes for nodes with condition code. */
+static
+int ia32_compare_condcode_attr(ir_node *a, ir_node *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)
+{
+	const ia32_asm_attr_t *attr_a;
+	const ia32_asm_attr_t *attr_b;
+
+	if(ia32_compare_nodes_attr(a, b))
+		return 1;
+
+	attr_a = get_ia32_asm_attr_const(a);
+	attr_b = get_ia32_asm_attr_const(b);
+
+	if(attr_a->asm_text != attr_b->asm_text)
+		return 1;
+
+	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)
+{
+	const ia32_immediate_attr_t *attr_a = get_ia32_immediate_attr_const(a);
+	const ia32_immediate_attr_t *attr_b = get_ia32_immediate_attr_const(b);
+
+	if(attr_a->symconst != attr_b->symconst	||
+	   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)
 {
@@ -1254,21 +1335,8 @@ static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node)
 		DUP_ARR_D(int, obst, attr_old->out_flags);
 	/* copy register assignments */
 	attr_new->slots =
-		DUP_ARR_D(const arch_register_t*, obst, attr_old->slots);
+		DUP_ARR_D(arch_register_t*, obst, attr_old->slots);
 }
 
 /* Include the generated constructor functions */
 #include "gen_ia32_new_nodes.c.inl"
-
-/**
- * Registers the ia32_copy_attr function for all ia32 opcodes.
- */
-void ia32_register_copy_attr_func(void) {
-	int i;
-
-	for (i = get_irp_n_opcodes() - 1; i >= 0; --i) {
-		ir_op *op = get_irp_opcode(i);
-		if (is_ia32_op(op))
-			op->ops.copy_attr = ia32_copy_attr;
-	}
-}