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

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index a3b7333c5..f58c3a95d 100644
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -1,20 +1,32 @@
+/*
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
 /**
+ * @file
+ * @brief       Handling of ia32 specific firm opcodes.
+ * @author      Christian Wuerdig
+ * @version     $Id$
+ *
  * This file implements the creation of the achitecture specific firm opcodes
- * and the coresponding node constructors for the ia32 assembler irg.
- * @author Christian Wuerdig
- * $Id$
+ * and the corresponding node constructors for the ia32 assembler irg.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
 
 #include <stdlib.h>
 
@@ -31,60 +43,16 @@
 #include "iredges.h"
 #include "error.h"
 #include "raw_bitset.h"
+#include "xmalloc.h"
 
-#include "../bearch.h"
+#include "../bearch_t.h"
 
+#include "bearch_ia32_t.h"
 #include "ia32_nodes_attr.h"
 #include "ia32_new_nodes.h"
 #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) {
-	switch (get_SymConst_kind(symc)) {
-		case symconst_addr_name:
-			return get_SymConst_name(symc);
-
-		case symconst_addr_ent:
-			return ia32_get_ent_ident(get_SymConst_entity(symc));
-
-		default:
-			assert(0 && "Unsupported SymConst");
-	}
-
-	return NULL;
-}
-
-/**
- * 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);
-}
-
 /***********************************************************************************
  *      _                                   _       _             __
  *     | |                                 (_)     | |           / _|
@@ -126,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");
@@ -153,44 +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;
+	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)) {
-					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)) {
 				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] ");
 				}
 			}
@@ -219,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");
 				}
@@ -248,66 +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;
-				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) {
@@ -316,40 +271,33 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 
 			/* dump AM symconst */
 			if(get_ia32_am_sc(n) != NULL) {
-				fprintf(F, "AM symconst = %s\n", get_id_str(get_ia32_am_sc(n)));
+				ir_entity *ent = get_ia32_am_sc(n);
+				ident *id = get_entity_ld_ident(ent);
+				fprintf(F, "AM symconst = %s\n", get_id_str(id));
 			}
 
 			/* dump AM scale */
 			fprintf(F, "AM scale = %d\n", get_ia32_am_scale(n));
 
 			/* dump pn code */
-			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)));
+			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 */
@@ -371,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);
 
@@ -427,81 +378,135 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
  *                                       |___/
  ***************************************************************************************************/
 
-/**
- * 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 :-(
- */
-ia32_attr_t *get_ia32_attr(const ir_node *node) {
+ia32_attr_t *get_ia32_attr(ir_node *node) {
 	assert(is_ia32_irn(node) && "need ia32 node to get ia32 attributes");
-	return (ia32_attr_t *)get_irn_generic_attr((ir_node *)node);
+	return (ia32_attr_t *)get_irn_generic_attr(node);
 }
 
-/**
- * Gets the type of an ia32 node.
- */
-ia32_op_type_t get_ia32_op_type(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.tp;
+const ia32_attr_t *get_ia32_attr_const(const ir_node *node) {
+	assert(is_ia32_irn(node) && "need ia32 node to get ia32 attributes");
+	return (const ia32_attr_t*) get_irn_generic_attr_const(node);
 }
 
-/**
- * Sets the type of an ia32 node.
- */
-void set_ia32_op_type(ir_node *node, ia32_op_type_t tp) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->data.tp     = tp;
+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;
 }
 
-/**
- * Gets the immediate op type of an ia32 node.
- */
-ia32_immop_type_t get_ia32_immop_type(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.imm_tp;
+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;
 }
 
-/**
- * Gets the supported addrmode of an ia32 node
- */
-ia32_am_type_t get_ia32_am_support(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.am_support;
+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;
 }
 
 /**
- * Sets the supported addrmode of an ia32 node
+ * Gets the type 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;
+ia32_op_type_t get_ia32_op_type(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->data.tp;
 }
 
 /**
- * Gets the addrmode flavour of an ia32 node
+ * Sets the type of an ia32 node.
  */
-ia32_am_flavour_t get_ia32_am_flavour(const ir_node *node) {
+void set_ia32_op_type(ir_node *node, ia32_op_type_t tp) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.am_flavour;
+	attr->data.tp     = tp;
+}
+
+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;
 }
 
 /**
- * Sets the addrmode flavour of an ia32 node
+ * Sets the supported address mode 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;
 }
 
 /**
- * Gets the addressmode offset as int.
+ * Gets the address mode offset as int.
  */
 int get_ia32_am_offs_int(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->am_offs;
 }
 
 /**
- * Sets the addressmode offset from an int.
+ * Sets the address mode offset from an int.
  */
 void set_ia32_am_offs_int(ir_node *node, int offset) {
 	ia32_attr_t *attr = get_ia32_attr(node);
@@ -514,19 +519,19 @@ void add_ia32_am_offs_int(ir_node *node, int offset) {
 }
 
 /**
- * Returns the symconst ident associated to addrmode.
+ * Returns the symconst entity associated to address mode.
  */
-ident *get_ia32_am_sc(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+ir_entity *get_ia32_am_sc(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->am_sc;
 }
 
 /**
- * Sets the symconst ident associated to addrmode.
+ * Sets the symconst entity associated to address mode.
  */
-void set_ia32_am_sc(ir_node *node, ident *sc) {
+void set_ia32_am_sc(ir_node *node, ir_entity *entity) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->am_sc       = sc;
+	attr->am_sc       = entity;
 }
 
 /**
@@ -549,7 +554,7 @@ void clear_ia32_am_sc_sign(ir_node *node) {
  * Returns the sign bit for address mode symconst.
  */
 int is_ia32_am_sc_sign(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.am_sc_sign;
 }
 
@@ -557,46 +562,30 @@ int is_ia32_am_sc_sign(const ir_node *node) {
  * Gets the addr mode const.
  */
 int get_ia32_am_scale(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.am_scale;
 }
 
 /**
- * Sets the index register scale for addrmode.
+ * 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) {
-	ia32_attr_t *attr = get_ia32_attr(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, ident *ident) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->data.imm_tp = ia32_ImmSymConst;
-	attr->cnst_val.sc = ident;
+	assert(0 <= scale && scale < 4 && "AM scale out of range");
+	attr->data.am_scale = scale;
 }
 
-ident *get_ia32_Immop_symconst(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(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);
 }
 
 /**
@@ -619,7 +608,7 @@ void clear_ia32_use_frame(ir_node *node) {
  * Gets the uses_frame flag.
  */
 int is_ia32_use_frame(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.use_frame;
 }
 
@@ -643,78 +632,60 @@ void clear_ia32_commutative(ir_node *node) {
  * Checks if node is commutative.
  */
 int is_ia32_commutative(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(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) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.emit_cl;
+int is_ia32_need_stackent(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	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) {
+void set_ia32_is_spill(ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.got_lea;
+	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) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.need_stackent;
+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)
  */
 ir_mode *get_ia32_ls_mode(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->ls_mode;
 }
 
@@ -730,7 +701,7 @@ void set_ia32_ls_mode(ir_node *node, ir_mode *mode) {
  * Gets the frame entity assigned to this node.
  */
 ir_entity *get_ia32_frame_ent(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->frame_ent;
 }
 
@@ -751,23 +722,16 @@ void set_ia32_frame_ent(ir_node *node, ir_entity *ent) {
  * Gets the instruction latency.
  */
 unsigned get_ia32_latency(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(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;
 }
 
 /**
  * Returns the argument register requirements of an ia32 node.
  */
 const arch_register_req_t **get_ia32_in_req_all(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->in_req;
 }
 
@@ -783,7 +747,7 @@ void set_ia32_in_req_all(ir_node *node, const arch_register_req_t **reqs) {
  * Returns the result register requirements of an ia32 node.
  */
 const arch_register_req_t **get_ia32_out_req_all(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->out_req;
 }
 
@@ -799,7 +763,7 @@ void set_ia32_out_req_all(ir_node *node, const arch_register_req_t **reqs) {
  * Returns the argument register requirement at position pos of an ia32 node.
  */
 const arch_register_req_t *get_ia32_in_req(const ir_node *node, int pos) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	if(attr->in_req == NULL)
 		return arch_no_register_req;
 
@@ -810,7 +774,7 @@ const arch_register_req_t *get_ia32_in_req(const ir_node *node, int pos) {
  * Returns the result register requirement at position pos of an ia32 node.
  */
 const arch_register_req_t *get_ia32_out_req(const ir_node *node, int pos) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	if(attr->out_req == NULL)
 		return arch_no_register_req;
 
@@ -837,7 +801,7 @@ void set_ia32_req_in(ir_node *node, const arch_register_req_t *req, int pos) {
  * Returns the register flag of an ia32 node.
  */
 arch_irn_flags_t get_ia32_flags(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.flags;
 }
 
@@ -849,60 +813,52 @@ 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.
  */
 const arch_register_t **get_ia32_slots(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->slots;
 }
 
-/**
- * Sets the number of results.
- */
-void set_ia32_n_res(ir_node *node, int n_res) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->data.n_res  = n_res;
-}
-
 /**
  * Returns the number of results.
  */
 int get_ia32_n_res(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.n_res;
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return ARR_LEN(attr->slots);
 }
 
 /**
- * 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) {
-	ia32_attr_t *attr = get_ia32_attr(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) {
-	ia32_attr_t *attr = get_ia32_attr(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;
 }
 
 /**
@@ -910,7 +866,7 @@ void set_ia32_pncode(ir_node *node, pn_Cmp code) {
  */
 void set_ia32_out_flags(ir_node *node, arch_irn_flags_t flags, int pos) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	assert(pos < (int) attr->data.n_res && "Invalid OUT position.");
+	assert(pos < ARR_LEN(attr->out_flags) && "Invalid OUT position.");
 	attr->out_flags[pos] = flags;
 }
 
@@ -918,25 +874,62 @@ void set_ia32_out_flags(ir_node *node, arch_irn_flags_t flags, int pos) {
  * Gets the flags for the n'th out.
  */
 arch_irn_flags_t get_ia32_out_flags(const ir_node *node, int pos) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return pos < (int)attr->data.n_res ? attr->out_flags[pos] : arch_irn_flags_none;
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	assert(pos < ARR_LEN(attr->out_flags) && "Invalid OUT position.");
+	return attr->out_flags[pos];
 }
 
 /**
  * Get the list of available execution units.
  */
 const be_execution_unit_t ***get_ia32_exec_units(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->exec_units;
 }
 
+/**
+ * Get the exception label attribute.
+ */
+unsigned get_ia32_exc_label(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->data.has_except_label;
+}
+
+/**
+ * Set the exception label attribute.
+ */
+void set_ia32_exc_label(ir_node *node, unsigned flag) {
+	ia32_attr_t *attr = get_ia32_attr(node);
+	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
 
 /**
  * Returns the name of the original ir node.
  */
 const char *get_ia32_orig_node(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->orig_node;
 }
 
@@ -961,100 +954,11 @@ 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:
-			set_ia32_Immop_symconst(ia32_cnst, get_sc_ident(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(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
- */
-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) {
-	ia32_attr_t *attr = get_ia32_attr(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) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return (attr->data.imm_tp == ia32_ImmSymConst);
-}
-
 /**
  * Returns whether or not the node is an AddrModeS node.
  */
 int is_ia32_AddrModeS(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return (attr->data.tp == ia32_AddrModeS);
 }
 
@@ -1062,7 +966,7 @@ int is_ia32_AddrModeS(const ir_node *node) {
  * Returns whether or not the node is an AddrModeD node.
  */
 int is_ia32_AddrModeD(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return (attr->data.tp == ia32_AddrModeD);
 }
 
@@ -1071,7 +975,10 @@ int is_ia32_AddrModeD(const ir_node *node) {
  */
 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;
+	return op == iro_ia32_Load ||
+	       op == iro_ia32_xLoad ||
+	       op == iro_ia32_vfld ||
+	       op == iro_ia32_fld;
 }
 
 /**
@@ -1079,24 +986,21 @@ int is_ia32_Ld(const ir_node *node) {
  */
 int is_ia32_St(const ir_node *node) {
 	int op = get_ia32_irn_opcode(node);
-	return op == iro_ia32_Store || op == iro_ia32_xStore || op == iro_ia32_vfst || op == iro_ia32_fst || 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;
+	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) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 
-	assert(pos < (int) attr->data.n_res && "Invalid OUT position.");
+	assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position.");
 	assert(attr->slots[pos]  && "No register assigned");
 
 	return arch_register_get_name(attr->slots[pos]);
@@ -1106,21 +1010,33 @@ const char *get_ia32_out_reg_name(const ir_node *node, int 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) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 
-	assert(pos < (int) attr->data.n_res && "Invalid OUT position.");
+	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);
+	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.
  */
 const arch_register_t *get_ia32_out_reg(const ir_node *node, int pos) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 
-	assert(pos < (int) attr->data.n_res && "Invalid OUT position.");
+	assert(pos < ARR_LEN(attr->slots) && "Invalid OUT position.");
 	assert(attr->slots[pos]  && "No register assigned");
 
 	return attr->slots[pos];
@@ -1133,22 +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)
 {
-	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);
-	set_ia32_n_res(node, n_res);
 
-	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, get_irg_obstack(get_irn_irg(node)), n_res);
+	attr->out_flags = NEW_ARR_D(int, obst, n_res);
 	memset(attr->out_flags, 0, n_res * sizeof(attr->out_flags[0]));
 
-	memset((void *)attr->slots, 0, n_res * sizeof(attr->slots[0]));
+	attr->slots = NEW_ARR_D(const arch_register_t*, obst, n_res);
+	/* 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)
@@ -1175,66 +1164,178 @@ ir_node *get_ia32_result_proj(const ir_node *node)
  ***************************************************************************************/
 
 /* 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)
+int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) {
+	if (a->data.tp != b->data.tp)
 		return 1;
 
-	if (a->data.imm_tp == ia32_ImmConst
-			&& a->cnst_val.tv != b->cnst_val.tv)
+	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;
 
-	if (a->data.imm_tp == ia32_ImmSymConst
-			&& a->cnst_val.sc != b->cnst_val.sc)
+	/* 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 (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)
+	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)
+	    || 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.tp != b->data.tp
-	        || a->data.op_flav != b->data.op_flav)
+	if (a->data.has_except_label != b->data.has_except_label)
+		return 1;
+
+	if (a->data.ins_permuted != b->data.ins_permuted
+			|| a->data.cmp_unsigned != b->data.cmp_unsigned)
 		return 1;
 
 	return 0;
 }
 
-/* copies the ia32 attributes */
-static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node) {
-	ia32_attr_t *attr_old = get_ia32_attr(old_node);
-	ia32_attr_t *attr_new = get_ia32_attr(new_node);
+/** 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);
 
-	/* copy the attributes */
-	memcpy(attr_new, attr_old, get_op_attr_size(get_irn_op(old_node)));
+	return ia32_compare_attr(attr_a, attr_b);
+}
 
-	/* copy out flags */
-	attr_new->out_flags =
-		DUP_ARR_D(int, get_irg_obstack(get_irn_irg(new_node)), attr_old->out_flags);
+/** 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;
 }
 
 /**
- * Registers the ia32_copy_attr function for all ia32 opcodes.
+ * Hash function for Immediates
  */
-void ia32_register_copy_attr_func(void) {
-	unsigned i, f = get_ia32_opcode_first(), l = get_ia32_opcode_last();
+static unsigned ia32_hash_Immediate(const ir_node *irn) {
+	const ia32_immediate_attr_t *a = get_ia32_immediate_attr_const(irn);
 
-	for (i = f; i < l; i++) {
-		ir_op *op = get_irp_opcode(i);
-		op->ops.copy_attr = ia32_copy_attr;
-	}
+	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)
+{
+	ir_graph          *irg      = get_irn_irg(new_node);
+	struct obstack    *obst     = get_irg_obstack(irg);
+	const ia32_attr_t *attr_old = get_ia32_attr_const(old_node);
+	ia32_attr_t       *attr_new = get_ia32_attr(new_node);
+
+	/* copy the attributes */
+	memcpy(attr_new, attr_old, get_op_attr_size(get_irn_op(old_node)));
+
+	/* copy out flags */
+	attr_new->out_flags =
+		DUP_ARR_D(int, obst, attr_old->out_flags);
+	/* copy register assignments */
+	attr_new->slots =
+		DUP_ARR_D(arch_register_t*, obst, attr_old->slots);
 }
 
 /* Include the generated constructor functions */