X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=f0e77c65a83e677d91d6392b86f149efa83bdddc;hb=fe3c81727251945fa818d22165b3afc33ea2019f;hp=67715e470e33514af7201d64c7a164d931ca0c22;hpb=09efa2a5b39ea665e263421e91a67b1ab03b87a8;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index 67715e470..f0e77c65a 100644
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -1,22 +1,35 @@
+/*
+ * Copyright (C) 1995-2007 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 $arch assembler irg.
- * @author Christian Wuerdig
- * $Id$
+ * and the coresponding 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>
 
 #include "irprog_t.h"
@@ -29,36 +42,18 @@
 #include "firm_common_t.h"
 #include "irvrfy_t.h"
 #include "irprintf.h"
+#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"
-
-/**
- * Returns the ident of a SymConst.
- * @param symc  The SymConst
- * @return The ident of the SymConst
- */
-static ident *get_sc_ident(ir_node *symc) {
-	assert(get_irn_opcode(symc) == iro_SymConst && "need symconst to get ident");
-
-	switch (get_SymConst_kind(symc)) {
-		case symconst_addr_name:
-			return get_SymConst_name(symc);
-
-		case symconst_addr_ent:
-			return get_entity_ld_ident(get_SymConst_entity(symc));
-
-		default:
-			assert(0 && "Unsupported SymConst");
-	}
-
-	return NULL;
-}
-
-
+#include "gen_ia32_machine.h"
 
 /***********************************************************************************
  *      _                                   _       _             __
@@ -71,69 +66,43 @@ static ident *get_sc_ident(ir_node *symc) {
  *                       |_|
  ***********************************************************************************/
 
-/**
- * Returns a string containing the names of all registers within the limited bitset
- */
-static char *get_limited_regs(const arch_register_req_t *req, char *buf, int max) {
-	bitset_t *bs   = bitset_alloca(req->cls->n_regs);
-	char     *p    = buf;
-	int       size = 0;
-	int       i, cnt;
-
-	req->limited(NULL, bs);
-
-	for (i = 0; i < req->cls->n_regs; i++) {
-		if (bitset_is_set(bs, i)) {
-			cnt = snprintf(p, max - size, " %s", req->cls->regs[i].name);
-			if (cnt < 0) {
-				fprintf(stderr, "dumper problem, exiting\n");
-				exit(1);
-			}
-
-			p    += cnt;
-			size += cnt;
-
-			if (size >= max)
-				break;
-		}
-	}
-
-	return buf;
-}
-
 /**
  * Dumps the register requirements for either in or out.
  */
-static void dump_reg_req(FILE *F, ir_node *n, const ia32_register_req_t **reqs, int inout) {
+static void dump_reg_req(FILE *F, ir_node *n, const arch_register_req_t **reqs,
+                         int inout) {
 	char *dir = inout ? "out" : "in";
 	int   max = inout ? get_ia32_n_res(n) : get_irn_arity(n);
-	char *buf = alloca(1024);
+	char  buf[1024];
 	int   i;
 
-	memset(buf, 0, 1024);
+	memset(buf, 0, sizeof(buf));
 
 	if (reqs) {
 		for (i = 0; i < max; i++) {
 			fprintf(F, "%sreq #%d =", dir, i);
 
-			if (reqs[i]->req.type == arch_register_req_type_none) {
+			if (reqs[i]->type == arch_register_req_type_none) {
 				fprintf(F, " n/a");
 			}
 
-			if (reqs[i]->req.type & arch_register_req_type_normal) {
-				fprintf(F, " %s", reqs[i]->req.cls->name);
+			if (reqs[i]->type & arch_register_req_type_normal) {
+				fprintf(F, " %s", reqs[i]->cls->name);
 			}
 
-			if (reqs[i]->req.type & arch_register_req_type_limited) {
-				fprintf(F, " %s", get_limited_regs(&reqs[i]->req, buf, 1024));
+			if (reqs[i]->type & arch_register_req_type_limited) {
+				fprintf(F, " %s",
+				        arch_register_req_format(buf, sizeof(buf), reqs[i], n));
 			}
 
-			if (reqs[i]->req.type & arch_register_req_type_should_be_same) {
-				ir_fprintf(F, " same as %+F", get_irn_n(n, reqs[i]->same_pos));
+			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]));
 			}
 
-			if (reqs[i]->req.type & arch_register_req_type_should_be_different) {
-				ir_fprintf(F, " different from %+F", get_irn_n(n, reqs[i]->different_pos));
+			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));
 			}
 
 			fprintf(F, "\n");
@@ -156,38 +125,69 @@ static void dump_reg_req(FILE *F, ir_node *n, const ia32_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_register_req_t **reqs;
+	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->attr.data.am_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);
+				}
+			}
+
+			{
+				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) || is_ia32_Cnst(n)) {
-				char       *pref = is_ia32_ImmSymConst(n) || (get_ia32_op_type(n) == ia32_SymConst) ? "SymC " : "";
-				const char *cnst = get_ia32_cnst(n);
-
-				fprintf(F, "[%s%s]", pref, cnst ? cnst : "NONE");
-			}
-
 			if (! is_ia32_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] ");
 				}
 			}
@@ -214,7 +214,11 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			slots = get_ia32_slots(n);
 			if (slots && n_res > 0) {
 				for (i = 0; i < n_res; i++) {
-					fprintf(F, "reg #%d = %s\n", i, slots[i] ? slots[i]->name : "n/a");
+					const arch_register_t *reg;
+
+					reg = slots[i];
+
+					fprintf(F, "reg #%d = %s\n", i, reg ? arch_register_get_name(reg) : "n/a");
 				}
 				fprintf(F, "\n");
 			}
@@ -225,12 +229,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 				case ia32_Normal:
 					fprintf(F, "Normal");
 					break;
-				case ia32_Const:
-					fprintf(F, "Const");
-					break;
-				case ia32_SymConst:
-					fprintf(F, "SymConst");
-					break;
 				case ia32_AddrModeD:
 					fprintf(F, "AM Dest (Load+Store)");
 					break;
@@ -243,7 +241,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			}
 			fprintf(F, "\n");
 
-
 			/* dump supported am */
 			fprintf(F, "AM support = ");
 			switch (get_ia32_am_support(n)) {
@@ -265,43 +262,28 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			}
 			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 */
-			fprintf(F, "AM offset = ");
-			if (get_ia32_am_offs(n)) {
-				fprintf(F, "%s", get_ia32_am_offs(n));
+			if(get_ia32_am_offs_int(n) != 0) {
+				fprintf(F, "AM offset = %d\n", get_ia32_am_offs_int(n));
 			}
-			else {
-				fprintf(F, "n/a");
+
+			/* dump AM symconst */
+			if(get_ia32_am_sc(n) != NULL) {
+				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));
 			}
-			fprintf(F, "\n");
 
 			/* dump AM scale */
 			fprintf(F, "AM scale = %d\n", get_ia32_am_scale(n));
 
 			/* dump pn code */
-			fprintf(F, "pn_code = %ld\n", get_ia32_pncode(n));
+			if(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)));
+			}
 
 			/* dump n_res */
 			fprintf(F, "n_res = %d\n", get_ia32_n_res(n));
@@ -312,6 +294,15 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			/* 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, "latency = %d\n", get_ia32_latency(n));
+
 			/* dump flags */
 			fprintf(F, "flags =");
 			flags = get_ia32_flags(n);
@@ -328,6 +319,9 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 				if (flags & arch_irn_flags_ignore) {
 					fprintf(F, " ignore");
 				}
+				if (flags & arch_irn_flags_modify_sp) {
+					fprintf(F, " modify_sp");
+				}
 			}
 			fprintf(F, " (%d)\n", flags);
 
@@ -341,6 +335,16 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			}
 			fprintf(F, "\n");
 
+			/* dump modes */
+			fprintf(F, "ls_mode = ");
+			if (get_ia32_ls_mode(n)) {
+				ir_fprintf(F, "%+F", get_ia32_ls_mode(n));
+			}
+			else {
+				fprintf(F, "n/a");
+			}
+			fprintf(F, "\n");
+
 #ifndef NDEBUG
 			/* dump original ir node name */
 			fprintf(F, "orig node = ");
@@ -374,30 +378,49 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
  *                                       |___/
  ***************************************************************************************************/
 
-/**
- * Returns an ident for the given tarval tv.
- */
-static ident *get_ident_for_tv(tarval *tv) {
-	char buf[1024];
-
-	assert(tarval_snprintf(buf, sizeof(buf), tv));
-	return new_id_from_str(buf);
+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(node);
 }
 
-/**
- * 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) {
+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 (ia32_attr_t *)get_irn_generic_attr((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;
+}
+
+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);
+
+	return immediate_attr;
 }
 
 /**
  * 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);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.tp;
 }
 
@@ -410,139 +433,67 @@ void set_ia32_op_type(ir_node *node, ia32_op_type_t tp) {
 }
 
 /**
- * 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;
-}
-
-/**
- * Sets the immediate op type of an ia32 node.
- */
-void set_ia32_immop_type(ir_node *node, ia32_immop_type_t tp) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->data.imm_tp = tp;
-}
-
-/**
- * Gets the supported addrmode of an ia32 node
+ * Gets the supported address mode of an ia32 node
  */
 ia32_am_type_t get_ia32_am_support(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_support;
 }
 
+ia32_am_arity_t get_ia32_am_arity(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->data.am_arity;
+}
+
 /**
- * Sets the supported addrmode of an ia32 node
+ * Sets the supported address mode of an ia32 node
  */
-void set_ia32_am_support(ir_node *node, ia32_am_type_t am_tp) {
+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;
 
-/**
- * Gets the addrmode flavour of an ia32 node
- */
-ia32_am_flavour_t get_ia32_am_flavour(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.am_flavour;
+	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))));
 }
 
 /**
- * Sets the addrmode flavour of an ia32 node
+ * Gets the address mode offset as int.
  */
-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;
+int get_ia32_am_offs_int(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->am_offs;
 }
 
 /**
- * Joins all offsets to one string with adds.
+ * Sets the address mode offset from an int.
  */
-char *get_ia32_am_offs(const ir_node *node) {
+void set_ia32_am_offs_int(ir_node *node, int offset) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	char        *res  = NULL;
-	int          size;
-
-	if (! attr->am_offs) {
-		return NULL;
-	}
-
-	size = obstack_object_size(attr->am_offs);
-	if (size > 0) {
-		res    = xmalloc(size + 2);
-		res[0] = attr->data.offs_sign ? '-' : '+';
-		memcpy(&res[1], obstack_base(attr->am_offs), size);
-		res[size + 1] = '\0';
-	}
-
-	return res;
+	attr->am_offs = offset;
 }
 
-/**
- * Add an offset for addrmode.
- */
-static void extend_ia32_am_offs(ir_node *node, char *offset, char op) {
+void add_ia32_am_offs_int(ir_node *node, int offset) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-
-	if (! offset || strlen(offset) < 1)
-		return;
-
-	/* offset could already have an explicit sign */
-	/* -> supersede op if necessary               */
-	if (offset[0] == '-' || offset[0] == '+') {
-		if (offset[0] == '-') {
-			op = (op == '-') ? '+' : '-';
-		}
-
-		/* skip explicit sign */
-		offset++;
-	}
-
-	if (! attr->am_offs) {
-		/* obstack is not initialized */
-		attr->am_offs = xcalloc(1, sizeof(*(attr->am_offs)));
-		obstack_init(attr->am_offs);
-
-		attr->data.offs_sign = (op == '-') ? 1 : 0;
-	}
-	else {
-		/* If obstack is initialized, connect the new offset with op */
-		obstack_printf(attr->am_offs, "%c", op);
-	}
-
-	obstack_printf(attr->am_offs, "%s", offset);
-}
-
-/**
- * Add an offset for addrmode.
- */
-void add_ia32_am_offs(ir_node *node, const char *offset) {
-	extend_ia32_am_offs(node, (char *)offset, '+');
-}
-
-/**
- * Sub an offset for addrmode.
- */
-void sub_ia32_am_offs(ir_node *node, const char *offset) {
-	extend_ia32_am_offs(node, (char *)offset, '-');
+	attr->am_offs += 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;
 }
 
 /**
@@ -565,7 +516,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;
 }
 
@@ -573,84 +524,29 @@ 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);
-    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->cnst_val.tv = tv;
-	attr->cnst        = get_ident_for_tv(tv);
-}
-
-/**
- * Return the sc attribute.
- */
-ident *get_ia32_sc(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->cnst_val.sc;
-}
-
-/**
- * Sets the sc attribute.
- */
-void set_ia32_sc(ir_node *node, ident *sc) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->cnst_val.sc = sc;
-	attr->cnst        = attr->cnst_val.sc;
-}
-
-/**
- * Gets the string representation of the internal const (tv or symconst)
- */
-const char *get_ia32_cnst(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	if (! attr->cnst)
-		return NULL;
-	return get_id_str(attr->cnst);
-}
-
-/**
- * Sets the string representation of the internal const.
- */
-void set_ia32_cnst(ir_node *node, char *cnst) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->cnst        = new_id_from_str(cnst);
-}
-
-/**
- * Gets the ident representation of the internal const (tv or symconst)
- */
-ident *get_ia32_id_cnst(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->cnst;
-}
-
-/**
- * Sets the ident representation of the internal const.
- */
-void set_ia32_id_cnst(ir_node *node, ident *cnst) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->cnst        = cnst;
+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);
 }
 
 /**
@@ -673,7 +569,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;
 }
 
@@ -697,34 +593,10 @@ 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;
-}
-
-/**
- * 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;
-}
-
-/**
- * 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;
-}
-
 /**
  * Sets node got_lea.
  */
@@ -745,102 +617,90 @@ void clear_ia32_got_lea(ir_node *node) {
  * Checks if node got lea.
  */
 int is_ia32_got_lea(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.got_lea;
 }
 
-/**
- * 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);
-	return attr->ls_mode;
+void set_ia32_need_stackent(ir_node *node) {
+	ia32_attr_t *attr     = get_ia32_attr(node);
+	attr->data.need_stackent = 1;
 }
 
-/**
- * Sets the mode of the stored/loaded value (only set for Store/Load)
- */
-void set_ia32_ls_mode(ir_node *node, ir_mode *mode) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->ls_mode     = mode;
+void clear_ia32_need_stackent(ir_node *node) {
+	ia32_attr_t *attr     = get_ia32_attr(node);
+	attr->data.need_stackent = 0;
 }
 
-/**
- * Gets the mode of the result.
- */
-ir_mode *get_ia32_res_mode(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->res_mode;
+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 the mode of the result.
+ * Gets the mode of the stored/loaded value (only set for Store/Load)
  */
-void set_ia32_res_mode(ir_node *node, ir_mode *mode) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->res_mode    = mode;
+ir_mode *get_ia32_ls_mode(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->ls_mode;
 }
 
 /**
- * Gets the source mode of conversion.
+ * Sets the mode of the stored/loaded value (only set for Store/Load)
  */
-ir_mode *get_ia32_src_mode(const ir_node *node) {
+void set_ia32_ls_mode(ir_node *node, ir_mode *mode) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->src_mode;
+	attr->ls_mode     = mode;
 }
 
 /**
- * Sets the source mode of conversion.
+ * Gets the frame entity assigned to this node.
  */
-void set_ia32_src_mode(ir_node *node, ir_mode *mode) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->src_mode    = mode;
+ir_entity *get_ia32_frame_ent(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->frame_ent;
 }
 
 /**
- * Gets the target mode of conversion.
+ * Sets the frame entity for this node.
  */
-ir_mode *get_ia32_tgt_mode(const ir_node *node) {
+void set_ia32_frame_ent(ir_node *node, ir_entity *ent) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->tgt_mode;
+	attr->frame_ent   = ent;
+	if(ent != NULL)
+		set_ia32_use_frame(node);
+	else
+		clear_ia32_use_frame(node);
 }
 
-/**
- * Sets the target mode of conversion.
- */
-void set_ia32_tgt_mode(ir_node *node, ir_mode *mode) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->tgt_mode    = mode;
-}
 
 /**
- * Gets the frame entity assigned to this node;
+ * Gets the instruction latency.
  */
-entity *get_ia32_frame_ent(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->frame_ent;
+unsigned get_ia32_latency(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->latency;
 }
 
 /**
- * Sets the frame entity for this node;
- */
-void set_ia32_frame_ent(ir_node *node, entity *ent) {
+* Sets the instruction latency.
+*/
+void set_ia32_latency(ir_node *node, unsigned latency) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->frame_ent   = ent;
+	attr->latency     = latency;
 }
 
 /**
  * Returns the argument register requirements of an ia32 node.
  */
-const ia32_register_req_t **get_ia32_in_req_all(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+const arch_register_req_t **get_ia32_in_req_all(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->in_req;
 }
 
 /**
  * Sets the argument register requirements of an ia32 node.
  */
-void set_ia32_in_req_all(ir_node *node, const ia32_register_req_t **reqs) {
+void set_ia32_in_req_all(ir_node *node, const arch_register_req_t **reqs) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->in_req      = reqs;
 }
@@ -848,15 +708,15 @@ void set_ia32_in_req_all(ir_node *node, const ia32_register_req_t **reqs) {
 /**
  * Returns the result register requirements of an ia32 node.
  */
-const ia32_register_req_t **get_ia32_out_req_all(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+const arch_register_req_t **get_ia32_out_req_all(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->out_req;
 }
 
 /**
  * Sets the result register requirements of an ia32 node.
  */
-void set_ia32_out_req_all(ir_node *node, const ia32_register_req_t **reqs) {
+void set_ia32_out_req_all(ir_node *node, const arch_register_req_t **reqs) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->out_req     = reqs;
 }
@@ -864,23 +724,29 @@ void set_ia32_out_req_all(ir_node *node, const ia32_register_req_t **reqs) {
 /**
  * Returns the argument register requirement at position pos of an ia32 node.
  */
-const ia32_register_req_t *get_ia32_in_req(const ir_node *node, int pos) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+const arch_register_req_t *get_ia32_in_req(const ir_node *node, int pos) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	if(attr->in_req == NULL)
+		return arch_no_register_req;
+
 	return attr->in_req[pos];
 }
 
 /**
  * Returns the result register requirement at position pos of an ia32 node.
  */
-const ia32_register_req_t *get_ia32_out_req(const ir_node *node, int pos) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+const arch_register_req_t *get_ia32_out_req(const ir_node *node, int pos) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	if(attr->out_req == NULL)
+		return arch_no_register_req;
+
 	return attr->out_req[pos];
 }
 
 /**
  * Sets the OUT register requirements at position pos.
  */
-void set_ia32_req_out(ir_node *node, const ia32_register_req_t *req, int pos) {
+void set_ia32_req_out(ir_node *node, const arch_register_req_t *req, int pos) {
 	ia32_attr_t *attr  = get_ia32_attr(node);
 	attr->out_req[pos] = req;
 }
@@ -888,7 +754,7 @@ void set_ia32_req_out(ir_node *node, const ia32_register_req_t *req, int pos) {
 /**
  * Sets the IN register requirements at position pos.
  */
-void set_ia32_req_in(ir_node *node, const ia32_register_req_t *req, int pos) {
+void set_ia32_req_in(ir_node *node, const arch_register_req_t *req, int pos) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->in_req[pos] = req;
 }
@@ -897,7 +763,7 @@ void set_ia32_req_in(ir_node *node, const ia32_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;
 }
 
@@ -913,56 +779,76 @@ void set_ia32_flags(ir_node *node, arch_irn_flags_t 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.
+ * Returns 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;
+int get_ia32_n_res(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return ARR_LEN(attr->slots);
 }
 
 /**
- * Returns the number of results.
+ * Returns the projnum code.
  */
-int get_ia32_n_res(const ir_node *node) {
+long get_ia32_pncode(const ir_node *node)
+{
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->pn_code;
+}
+
+/**
+ * Sets the projnum code
+ */
+void set_ia32_pncode(ir_node *node, long code)
+{
 	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.n_res;
+	attr->pn_code     = code;
 }
 
 /**
- * Returns the flavour of an ia32 node,
+ * Sets the flags for the n'th out.
  */
-ia32_op_flavour_t get_ia32_flavour(const ir_node *node) {
+void set_ia32_out_flags(ir_node *node, arch_irn_flags_t flags, int pos) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.op_flav;
+	assert(pos < ARR_LEN(attr->out_flags) && "Invalid OUT position.");
+	attr->out_flags[pos] = flags;
 }
 
 /**
- * Sets the flavour of an ia32 node to flavour_Div/Mod/DivMod/Mul/Mulh.
+ * Gets the flags for the n'th out.
  */
-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;
+arch_irn_flags_t get_ia32_out_flags(const ir_node *node, int pos) {
+	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];
 }
 
 /**
- * Returns the projnum code.
+ * Get the list of available execution units.
  */
-long get_ia32_pncode(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->pn_code;
+const be_execution_unit_t ***get_ia32_exec_units(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->exec_units;
 }
 
 /**
- * Sets the projnum code
+ * Get the exception label attribute.
  */
-void set_ia32_pncode(ir_node *node, long code) {
+unsigned get_ia32_exc_label(const ir_node *node) {
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->data.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->pn_code     = code;
+	attr->data.except_label = flag;
 }
 
 #ifndef NDEBUG
@@ -971,7 +857,7 @@ void set_ia32_pncode(ir_node *node, long code) {
  * 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;
 }
 
@@ -996,102 +882,6 @@ void set_ia32_orig_node(ir_node *node, const char *name) {
  *     |_|
  ******************************************************************************************************/
 
-/**
- * Gets the type of an ia32_Const.
- */
-unsigned get_ia32_Const_type(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-
-	assert(is_ia32_Cnst(node) && "Need ia32_Const to get type");
-
-	return attr->data.tp;
-}
-
-/**
- * Sets the type of an ia32_Const.
- */
-void set_ia32_Const_type(ir_node *node, int type) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-
-	assert(is_ia32_Cnst(node) && "Need ia32_Const to set type");
-	assert((type == ia32_Const || type == ia32_SymConst) && "Unsupported ia32_Const type");
-
-	attr->data.tp = type;
-}
-
-/**
- * Copy the attributes from an ia32_Const to an Immop (Add_i, Sub_i, ...) node
- */
-void set_ia32_Immop_attr(ir_node *node, ir_node *cnst) {
-	ia32_attr_t *na = get_ia32_attr(node);
-	ia32_attr_t *ca = get_ia32_attr(cnst);
-
-	switch(get_ia32_Const_type(cnst)) {
-		case ia32_Const:
-			na->cnst_val.tv = ca->cnst_val.tv;
-			na->cnst        = ca->cnst;
-			set_ia32_immop_type(node, ia32_ImmConst);
-			break;
-		case ia32_SymConst:
-			na->cnst_val.sc = ca->cnst_val.sc;
-			na->cnst        = na->cnst_val.sc;
-			set_ia32_immop_type(node, ia32_ImmSymConst);
-			break;
-		default:
-			assert(0 && "Need ia32_Const to set Immop attr");
-	}
-}
-
-/**
- * Copy the attributes from Immop to an Immop
- */
-void copy_ia32_Immop_attr(ir_node *dst, ir_node *src) {
-	ia32_attr_t *da = get_ia32_attr(dst);
-	ia32_attr_t *sa = get_ia32_attr(src);
-
-	switch(get_ia32_immop_type(src)) {
-		case ia32_ImmConst:
-			da->cnst_val.tv = sa->cnst_val.tv;
-			da->cnst        = sa->cnst;
-			set_ia32_immop_type(dst, ia32_ImmConst);
-			break;
-		case ia32_ImmSymConst:
-			da->cnst_val.sc = sa->cnst_val.sc;
-			da->cnst        = sa->cnst;
-			set_ia32_immop_type(dst, ia32_ImmSymConst);
-			break;
-		default:
-			assert(0 && "Need Immop to copy Immop attr");
-	}
-}
-
-/**
- * Copy the attributes from a Firm Const to an ia32_Const
- */
-void set_ia32_Const_attr(ir_node *ia32_cnst, ir_node *cnst) {
-	ia32_attr_t *attr = get_ia32_attr(ia32_cnst);
-
-	assert(is_ia32_Cnst(ia32_cnst) && "Need ia32_Const to set Const attr");
-
-	switch (get_irn_opcode(cnst)) {
-		case iro_Const:
-			attr->data.tp     = ia32_Const;
-			attr->cnst_val.tv = get_Const_tarval(cnst);
-			attr->cnst        = get_ident_for_tv(attr->cnst_val.tv);
-			break;
-		case iro_SymConst:
-			attr->data.tp     = ia32_SymConst;
-			attr->cnst_val.sc = get_sc_ident(cnst);
-			attr->cnst        = attr->cnst_val.sc;
-			break;
-		case iro_Unknown:
-			assert(0 && "Unknown Const NYI");
-			break;
-		default:
-			assert(0 && "Cannot create ia32_Const for this opcode");
-	}
-}
-
 /**
  * Sets the AddrMode(S|D) attribute
  */
@@ -1110,27 +900,11 @@ void set_ia32_AddrMode(ir_node *node, char direction) {
 	}
 }
 
-/**
- * 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);
 }
 
@@ -1138,7 +912,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);
 }
 
@@ -1146,31 +920,33 @@ int is_ia32_AddrModeD(const ir_node *node) {
  * Checks if node is a Load or xLoad/vfLoad.
  */
 int is_ia32_Ld(const ir_node *node) {
-	return is_ia32_Load(node) || is_ia32_xLoad(node) || is_ia32_vfld(node) || is_ia32_fld(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) {
-	return is_ia32_Store(node) || is_ia32_xStore(node) || is_ia32_vfst(node) || is_ia32_fst(node) || is_ia32_fstp(node);
-}
-
-/**
- * Checks if node is a Const or xConst/vfConst.
- */
-int is_ia32_Cnst(const ir_node *node) {
-	return is_ia32_Const(node) || is_ia32_xConst(node) || is_ia32_vfConst(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) {
-	ia32_attr_t *attr = get_ia32_attr(node);
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
 
-	assert(is_ia32_irn(node) && "Not an ia32 node.");
-	assert(pos < 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]);
@@ -1180,23 +956,34 @@ 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(is_ia32_irn(node) && "Not an ia32 node.");
-	assert(pos < 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);
+
+	attr->data.cmp_flipped = !attr->data.cmp_flipped;
+	assert(is_ia32_commutative(node));
+	set_irn_n(node, n_ia32_binary_left,  right);
+	set_irn_n(node, n_ia32_binary_right, left);
+	set_ia32_pncode(node, get_inversed_pnc(get_ia32_pncode(node)));
+}
+
 /**
  * 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(is_ia32_irn(node) && "Not an ia32 node.");
-	assert(pos < 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];
@@ -1205,16 +992,78 @@ const arch_register_t *get_ia32_out_reg(const ir_node *node, int pos) {
 /**
  * Initializes the nodes attributes.
  */
-void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, const ia32_register_req_t **in_reqs,
-						  const ia32_register_req_t **out_reqs, int n_res)
+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)
 {
-	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;
+#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);
+	/* void* cast to suppress an incorrect warning on MSVC */
+	memset((void*)attr->slots, 0, n_res * sizeof(attr->slots[0]));
+}
 
-	attr->data.n_res = n_res;
-	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;
+#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;
+#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->attr.data.am_sc_sign = symconst_sign;
+	attr->offset               = offset;
+}
+
+ir_node *get_ia32_result_proj(const ir_node *node)
+{
+	const ir_edge_t *edge;
+
+	foreach_out_edge(node, edge) {
+		ir_node *proj = get_edge_src_irn(edge);
+		if(get_Proj_proj(proj) == 0) {
+			return proj;
+		}
+	}
+	return NULL;
 }
 
 /***************************************************************************************
@@ -1227,28 +1076,109 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, const ia32_regi
  *
  ***************************************************************************************/
 
-/* default compare operation to compare immediate ops */
-int ia32_compare_immop_attr(ia32_attr_t *a, ia32_attr_t *b) {
-	int equ = 0;
+/* default compare operation to compare attributes */
+int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b) {
+	if (a->data.tp != b->data.tp)
+		return 1;
 
-	if (a->data.tp == b->data.tp) {
-		equ = (a->cnst == b->cnst);
-		equ = equ ? (a->data.use_frame == b->data.use_frame) : 0;
+	if (a->data.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 (equ && a->data.use_frame && b->data.use_frame)
-			equ = (a->frame_ent == b->frame_ent);
-	}
+	/* 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->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)
+		return 1;
+
+	if (a->data.cmp_flipped != b->data.cmp_flipped
+			|| a->data.cmp_unsigned != b->data.cmp_unsigned)
+		return 1;
+
+	return 0;
+}
+
+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);
+}
 
-	return !equ;
+static
+int ia32_compare_x87_attr(ir_node *a, ir_node *b)
+{
+	return ia32_compare_nodes_attr(a, b);
+}
+
+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;
 }
 
-/* compare converts */
-int ia32_compare_conv_attr(ia32_attr_t *a, ia32_attr_t *b) {
-	int equ = ! ia32_compare_immop_attr(a, b);
+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->attr.data.am_sc_sign != attr_b->attr.data.am_sc_sign ||
+	   attr_a->offset != attr_b->offset)
+		return 1;
 
-	equ = equ ? (a->src_mode == b->src_mode) && (a->tgt_mode == b->tgt_mode) : equ;
+	return 0;
+}
 
-	return !equ;
+/* 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 */