X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=fb614d999a3277043ceb504ac3c7fc9907c88f56;hb=1a1fe2580a53eaaadf545f474ebb67708d4e3d57;hp=1c1aaea4c0775198c301f12f23058122cfa33c6f;hpb=61f4d246e707173f272e6ead6f42360a4674f951;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index 1c1aaea4c..fb614d999 100644
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -4,9 +4,8 @@
  * @author Christian Wuerdig
  * $Id$
  */
-
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef HAVE_MALLOC_H
@@ -29,12 +28,34 @@
 #include "firm_common_t.h"
 #include "irvrfy_t.h"
 #include "irprintf.h"
+#include "iredges.h"
+#include "error.h"
+#include "raw_bitset.h"
 
 #include "../bearch.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.
@@ -42,25 +63,12 @@
  * @return The ident of the SymConst
  */
 static ident *get_sc_ident(ir_node *symc) {
-	entity  *ent;
-	ir_type *owner;
-	ident   *id;
-
 	switch (get_SymConst_kind(symc)) {
 		case symconst_addr_name:
 			return get_SymConst_name(symc);
 
 		case symconst_addr_ent:
-			ent   = get_SymConst_entity(symc);
-			owner = get_entity_owner(ent);
-			id    = get_entity_ld_ident(ent);
-			if (owner == get_tls_type()) {
-				if (get_entity_visibility(ent) == visibility_external_allocated)
-					id = mangle(id, new_id_from_chars("@INDNTPOFF", 10));
-				else
-					id = mangle(id, new_id_from_chars("@NTPOFF", 7));
-			}
-			return id;
+			return ia32_get_ent_ident(get_SymConst_entity(symc));
 
 		default:
 			assert(0 && "Unsupported SymConst");
@@ -69,7 +77,13 @@ static ident *get_sc_ident(ir_node *symc) {
 	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);
+}
 
 /***********************************************************************************
  *      _                                   _       _             __
@@ -82,69 +96,41 @@ 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));
 			}
 
-			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");
@@ -168,7 +154,7 @@ 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;
+	const arch_register_req_t **reqs;
 	const arch_register_t     **slots;
 
 	switch (reason) {
@@ -187,11 +173,17 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			break;
 
 		case dump_node_nodeattr_txt:
-			if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n) || is_ia32_Cnst(n)) {
-				char       *pref = is_ia32_ImmSymConst(n) || (get_ia32_op_type(n) == ia32_SymConst) ? "SymC " : "";
-				const char *cnst = get_ia32_cnst(n);
-
-				fprintf(F, "[%s%s]", pref, cnst ? cnst : "NONE");
+			if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n)) {
+				if(is_ia32_ImmSymConst(n)) {
+					ident *id = get_ia32_Immop_symconst(n);
+					fprintf(F, "[SymC %s]", get_id_str(id));
+				} else {
+					char buf[128];
+					tarval *tv = get_ia32_Immop_tarval(n);
+
+					tarval_snprintf(buf, sizeof(buf), tv);
+					fprintf(F, "[%s]", buf);
+				}
 			}
 
 			if (! is_ia32_Lea(n)) {
@@ -225,7 +217,15 @@ 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;
+
+					/* retrieve "real" x87 register */
+					if (ia32_has_x87_register(n))
+						reg = get_ia32_attr(n)->x87[i + 2];
+					else
+						reg = slots[i];
+
+					fprintf(F, "reg #%d = %s\n", i, reg ? arch_register_get_name(reg) : "n/a");
 				}
 				fprintf(F, "\n");
 			}
@@ -236,12 +236,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;
@@ -316,20 +310,26 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			fprintf(F, " (%d)\n", am_flav);
 
 			/* dump AM offset */
-			fprintf(F, "AM offset = ");
-			if (get_ia32_am_offs(n)) {
-				fprintf(F, "%s", get_ia32_am_offs(n));
+			if(get_ia32_am_offs_int(n) != 0) {
+				fprintf(F, "AM offset = %d\n", get_ia32_am_offs_int(n));
 			}
-			else {
-				fprintf(F, "n/a");
+
+			/* dump AM symconst */
+			if(get_ia32_am_sc(n) != NULL) {
+				fprintf(F, "AM symconst = %s\n", get_id_str(get_ia32_am_sc(n)));
 			}
-			fprintf(F, "\n");
 
 			/* dump AM scale */
 			fprintf(F, "AM scale = %d\n", get_ia32_am_scale(n));
 
 			/* dump pn code */
-			fprintf(F, "pn_code = %ld\n", get_ia32_pncode(n));
+			if(get_ia32_pncode(n) & ia32_pn_Cmp_Unsigned) {
+				fprintf(F, "pn_code = %d (%s, unsigned)\n", get_ia32_pncode(n),
+				        get_pnc_string(get_ia32_pncode(n) & ~ia32_pn_Cmp_Unsigned));
+			} else {
+				fprintf(F, "pn_code = %d (%s)\n", get_ia32_pncode(n),
+				        get_pnc_string(get_ia32_pncode(n)));
+			}
 
 			/* dump n_res */
 			fprintf(F, "n_res = %d\n", get_ia32_n_res(n));
@@ -346,8 +346,8 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			/* got lea */
 			fprintf(F, "got loea = %d\n", is_ia32_got_lea(n));
 
-			/* got reload */
-			fprintf(F, "got reload = %d\n", is_ia32_got_reload(n));
+			/* need stackent */
+			fprintf(F, "need stackent = %d\n", is_ia32_need_stackent(n));
 
 			/* dump latency */
 			fprintf(F, "latency = %d\n", get_ia32_latency(n));
@@ -394,33 +394,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			}
 			fprintf(F, "\n");
 
-			fprintf(F, "res_mode = ");
-			if (get_ia32_res_mode(n)) {
-				ir_fprintf(F, "%+F", get_ia32_res_mode(n));
-			}
-			else {
-				fprintf(F, "n/a");
-			}
-			fprintf(F, "\n");
-
-			fprintf(F, "src_mode = ");
-			if (get_ia32_src_mode(n)) {
-				ir_fprintf(F, "%+F", get_ia32_src_mode(n));
-			}
-			else {
-				fprintf(F, "n/a");
-			}
-			fprintf(F, "\n");
-
-			fprintf(F, "tgt_mode = ");
-			if (get_ia32_tgt_mode(n)) {
-				ir_fprintf(F, "%+F", get_ia32_tgt_mode(n));
-			}
-			else {
-				fprintf(F, "n/a");
-			}
-			fprintf(F, "\n");
-
 #ifndef NDEBUG
 			/* dump original ir node name */
 			fprintf(F, "orig node = ");
@@ -454,16 +427,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
  *                                       |___/
  ***************************************************************************************************/
 
-/**
- * Returns an ident for the given tarval tv.
- */
-static ident *get_ident_for_tv(tarval *tv) {
-	char buf[1024];
-	int len = tarval_snprintf(buf, sizeof(buf), tv);
-	assert(len);
-	return new_id_from_str(buf);
-}
-
 /**
  * Wraps get_irn_generic_attr() as it takes no const ir_node, so we need to do a cast.
  * Firm was made by people hating const :-(
@@ -497,14 +460,6 @@ ia32_immop_type_t get_ia32_immop_type(const ir_node *node) {
 	return attr->data.imm_tp;
 }
 
-/**
- * Sets the immediate op type of an ia32 node.
- */
-void set_ia32_immop_type(ir_node *node, ia32_immop_type_t tp) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->data.imm_tp = tp;
-}
-
 /**
  * Gets the supported addrmode of an ia32 node
  */
@@ -538,61 +493,24 @@ void set_ia32_am_flavour(ir_node *node, ia32_am_flavour_t am_flavour) {
 }
 
 /**
- * Joins all offsets to one string with adds.
+ * Gets the addressmode offset as int.
  */
-char *get_ia32_am_offs(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	static char res[64];
-
-	if (! attr->am_offs) {
-		return NULL;
-	}
-
-	snprintf(res, sizeof(res), "%+ld", attr->am_offs);
-
-	return res;
-}
-
-/**
- * Gets the addressmode offset as long.
- */
-long get_ia32_am_offs_long(const ir_node *node) {
+int get_ia32_am_offs_int(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	return attr->am_offs;
 }
 
 /**
- * Add an offset for addrmode.
+ * Sets the addressmode offset from an int.
  */
-static void extend_ia32_am_offs(ir_node *node, char *offset, char op) {
+void set_ia32_am_offs_int(ir_node *node, int offset) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	int o;
-
-	if (! offset || strlen(offset) < 1)
-		return;
-
-	assert(sscanf(offset, "%d", &o) == 1);
-
-	if (op == '-')
-		attr->am_offs -= o;
-	else if (op == '+')
-		attr->am_offs += o;
-	else
-		assert(0);
+	attr->am_offs = 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, '-');
+void add_ia32_am_offs_int(ir_node *node, int offset) {
+	ia32_attr_t *attr = get_ia32_attr(node);
+	attr->am_offs += offset;
 }
 
 /**
@@ -656,6 +574,7 @@ void set_ia32_am_scale(ir_node *node, int scale) {
  */
 tarval *get_ia32_Immop_tarval(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
+	assert(attr->data.imm_tp == ia32_ImmConst);
     return attr->cnst_val.tv;
 }
 
@@ -664,42 +583,20 @@ tarval *get_ia32_Immop_tarval(const ir_node *node) {
  */
 void set_ia32_Immop_tarval(ir_node *node, tarval *tv) {
 	ia32_attr_t *attr = get_ia32_attr(node);
+	attr->data.imm_tp = ia32_ImmConst;
 	attr->cnst_val.tv = tv;
-	attr->cnst        = get_ident_for_tv(tv);
 }
 
-/**
- * Gets the string representation of the internal const (tv or symconst)
- */
-const char *get_ia32_cnst(const ir_node *node) {
+void set_ia32_Immop_symconst(ir_node *node, ident *ident) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	if (! attr->cnst)
-		return NULL;
-	return get_id_str(attr->cnst);
+	attr->data.imm_tp = ia32_ImmSymConst;
+	attr->cnst_val.sc = ident;
 }
 
-/**
- * Sets the string representation of the internal const.
- */
-void set_ia32_cnst(ir_node *node, char *cnst) {
+ident *get_ia32_Immop_symconst(const ir_node *node) {
 	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;
+	assert(attr->data.imm_tp == ia32_ImmSymConst);
+	return attr->cnst_val.sc;
 }
 
 /**
@@ -798,28 +695,19 @@ int is_ia32_got_lea(const ir_node *node) {
 	return attr->data.got_lea;
 }
 
-/**
- * Sets node got_reload.
- */
-void set_ia32_got_reload(ir_node *node) {
+void set_ia32_need_stackent(ir_node *node) {
 	ia32_attr_t *attr     = get_ia32_attr(node);
-	attr->data.got_reload = 1;
+	attr->data.need_stackent = 1;
 }
 
-/**
- * Clears node got_reload.
- */
-void clear_ia32_got_reload(ir_node *node) {
+void clear_ia32_need_stackent(ir_node *node) {
 	ia32_attr_t *attr     = get_ia32_attr(node);
-	attr->data.got_reload = 0;
+	attr->data.need_stackent = 0;
 }
 
-/**
- * Checks if node got reload.
- */
-int is_ia32_got_reload(const ir_node *node) {
+int is_ia32_need_stackent(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->data.got_reload;
+	return attr->data.need_stackent;
 }
 
 /**
@@ -838,58 +726,10 @@ void set_ia32_ls_mode(ir_node *node, ir_mode *mode) {
 	attr->ls_mode     = mode;
 }
 
-/**
- * Gets the mode of the result.
- */
-ir_mode *get_ia32_res_mode(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->res_mode;
-}
-
-/**
- * Sets the mode of the result.
- */
-void set_ia32_res_mode(ir_node *node, ir_mode *mode) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->res_mode    = mode;
-}
-
-/**
- * Gets the source mode of conversion.
- */
-ir_mode *get_ia32_src_mode(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->src_mode;
-}
-
-/**
- * Sets the source mode of conversion.
- */
-void set_ia32_src_mode(ir_node *node, ir_mode *mode) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->src_mode    = mode;
-}
-
-/**
- * Gets the target mode of conversion.
- */
-ir_mode *get_ia32_tgt_mode(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	return attr->tgt_mode;
-}
-
-/**
- * Sets the target mode of conversion.
- */
-void set_ia32_tgt_mode(ir_node *node, ir_mode *mode) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->tgt_mode    = mode;
-}
-
 /**
  * Gets the frame entity assigned to this node.
  */
-entity *get_ia32_frame_ent(const ir_node *node) {
+ir_entity *get_ia32_frame_ent(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	return attr->frame_ent;
 }
@@ -897,10 +737,13 @@ entity *get_ia32_frame_ent(const ir_node *node) {
 /**
  * Sets the frame entity for this node.
  */
-void set_ia32_frame_ent(ir_node *node, entity *ent) {
+void set_ia32_frame_ent(ir_node *node, ir_entity *ent) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->frame_ent   = ent;
-	set_ia32_use_frame(node);
+	if(ent != NULL)
+		set_ia32_use_frame(node);
+	else
+		clear_ia32_use_frame(node);
 }
 
 
@@ -923,7 +766,7 @@ void set_ia32_latency(ir_node *node, unsigned latency) {
 /**
  * Returns the argument register requirements of an ia32 node.
  */
-const ia32_register_req_t **get_ia32_in_req_all(const ir_node *node) {
+const arch_register_req_t **get_ia32_in_req_all(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	return attr->in_req;
 }
@@ -931,7 +774,7 @@ const ia32_register_req_t **get_ia32_in_req_all(const ir_node *node) {
 /**
  * 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;
 }
@@ -939,7 +782,7 @@ 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) {
+const arch_register_req_t **get_ia32_out_req_all(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	return attr->out_req;
 }
@@ -947,7 +790,7 @@ const ia32_register_req_t **get_ia32_out_req_all(const ir_node *node) {
 /**
  * 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;
 }
@@ -955,23 +798,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) {
+const arch_register_req_t *get_ia32_in_req(const ir_node *node, int pos) {
 	ia32_attr_t *attr = get_ia32_attr(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) {
+const arch_register_req_t *get_ia32_out_req(const ir_node *node, int pos) {
 	ia32_attr_t *attr = get_ia32_attr(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;
 }
@@ -979,7 +828,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;
 }
@@ -1043,7 +892,7 @@ void set_ia32_flavour(ir_node *node, ia32_op_flavour_t op_flav) {
 /**
  * Returns the projnum code.
  */
-long get_ia32_pncode(const ir_node *node) {
+pn_Cmp get_ia32_pncode(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	return attr->pn_code;
 }
@@ -1051,11 +900,36 @@ long get_ia32_pncode(const ir_node *node) {
 /**
  * Sets the projnum code
  */
-void set_ia32_pncode(ir_node *node, long code) {
+void set_ia32_pncode(ir_node *node, pn_Cmp code) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->pn_code     = code;
 }
 
+/**
+ * Sets the flags for the n'th out.
+ */
+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.");
+	attr->out_flags[pos] = flags;
+}
+
+/**
+ * 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;
+}
+
+/**
+ * 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);
+	return attr->exec_units;
+}
+
 #ifndef NDEBUG
 
 /**
@@ -1087,72 +961,20 @@ void set_ia32_orig_node(ir_node *node, const char *name) {
  *     |_|
  ******************************************************************************************************/
 
-/**
- * Gets the type of an ia32_Const.
- */
-unsigned get_ia32_Const_type(const ir_node *node) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-
-	assert(is_ia32_Cnst(node) && "Need ia32_Const to get type");
-
-	return attr->data.tp;
-}
-
-/**
- * Sets the type of an ia32_Const.
- */
-void set_ia32_Const_type(ir_node *node, int type) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-
-	assert(is_ia32_Cnst(node) && "Need ia32_Const to set type");
-	assert((type == ia32_Const || type == ia32_SymConst) && "Unsupported ia32_Const type");
-
-	attr->data.tp = type;
-}
-
 /**
  * Copy the attributes from an ia32_Const to an Immop (Add_i, Sub_i, ...) node
  */
-void set_ia32_Immop_attr(ir_node *node, ir_node *cnst) {
-	ia32_attr_t *na = get_ia32_attr(node);
-	ia32_attr_t *ca = get_ia32_attr(cnst);
-
-	switch(get_ia32_Const_type(cnst)) {
-		case ia32_Const:
-			na->cnst_val.tv = ca->cnst_val.tv;
-			na->cnst        = ca->cnst;
-			set_ia32_immop_type(node, ia32_ImmConst);
-			break;
-		case ia32_SymConst:
-			na->cnst_val.sc = ca->cnst_val.sc;
-			na->cnst        = na->cnst_val.sc;
-			set_ia32_immop_type(node, ia32_ImmSymConst);
-			break;
-		default:
-			assert(0 && "Need ia32_Const to set Immop attr");
-	}
-}
-
-/**
- * Copy the attributes from Immop to an Immop
- */
-void copy_ia32_Immop_attr(ir_node *dst, ir_node *src) {
-	ia32_attr_t *da = get_ia32_attr(dst);
-	ia32_attr_t *sa = get_ia32_attr(src);
-
-	switch(get_ia32_immop_type(src)) {
-		case ia32_ImmConst:
-			da->cnst_val.tv = sa->cnst_val.tv;
-			da->cnst        = sa->cnst;
-			set_ia32_immop_type(dst, ia32_ImmConst);
-			break;
-		case ia32_ImmSymConst:
-			da->cnst_val.sc = sa->cnst_val.sc;
-			da->cnst        = sa->cnst;
-			set_ia32_immop_type(dst, ia32_ImmSymConst);
-			break;
-		default:
-			assert(0 && "Need Immop to copy Immop attr");
+void copy_ia32_Immop_attr(ir_node *node, ir_node *from) {
+	ia32_immop_type_t immop_type = get_ia32_immop_type(from);
+
+	if(immop_type == ia32_ImmConst) {
+		set_ia32_Immop_tarval(node, get_ia32_Immop_tarval(from));
+	} else if(immop_type == ia32_ImmSymConst) {
+		set_ia32_Immop_symconst(node, get_ia32_Immop_symconst(from));
+	} else {
+		ia32_attr_t *attr = get_ia32_attr(node);
+		assert(immop_type == ia32_ImmNone);
+		attr->data.imm_tp = ia32_ImmNone;
 	}
 }
 
@@ -1160,25 +982,14 @@ void copy_ia32_Immop_attr(ir_node *dst, ir_node *src) {
  * Copy the attributes from a Firm Const/SymConst to an ia32_Const
  */
 void set_ia32_Const_attr(ir_node *ia32_cnst, ir_node *cnst) {
-	ia32_attr_t *attr = get_ia32_attr(ia32_cnst);
-	ir_mode *mode;
-
 	assert(is_ia32_Cnst(ia32_cnst) && "Need ia32_Const to set Const attr");
 
 	switch (get_irn_opcode(cnst)) {
 		case iro_Const:
-			attr->data.tp     = ia32_Const;
-			attr->cnst_val.tv = get_Const_tarval(cnst);
-			mode = get_tarval_mode(attr->cnst_val.tv);
-			if (mode_is_reference(mode) &&
-			    get_mode_null(mode) == attr->cnst_val.tv)
-				attr->cnst_val.tv = get_mode_null(mode_Is);
-			attr->cnst        = get_ident_for_tv(attr->cnst_val.tv);
+			set_ia32_Const_tarval(ia32_cnst, get_Const_tarval(cnst));
 			break;
 		case iro_SymConst:
-			attr->data.tp     = ia32_SymConst;
-			attr->cnst_val.sc = get_sc_ident(cnst);
-			attr->cnst        = attr->cnst_val.sc;
+			set_ia32_Immop_symconst(ia32_cnst, get_sc_ident(cnst));
 			break;
 		case iro_Unknown:
 			assert(0 && "Unknown Const NYI");
@@ -1188,6 +999,23 @@ void set_ia32_Const_attr(ir_node *ia32_cnst, ir_node *cnst) {
 	}
 }
 
+void set_ia32_Const_tarval(ir_node *ia32_cnst, tarval *tv) {
+	if(mode_is_reference(get_tarval_mode(tv))) {
+		if(tarval_is_null(tv)) {
+			tv = get_tarval_null(mode_Iu);
+		} else {
+			panic("Can't convert reference tarval to mode_Iu at %+F", ia32_cnst);
+		}
+	} else {
+		tv = tarval_convert_to(tv, mode_Iu);
+	}
+
+	assert(tv != get_tarval_bad() && tv != get_tarval_undefined()
+			&& tv != NULL);
+	set_ia32_Immop_tarval(ia32_cnst, tv);
+}
+
+
 /**
  * Sets the AddrMode(S|D) attribute
  */
@@ -1242,21 +1070,24 @@ 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);
+	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) {
-	return is_ia32_Const(node) || is_ia32_xConst(node) || is_ia32_vfConst(node);
+	int op = get_ia32_irn_opcode(node);
+	return op == iro_ia32_Const || op == iro_ia32_xConst || op == iro_ia32_vfConst;
 }
 
 /**
@@ -1265,7 +1096,6 @@ int is_ia32_Cnst(const ir_node *node) {
 const char *get_ia32_out_reg_name(const ir_node *node, int pos) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 
-	assert(is_ia32_irn(node) && "Not an ia32 node.");
 	assert(pos < (int) attr->data.n_res && "Invalid OUT position.");
 	assert(attr->slots[pos]  && "No register assigned");
 
@@ -1278,7 +1108,6 @@ const char *get_ia32_out_reg_name(const ir_node *node, int pos) {
 int get_ia32_out_regnr(const ir_node *node, int pos) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 
-	assert(is_ia32_irn(node) && "Not an ia32 node.");
 	assert(pos < (int) attr->data.n_res && "Invalid OUT position.");
 	assert(attr->slots[pos]  && "No register assigned");
 
@@ -1291,7 +1120,6 @@ int get_ia32_out_regnr(const ir_node *node, int pos) {
 const arch_register_t *get_ia32_out_reg(const ir_node *node, int pos) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 
-	assert(is_ia32_irn(node) && "Not an ia32 node.");
 	assert(pos < (int) attr->data.n_res && "Invalid OUT position.");
 	assert(attr->slots[pos]  && "No register assigned");
 
@@ -1301,19 +1129,41 @@ 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, unsigned latency)
+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);
+
 	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->out_flags = NEW_ARR_D(int, get_irg_obstack(get_irn_irg(node)), n_res);
+	memset(attr->out_flags, 0, n_res * sizeof(attr->out_flags[0]));
 
-	attr->data.n_res = n_res;
 	memset((void *)attr->slots, 0, n_res * sizeof(attr->slots[0]));
 }
 
+ir_node *get_ia32_result_proj(const ir_node *node)
+{
+	const ir_edge_t *edge;
+
+	foreach_out_edge(node, edge) {
+		ir_node *proj = get_edge_src_irn(edge);
+		if(get_Proj_proj(proj) == 0) {
+			return proj;
+		}
+	}
+	return NULL;
+}
+
 /***************************************************************************************
  *                  _                            _                   _
  *                 | |                          | |                 | |
@@ -1324,40 +1174,55 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, const ia32_regi
  *
  ***************************************************************************************/
 
-/* default compare operation to compare immediate ops */
-int ia32_compare_immop_attr(ia32_attr_t *a, ia32_attr_t *b) {
-	int equ = 0;
+/* default compare operation to compare attributes */
+int ia32_compare_attr(ia32_attr_t *a, ia32_attr_t *b) {
+	if (a->data.tp != b->data.tp
+			|| a->data.imm_tp != b->data.imm_tp)
+		return 1;
 
-	if (a->data.tp == b->data.tp) {
-		equ = (a->cnst == b->cnst);
-		equ = equ ? (a->data.use_frame == b->data.use_frame) : 0;
+	if (a->data.imm_tp == ia32_ImmConst
+			&& a->cnst_val.tv != b->cnst_val.tv)
+		return 1;
 
-		if (equ && a->data.use_frame && b->data.use_frame)
-			equ = (a->frame_ent == b->frame_ent);
-	}
+	if (a->data.imm_tp == ia32_ImmSymConst
+			&& a->cnst_val.sc != b->cnst_val.sc)
+		return 1;
 
-	return !equ;
-}
+	if (a->data.am_flavour != b->data.am_flavour
+	        || a->data.am_scale != b->data.am_scale
+	        || a->data.offs_sign != b->data.offs_sign
+	        || a->data.am_sc_sign != b->data.am_sc_sign
+	        || a->am_offs != b->am_offs
+	        || a->am_sc != b->am_sc
+			|| a->ls_mode != b->ls_mode)
+		return 1;
 
-/* compare converts */
-int ia32_compare_conv_attr(ia32_attr_t *a, ia32_attr_t *b) {
-	int equ = ! ia32_compare_immop_attr(a, b);
+	if (a->data.use_frame != b->data.use_frame
+	        || a->data.use_frame != b->data.use_frame
+	        || a->frame_ent != b->frame_ent)
+		return 1;
 
-	equ = equ ? (a->src_mode == b->src_mode) && (a->tgt_mode == b->tgt_mode) : equ;
+	if(a->pn_code != b->pn_code)
+		return 1;
 
-	return !equ;
+	if (a->data.tp != b->data.tp
+	        || a->data.op_flav != b->data.op_flav)
+		return 1;
+
+	return 0;
 }
 
-/* Copy attribute function not needed any more, but might be of use later. */
-#if 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);
-	int             n_res    = get_ia32_n_res(old_node);
+	ia32_attr_t *attr_old = get_ia32_attr(old_node);
+	ia32_attr_t *attr_new = get_ia32_attr(new_node);
 
 	/* copy the attributes */
-	memcpy(attr_new, attr_old, sizeof(*attr_new));
+	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, get_irg_obstack(get_irn_irg(new_node)), attr_old->out_flags);
 }
 
 /**
@@ -1371,7 +1236,6 @@ void ia32_register_copy_attr_func(void) {
 		op->ops.copy_attr = ia32_copy_attr;
 	}
 }
-#endif
 
 /* Include the generated constructor functions */
 #include "gen_ia32_new_nodes.c.inl"