X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=c1f553c8a6a72fa17a2feb614a0a1ba001876ed4;hb=f8ead9acbe48af00885e64a6f2f895d1b6cae434;hp=910acd77a305c72e5dce92d51222df8796083964;hpb=d2c1b0191844c3c23731158a153838d570dcd65a;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index 910acd77a..c1f553c8a 100644
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,14 +21,14 @@
  * @file
  * @brief       Handling of ia32 specific firm opcodes.
  * @author      Christian Wuerdig
- * @version     $Id$
  *
- * This file implements the creation of the achitecture specific firm opcodes
+ * This file implements the creation of the architecture specific firm opcodes
  * and the corresponding node constructors for the ia32 assembler irg.
  */
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdbool.h>
 
 #include "irargs_t.h"
 #include "irprog_t.h"
@@ -38,96 +38,23 @@
 #include "ircons_t.h"
 #include "iropt_t.h"
 #include "irop.h"
-#include "irvrfy_t.h"
+#include "irverify_t.h"
 #include "irprintf.h"
 #include "iredges.h"
 #include "error.h"
 #include "raw_bitset.h"
 #include "xmalloc.h"
 
-#include "../bearch.h"
-#include "../beinfo.h"
+#include "bearch.h"
+#include "beinfo.h"
 
 #include "bearch_ia32_t.h"
 #include "ia32_common_transform.h"
 #include "ia32_nodes_attr.h"
 #include "ia32_new_nodes.h"
 #include "gen_ia32_regalloc_if.h"
-#include "gen_ia32_machine.h"
-
-/***********************************************************************************
- *      _                                   _       _             __
- *     | |                                 (_)     | |           / _|
- *   __| |_   _ _ __ ___  _ __   ___ _ __   _ _ __ | |_ ___ _ __| |_ __ _  ___ ___
- *  / _` | | | | '_ ` _ \| '_ \ / _ \ '__| | | '_ \| __/ _ \ '__|  _/ _` |/ __/ _ \
- * | (_| | |_| | | | | | | |_) |  __/ |    | | | | | ||  __/ |  | || (_| | (_|  __/
- *  \__,_|\__,_|_| |_| |_| .__/ \___|_|    |_|_| |_|\__\___|_|  |_| \__,_|\___\___|
- *                       | |
- *                       |_|
- ***********************************************************************************/
 
-/**
- * Dumps the register requirements for either in or out.
- */
-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 ? (int) arch_irn_get_n_outs(n) : get_irn_arity(n);
-	char  buf[1024];
-	int   i;
-
-	memset(buf, 0, sizeof(buf));
-
-	if (reqs) {
-		for (i = 0; i < max; i++) {
-			fprintf(F, "%sreq #%d =", dir, i);
-
-			if (reqs[i]->type == arch_register_req_type_none) {
-				fprintf(F, " n/a");
-			}
-
-			if (reqs[i]->type & arch_register_req_type_normal) {
-				fprintf(F, " %s", reqs[i]->cls->name);
-			}
-
-			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]->type & arch_register_req_type_should_be_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_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");
-		}
-
-		fprintf(F, "\n");
-	}
-	else {
-		fprintf(F, "%sreq = N/A\n", dir);
-	}
-}
+struct obstack opcodes_obst;
 
 /**
  * Dumper interface for dumping ia32 nodes in vcg.
@@ -136,29 +63,27 @@ static void dump_reg_req(FILE *F, ir_node *n, const arch_register_req_t **reqs,
  * @param reason   indicates which kind of information should be dumped
  * @return 0 on success or != 0 on failure
  */
-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, flags;
-	const arch_register_req_t **reqs;
+static void ia32_dump_node(FILE *F, const ir_node *n, dump_reason_t reason)
+{
+	ir_mode *mode = NULL;
 
 	switch (reason) {
 		case dump_node_opcode_txt:
 			fprintf(F, "%s", get_irn_opname(n));
 
-			if(is_ia32_Immediate(n) || is_ia32_Const(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) {
+				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) {
+				if (attr->offset != 0 || attr->symconst == NULL) {
+					if (attr->offset > 0 && attr->symconst != NULL) {
 						fputc('+', F);
 					}
 					fprintf(F, "%ld", attr->offset);
@@ -170,26 +95,26 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 			else {
 				const ia32_attr_t *attr = get_ia32_attr_const(n);
 
-				if(attr->am_sc != NULL || attr->am_offs != 0)
+				if (attr->am_sc != NULL || attr->am_offs != 0)
 					fputs(" [", F);
 
-				if(attr->am_sc != NULL) {
-					if(attr->data.am_sc_sign) {
+				if (attr->am_sc != NULL) {
+					if (attr->data.am_sc_sign) {
 						fputc('-', F);
 					}
 					fputs(get_entity_name(attr->am_sc), F);
-					if(attr->data.am_sc_no_pic_adjust) {
+					if (attr->data.am_sc_no_pic_adjust) {
 						fputs("(no_pic_adjust)", F);
 					}
 				}
-				if(attr->am_offs != 0) {
-					if(attr->am_offs > 0 && attr->am_sc != NULL) {
+				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)
+				if (attr->am_sc != NULL || attr->am_offs != 0)
 					fputc(']', F);
 			}
 			break;
@@ -202,38 +127,16 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 
 		case dump_node_nodeattr_txt:
 			if (! is_ia32_Lea(n)) {
-				if (is_ia32_AddrModeS(n)) {
-					fprintf(F, "[AM S] ");
-				} else if (is_ia32_AddrModeD(n)) {
-					fprintf(F, "[AM D] ");
+				switch (get_ia32_op_type(n)) {
+				case ia32_Normal:    break;
+				case ia32_AddrModeS: fprintf(F, "[AM S] "); break;
+				case ia32_AddrModeD: fprintf(F, "[AM D] "); break;
 				}
 			}
-
 			break;
 
 		case dump_node_info_txt:
-			fprintf(F, "=== IA32 attr begin ===\n");
-
-			/* dump IN requirements */
-			if (get_irn_arity(n) > 0) {
-				reqs = get_ia32_in_req_all(n);
-				dump_reg_req(F, n, reqs, 0);
-			}
-
-			n_res = arch_irn_get_n_outs(n);
-			if (n_res > 0) {
-				/* dump OUT requirements */
-				reqs = get_ia32_out_req_all(n);
-				dump_reg_req(F, n, reqs, 1);
-
-				/* dump assigned registers */
-				for (i = 0; i < n_res; i++) {
-					const arch_register_t *reg = arch_irn_get_register(n, i);
-
-					fprintf(F, "reg #%d = %s\n", i, reg ? arch_register_get_name(reg) : "n/a");
-				}
-				fprintf(F, "\n");
-			}
+			arch_dump_reqs_and_registers(F, n);
 
 			/* dump op type */
 			fprintf(F, "op = ");
@@ -248,7 +151,7 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 					fprintf(F, "AM Source (Load)");
 					break;
 				default:
-					fprintf(F, "unknown (%d)", get_ia32_op_type(n));
+					fprintf(F, "unknown (%d)", (int)get_ia32_op_type(n));
 					break;
 			}
 			fprintf(F, "\n");
@@ -261,64 +164,40 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 				case ia32_am_binary: fputs("source (binary)\n", F); break;
 
 				default:
-					fprintf(F, "unknown (%d)\n", get_ia32_am_support(n));
+					fprintf(F, "unknown (%d)\n", (int)get_ia32_am_support(n));
 					break;
 			}
 
 			/* dump AM offset */
-			if(get_ia32_am_offs_int(n) != 0) {
+			if (get_ia32_am_offs_int(n) != 0) {
 				fprintf(F, "AM offset = %d\n", get_ia32_am_offs_int(n));
 			}
 
 			/* dump AM symconst */
-			if(get_ia32_am_sc(n) != NULL) {
+			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));
 			}
 
 			/* dump AM scale */
-			fprintf(F, "AM scale = %d\n", get_ia32_am_scale(n));
+			fprintf(F, "AM scale = %u\n", get_ia32_am_scale(n));
 
 			/* dump pn code */
-			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);
+			if (is_ia32_CMovcc(n) || is_ia32_Setcc(n) || is_ia32_Jcc(n)) {
+				const ia32_attr_t *attr = get_ia32_attr_const(n);
+				fprintf(F, "condition_code = 0x%X\n", (unsigned)get_ia32_condcode(n));
+				fprintf(F, "ins_permuted = %u\n", (unsigned)attr->data.ins_permuted);
 			}
 			else if (is_ia32_CopyB(n) || is_ia32_CopyB_i(n)) {
 				fprintf(F, "size = %u\n", get_ia32_copyb_size(n));
 			}
 
-			fprintf(F, "n_res = %d\n",         n_res);
 			fprintf(F, "use_frame = %d\n",     is_ia32_use_frame(n));
 			fprintf(F, "commutative = %d\n",   is_ia32_commutative(n));
 			fprintf(F, "need stackent = %d\n", is_ia32_need_stackent(n));
 			fprintf(F, "is reload = %d\n",     is_ia32_is_reload(n));
-			fprintf(F, "latency = %d\n",       get_ia32_latency(n));
-
-			/* dump flags */
-			fprintf(F, "flags =");
-			flags = arch_irn_get_flags(n);
-			if (flags == arch_irn_flags_none) {
-				fprintf(F, " none");
-			}
-			else {
-				if (flags & arch_irn_flags_dont_spill) {
-					fprintf(F, " unspillable");
-				}
-				if (flags & arch_irn_flags_rematerializable) {
-					fprintf(F, " remat");
-				}
-				if (flags & arch_irn_flags_modify_flags) {
-					fprintf(F, " modify_flags");
-				}
-			}
-			fprintf(F, " (%d)\n", flags);
+			fprintf(F, "latency = %u\n",       get_ia32_latency(n));
 
 			/* dump frame entity */
 			fprintf(F, "frame entity = ");
@@ -342,67 +221,52 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 
 #ifndef NDEBUG
 			/* dump original ir node name */
-			fprintf(F, "orig node = ");
-			if (get_ia32_orig_node(n)) {
-				fprintf(F, "%s", get_ia32_orig_node(n));
-			}
-			else {
-				fprintf(F, "n/a");
-			}
-			fprintf(F, "\n");
+			char const *orig = get_ia32_attr_const(n)->orig_node;
+			fprintf(F, "orig node = %s\n", orig ? orig : "n/a");
 #endif /* NDEBUG */
 
-			fprintf(F, "=== IA32 attr end ===\n");
-			/* end of: case dump_node_info_txt */
 			break;
 	}
-
-	return bad;
 }
 
 
 
-/***************************************************************************************************
- *        _   _                   _       __        _                    _   _               _
- *       | | | |                 | |     / /       | |                  | | | |             | |
- *   __ _| |_| |_ _ __   ___  ___| |_   / /_ _  ___| |_   _ __ ___   ___| |_| |__   ___   __| |___
- *  / _` | __| __| '__| / __|/ _ \ __| / / _` |/ _ \ __| | '_ ` _ \ / _ \ __| '_ \ / _ \ / _` / __|
- * | (_| | |_| |_| |    \__ \  __/ |_ / / (_| |  __/ |_  | | | | | |  __/ |_| | | | (_) | (_| \__ \
- *  \__,_|\__|\__|_|    |___/\___|\__/_/ \__, |\___|\__| |_| |_| |_|\___|\__|_| |_|\___/ \__,_|___/
- *                                        __/ |
- *                                       |___/
- ***************************************************************************************************/
-
-ia32_attr_t *get_ia32_attr(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(node);
 }
 
-const ia32_attr_t *get_ia32_attr_const(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 (const ia32_attr_t*) get_irn_generic_attr_const(node);
 }
 
-ia32_x87_attr_t *get_ia32_x87_attr(ir_node *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_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_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_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);
 
@@ -417,20 +281,36 @@ const ia32_immediate_attr_t *get_ia32_immediate_attr_const(const ir_node *node)
 	return imm_attr;
 }
 
-ia32_condcode_attr_t *get_ia32_condcode_attr(ir_node *node) {
+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_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_switch_attr_t *get_ia32_switch_attr(ir_node *node)
+{
+	ia32_attr_t        *attr        = get_ia32_attr(node);
+	ia32_switch_attr_t *switch_attr = CAST_IA32_ATTR(ia32_switch_attr_t, attr);
+	return switch_attr;
+}
+
+const ia32_switch_attr_t *get_ia32_switch_attr_const(const ir_node *node)
+{
+	const ia32_attr_t        *attr        = get_ia32_attr_const(node);
+	const ia32_switch_attr_t *switch_attr = CONST_CAST_IA32_ATTR(ia32_switch_attr_t, attr);
+	return switch_attr;
+}
+
 ia32_call_attr_t *get_ia32_call_attr(ir_node *node)
 {
 	ia32_attr_t      *attr      = get_ia32_attr(node);
@@ -447,28 +327,32 @@ const ia32_call_attr_t *get_ia32_call_attr_const(const ir_node *node)
 	return call_attr;
 }
 
-ia32_copyb_attr_t *get_ia32_copyb_attr(ir_node *node) {
+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_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;
 }
 
-ia32_climbframe_attr_t *get_ia32_climbframe_attr(ir_node *node) {
+ia32_climbframe_attr_t *get_ia32_climbframe_attr(ir_node *node)
+{
 	ia32_attr_t            *attr            = get_ia32_attr(node);
 	ia32_climbframe_attr_t *climbframe_attr = CAST_IA32_ATTR(ia32_climbframe_attr_t, attr);
 
 	return climbframe_attr;
 }
 
-const ia32_climbframe_attr_t *get_ia32_climbframe_attr_const(const ir_node *node) {
+const ia32_climbframe_attr_t *get_ia32_climbframe_attr_const(const ir_node *node)
+{
 	const ia32_attr_t            *attr            = get_ia32_attr_const(node);
 	const ia32_climbframe_attr_t *climbframe_attr = CONST_CAST_IA32_ATTR(ia32_climbframe_attr_t, attr);
 
@@ -478,15 +362,17 @@ const ia32_climbframe_attr_t *get_ia32_climbframe_attr_const(const ir_node *node
 /**
  * Gets the type of an ia32 node.
  */
-ia32_op_type_t get_ia32_op_type(const ir_node *node) {
+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;
+	return (ia32_op_type_t)attr->data.tp;
 }
 
 /**
  * Sets the type of an ia32 node.
  */
-void set_ia32_op_type(ir_node *node, ia32_op_type_t tp) {
+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;
 }
@@ -494,7 +380,7 @@ void set_ia32_op_type(ir_node *node, ia32_op_type_t 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;
+	return (ia32_am_type_t)attr->data.am_arity;
 }
 
 /**
@@ -509,7 +395,8 @@ void set_ia32_am_support(ir_node *node, ia32_am_type_t arity)
 /**
  * Gets the address mode offset as int.
  */
-int get_ia32_am_offs_int(const ir_node *node) {
+int get_ia32_am_offs_int(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->am_offs;
 }
@@ -517,12 +404,14 @@ int get_ia32_am_offs_int(const ir_node *node) {
 /**
  * Sets the address mode offset from an int.
  */
-void set_ia32_am_offs_int(ir_node *node, int offset) {
+void set_ia32_am_offs_int(ir_node *node, int offset)
+{
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->am_offs = offset;
 }
 
-void add_ia32_am_offs_int(ir_node *node, int offset) {
+void add_ia32_am_offs_int(ir_node *node, int offset)
+{
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->am_offs += offset;
 }
@@ -530,7 +419,8 @@ void add_ia32_am_offs_int(ir_node *node, int offset) {
 /**
  * Returns the symconst entity associated to address mode.
  */
-ir_entity *get_ia32_am_sc(const ir_node *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;
 }
@@ -538,7 +428,8 @@ ir_entity *get_ia32_am_sc(const ir_node *node) {
 /**
  * Sets the symconst entity associated to address mode.
  */
-void set_ia32_am_sc(ir_node *node, ir_entity *entity) {
+void set_ia32_am_sc(ir_node *node, ir_entity *entity)
+{
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->am_sc       = entity;
 }
@@ -546,7 +437,8 @@ void set_ia32_am_sc(ir_node *node, ir_entity *entity) {
 /**
  * Sets the sign bit for address mode symconst.
  */
-void set_ia32_am_sc_sign(ir_node *node) {
+void set_ia32_am_sc_sign(ir_node *node)
+{
 	ia32_attr_t *attr     = get_ia32_attr(node);
 	attr->data.am_sc_sign = 1;
 }
@@ -554,7 +446,8 @@ void set_ia32_am_sc_sign(ir_node *node) {
 /**
  * Clears the sign bit for address mode symconst.
  */
-void clear_ia32_am_sc_sign(ir_node *node) {
+void clear_ia32_am_sc_sign(ir_node *node)
+{
 	ia32_attr_t *attr     = get_ia32_attr(node);
 	attr->data.am_sc_sign = 0;
 }
@@ -562,15 +455,29 @@ 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) {
+int is_ia32_am_sc_sign(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.am_sc_sign;
 }
 
+void set_ia32_am_tls_segment(ir_node *node, bool value)
+{
+	ia32_attr_t *attr = get_ia32_attr(node);
+	attr->data.am_tls_segment = value;
+}
+
+bool get_ia32_am_tls_segment(const ir_node *node)
+{
+	const ia32_attr_t *attr = get_ia32_attr_const(node);
+	return attr->data.am_tls_segment;
+}
+
 /**
  * Gets the addr mode const.
  */
-unsigned get_ia32_am_scale(const ir_node *node) {
+unsigned get_ia32_am_scale(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.am_scale;
 }
@@ -578,7 +485,8 @@ unsigned get_ia32_am_scale(const ir_node *node) {
 /**
  * Sets the index register scale for address mode.
  */
-void set_ia32_am_scale(ir_node *node, unsigned scale) {
+void set_ia32_am_scale(ir_node *node, unsigned scale)
+{
 	ia32_attr_t *attr = get_ia32_attr(node);
 	assert(scale <= 3 && "AM scale out of range [0 ... 3]");
 	attr->data.am_scale = scale;
@@ -589,7 +497,7 @@ 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))
+	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));
@@ -600,7 +508,8 @@ void ia32_copy_am_attrs(ir_node *to, const ir_node *from)
 /**
  * Sets the uses_frame flag.
  */
-void set_ia32_use_frame(ir_node *node) {
+void set_ia32_use_frame(ir_node *node)
+{
 	ia32_attr_t *attr    = get_ia32_attr(node);
 	attr->data.use_frame = 1;
 }
@@ -608,7 +517,8 @@ void set_ia32_use_frame(ir_node *node) {
 /**
  * Clears the uses_frame flag.
  */
-void clear_ia32_use_frame(ir_node *node) {
+void clear_ia32_use_frame(ir_node *node)
+{
 	ia32_attr_t *attr    = get_ia32_attr(node);
 	attr->data.use_frame = 0;
 }
@@ -616,7 +526,8 @@ void clear_ia32_use_frame(ir_node *node) {
 /**
  * Gets the uses_frame flag.
  */
-int is_ia32_use_frame(const ir_node *node) {
+int is_ia32_use_frame(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.use_frame;
 }
@@ -624,7 +535,8 @@ int is_ia32_use_frame(const ir_node *node) {
 /**
  * Sets node to commutative.
  */
-void set_ia32_commutative(ir_node *node) {
+void set_ia32_commutative(ir_node *node)
+{
 	ia32_attr_t *attr         = get_ia32_attr(node);
 	attr->data.is_commutative = 1;
 }
@@ -632,7 +544,8 @@ void set_ia32_commutative(ir_node *node) {
 /**
  * Sets node to non-commutative.
  */
-void clear_ia32_commutative(ir_node *node) {
+void clear_ia32_commutative(ir_node *node)
+{
 	ia32_attr_t *attr         = get_ia32_attr(node);
 	attr->data.is_commutative = 0;
 }
@@ -640,52 +553,62 @@ void clear_ia32_commutative(ir_node *node) {
 /**
  * Checks if node is commutative.
  */
-int is_ia32_commutative(const ir_node *node) {
+int is_ia32_commutative(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.is_commutative;
 }
 
-void set_ia32_need_stackent(ir_node *node) {
+void set_ia32_need_stackent(ir_node *node)
+{
 	ia32_attr_t *attr     = get_ia32_attr(node);
 	attr->data.need_stackent = 1;
 }
 
-void clear_ia32_need_stackent(ir_node *node) {
+void clear_ia32_need_stackent(ir_node *node)
+{
 	ia32_attr_t *attr     = get_ia32_attr(node);
 	attr->data.need_stackent = 0;
 }
 
-int is_ia32_need_stackent(const ir_node *node) {
+int is_ia32_need_stackent(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.need_stackent;
 }
 
-void set_ia32_is_reload(ir_node *node) {
+void set_ia32_is_reload(ir_node *node)
+{
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->data.is_reload = 1;
 }
 
-int is_ia32_is_reload(const ir_node *node) {
+int is_ia32_is_reload(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.is_reload;
 }
 
-void set_ia32_is_spill(ir_node *node) {
+void set_ia32_is_spill(ir_node *node)
+{
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->data.is_spill = 1;
 }
 
-int is_ia32_is_spill(const ir_node *node) {
+int is_ia32_is_spill(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.is_spill;
 }
 
-void set_ia32_is_remat(ir_node *node) {
+void set_ia32_is_remat(ir_node *node)
+{
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->data.is_remat = 1;
 }
 
-int is_ia32_is_remat(const ir_node *node) {
+int is_ia32_is_remat(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.is_remat;
 }
@@ -693,7 +616,8 @@ int is_ia32_is_remat(const ir_node *node) {
 /**
  * Gets the mode of the stored/loaded value (only set for Store/Load)
  */
-ir_mode *get_ia32_ls_mode(const ir_node *node) {
+ir_mode *get_ia32_ls_mode(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->ls_mode;
 }
@@ -701,7 +625,8 @@ ir_mode *get_ia32_ls_mode(const ir_node *node) {
 /**
  * Sets the mode of the stored/loaded value (only set for Store/Load)
  */
-void set_ia32_ls_mode(ir_node *node, ir_mode *mode) {
+void set_ia32_ls_mode(ir_node *node, ir_mode *mode)
+{
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->ls_mode     = mode;
 }
@@ -709,7 +634,8 @@ 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) {
+ir_entity *get_ia32_frame_ent(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->frame_ent;
 }
@@ -717,10 +643,11 @@ ir_entity *get_ia32_frame_ent(const ir_node *node) {
 /**
  * Sets the frame entity for this node.
  */
-void set_ia32_frame_ent(ir_node *node, ir_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;
-	if(ent != NULL)
+	if (ent != NULL)
 		set_ia32_use_frame(node);
 	else
 		clear_ia32_use_frame(node);
@@ -730,98 +657,32 @@ void set_ia32_frame_ent(ir_node *node, ir_entity *ent) {
 /**
  * Gets the instruction latency.
  */
-unsigned get_ia32_latency(const ir_node *node) {
+unsigned get_ia32_latency(const ir_node *node)
+{
 	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) {
-	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 arch_register_req_t **reqs) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->in_req      = reqs;
-}
-
-/**
- * Returns the result register requirements of an ia32 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 arch_register_req_t **reqs) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-	attr->out_req     = 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) {
-	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 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 arch_register_req_t *req, int pos) {
-	ia32_attr_t *attr  = get_ia32_attr(node);
-	attr->out_req[pos] = req;
-}
-
-/**
- * Sets the IN register requirements at position 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;
+const ir_switch_table *get_ia32_switch_table(const ir_node *node)
+{
+	const ia32_switch_attr_t *attr = get_ia32_switch_attr_const(node);
+	return attr->table;
 }
 
-/**
- * Returns the condition code of a node.
- */
-long get_ia32_condcode(const ir_node *node)
+ia32_condition_code_t get_ia32_condcode(const ir_node *node)
 {
 	const ia32_condcode_attr_t *attr = get_ia32_condcode_attr_const(node);
-	return attr->pn_code;
+	return attr->condition_code;
 }
 
 /**
  * Sets the condition code of a node
  */
-void set_ia32_condcode(ir_node *node, long code)
+void set_ia32_condcode(ir_node *node, ia32_condition_code_t code)
 {
 	ia32_condcode_attr_t *attr = get_ia32_condcode_attr(node);
-	attr->pn_code = code;
+	attr->condition_code = code;
 }
 
 /**
@@ -833,18 +694,11 @@ unsigned get_ia32_copyb_size(const ir_node *node)
 	return attr->size;
 }
 
-/**
- * Get the list of available execution units.
- */
-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;
-}
-
 /**
  * Get the exception label attribute.
  */
-unsigned get_ia32_exc_label(const ir_node *node) {
+unsigned get_ia32_exc_label(const ir_node *node)
+{
 	const ia32_attr_t *attr = get_ia32_attr_const(node);
 	return attr->data.has_except_label;
 }
@@ -852,7 +706,8 @@ unsigned get_ia32_exc_label(const ir_node *node) {
 /**
  * Set the exception label attribute.
  */
-void set_ia32_exc_label(ir_node *node, unsigned flag) {
+void set_ia32_exc_label(ir_node *node, unsigned flag)
+{
 	ia32_attr_t *attr = get_ia32_attr(node);
 	attr->data.has_except_label = flag;
 }
@@ -860,7 +715,8 @@ void set_ia32_exc_label(ir_node *node, unsigned flag) {
 /**
  * Return the exception label id.
  */
-ir_label_t get_ia32_exc_label_id(const ir_node *node) {
+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);
@@ -870,7 +726,8 @@ ir_label_t get_ia32_exc_label_id(const ir_node *node) {
 /**
  * Assign the exception label id.
  */
-void set_ia32_exc_label_id(ir_node *node, ir_label_t 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);
@@ -879,22 +736,14 @@ void set_ia32_exc_label_id(ir_node *node, ir_label_t id) {
 
 #ifndef NDEBUG
 
-/**
- * Returns the name of the original ir node.
- */
-const char *get_ia32_orig_node(const ir_node *node)
-{
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return attr->orig_node;
-}
-
 static const char *ia32_get_old_node_name(const ir_node *irn)
 {
-	struct obstack *obst = env_cg->isa->name_obst;
+	ir_graph       *irg  = get_irn_irg(irn);
+	struct obstack *obst = be_get_be_obst(irg);
 
 	lc_eoprintf(firm_get_arg_env(), obst, "%+F", irn);
 	obstack_1grow(obst, 0);
-	return obstack_finish(obst);
+	return (const char*)obstack_finish(obst);
 }
 
 /**
@@ -909,33 +758,6 @@ void set_ia32_orig_node(ir_node *node, const ir_node *old)
 
 #endif /* NDEBUG */
 
-/******************************************************************************************************
- *                      _       _         _   _           __                  _   _
- *                     (_)     | |       | | | |         / _|                | | (_)
- *  ___ _ __   ___  ___ _  __ _| |   __ _| |_| |_ _ __  | |_ _   _ _ __   ___| |_ _  ___  _ __    ___
- * / __| '_ \ / _ \/ __| |/ _` | |  / _` | __| __| '__| |  _| | | | '_ \ / __| __| |/ _ \| '_ \  / __|
- * \__ \ |_) |  __/ (__| | (_| | | | (_| | |_| |_| |    | | | |_| | | | | (__| |_| | (_) | | | | \__ \
- * |___/ .__/ \___|\___|_|\__,_|_|  \__,_|\__|\__|_|    |_|  \__,_|_| |_|\___|\__|_|\___/|_| |_| |___/
- *     | |
- *     |_|
- ******************************************************************************************************/
-
-/**
- * Returns whether or not the node is an AddrModeS node.
- */
-int is_ia32_AddrModeS(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return (attr->data.tp == ia32_AddrModeS);
-}
-
-/**
- * Returns whether or not the node is an AddrModeD node.
- */
-int is_ia32_AddrModeD(const ir_node *node) {
-	const ia32_attr_t *attr = get_ia32_attr_const(node);
-	return (attr->data.tp == ia32_AddrModeD);
-}
-
 void ia32_swap_left_right(ir_node *node)
 {
 	ia32_attr_t *attr  = get_ia32_attr(node);
@@ -951,22 +773,18 @@ void ia32_swap_left_right(ir_node *node)
 /**
  * Initializes the nodes attributes.
  */
-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)
+static void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
+                                 const arch_register_req_t **in_reqs,
+                                 int n_res)
 {
 	ir_graph        *irg  = get_irn_irg(node);
 	struct obstack  *obst = get_irg_obstack(irg);
 	ia32_attr_t     *attr = get_ia32_attr(node);
 	backend_info_t  *info;
 
-	arch_irn_set_flags(node, flags);
-	set_ia32_in_req_all(node, in_reqs);
-	set_ia32_out_req_all(node, out_reqs);
+	arch_set_irn_flags(node, flags);
+	arch_set_irn_register_reqs_in(node, in_reqs);
 
-	attr->exec_units  = execution_units;
 #ifndef NDEBUG
 	attr->attr_type  |= IA32_ATTR_ia32_attr_t;
 #endif
@@ -976,35 +794,32 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags,
 	memset(info->out_infos, 0, n_res * sizeof(info->out_infos[0]));
 }
 
-void
-init_ia32_x87_attributes(ir_node *res)
+static 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;
+	ir_graph *const irg = get_irn_irg(res);
+	ia32_request_x87_sim(irg);
 }
 
-void
-init_ia32_asm_attributes(ir_node *res)
+static 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
+
+	ir_graph *const irg = get_irn_irg(res);
+	ia32_request_x87_sim(irg); /* asm might have fp operands. */
 }
 
-void
-init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
-                               int symconst_sign, int no_pic_adjust,
-							   long offset)
+static void init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
+                                           int symconst_sign, int no_pic_adjust,
+                                           long offset)
 {
-	ia32_immediate_attr_t *attr = get_irn_generic_attr(res);
+	ia32_immediate_attr_t *attr = (ia32_immediate_attr_t*)get_irn_generic_attr(res);
 
 #ifndef NDEBUG
 	attr->attr.attr_type  |= IA32_ATTR_ia32_immediate_attr_t;
@@ -1015,9 +830,10 @@ init_ia32_immediate_attributes(ir_node *res, ir_entity *symconst,
 	attr->offset        = offset;
 }
 
-void init_ia32_call_attributes(ir_node* res, unsigned pop, ir_type* call_tp)
+static void init_ia32_call_attributes(ir_node* res, unsigned pop,
+                                      ir_type* call_tp)
 {
-	ia32_call_attr_t *attr = get_irn_generic_attr(res);
+	ia32_call_attr_t *attr = (ia32_call_attr_t*)get_irn_generic_attr(res);
 
 #ifndef NDEBUG
 	attr->attr.attr_type  |= IA32_ATTR_ia32_call_attr_t;
@@ -1026,9 +842,9 @@ void init_ia32_call_attributes(ir_node* res, unsigned pop, ir_type* call_tp)
 	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);
+static void init_ia32_copyb_attributes(ir_node *res, unsigned size)
+{
+	ia32_copyb_attr_t *attr = (ia32_copyb_attr_t*)get_irn_generic_attr(res);
 
 #ifndef NDEBUG
 	attr->attr.attr_type  |= IA32_ATTR_ia32_copyb_attr_t;
@@ -1036,19 +852,20 @@ init_ia32_copyb_attributes(ir_node *res, unsigned size) {
 	attr->size = size;
 }
 
-void
-init_ia32_condcode_attributes(ir_node *res, long pnc) {
-	ia32_condcode_attr_t *attr = get_irn_generic_attr(res);
+static void init_ia32_condcode_attributes(ir_node *res,
+                                          ia32_condition_code_t cc)
+{
+	ia32_condcode_attr_t *attr = (ia32_condcode_attr_t*)get_irn_generic_attr(res);
 
 #ifndef NDEBUG
 	attr->attr.attr_type  |= IA32_ATTR_ia32_condcode_attr_t;
 #endif
-	attr->pn_code = pnc;
+	attr->condition_code = cc;
 }
 
-void
-init_ia32_climbframe_attributes(ir_node *res, unsigned count) {
-	ia32_climbframe_attr_t *attr = get_irn_generic_attr(res);
+static void init_ia32_climbframe_attributes(ir_node *res, unsigned count)
+{
+	ia32_climbframe_attr_t *attr = (ia32_climbframe_attr_t*)get_irn_generic_attr(res);
 
 #ifndef NDEBUG
 	attr->attr.attr_type  |= IA32_ATTR_ia32_climbframe_attr_t;
@@ -1056,18 +873,22 @@ init_ia32_climbframe_attributes(ir_node *res, unsigned count) {
 	attr->count = count;
 }
 
-/***************************************************************************************
- *                  _                            _                   _
- *                 | |                          | |                 | |
- *  _ __   ___   __| | ___    ___ ___  _ __  ___| |_ _ __ _   _  ___| |_ ___  _ __ ___
- * | '_ \ / _ \ / _` |/ _ \  / __/ _ \| '_ \/ __| __| '__| | | |/ __| __/ _ \| '__/ __|
- * | | | | (_) | (_| |  __/ | (_| (_) | | | \__ \ |_| |  | |_| | (__| || (_) | |  \__ \
- * |_| |_|\___/ \__,_|\___|  \___\___/|_| |_|___/\__|_|   \__,_|\___|\__\___/|_|  |___/
- *
- ***************************************************************************************/
+static void init_ia32_switch_attributes(ir_node *node,
+                                        const ir_switch_table *table)
+{
+	ia32_switch_attr_t *attr = (ia32_switch_attr_t*) get_irn_generic_attr(node);
+#ifndef NDEBUG
+	attr->attr.attr_type |= IA32_ATTR_ia32_switch_attr_t;
+#endif
+	attr->table = table;
+
+	be_foreach_out(node, o) {
+		arch_set_irn_register_req_out(node, o, arch_no_register_req);
+	}
+}
 
 /* default compare operation to compare attributes */
-int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b)
+static int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b)
 {
 	if (a->data.tp != b->data.tp)
 		return 1;
@@ -1082,9 +903,9 @@ int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b)
 
 	/* 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)
+	if (a->data.use_frame && a->frame_ent == NULL)
 		return 1;
-	if(b->data.use_frame && b->frame_ent == NULL)
+	if (b->data.use_frame && b->frame_ent == NULL)
 		return 1;
 
 	if (a->data.use_frame != b->data.use_frame
@@ -1094,16 +915,14 @@ int ia32_compare_attr(const ia32_attr_t *a, const ia32_attr_t *b)
 	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)
+	if (a->data.ins_permuted != b->data.ins_permuted)
 		return 1;
 
 	return 0;
 }
 
 /** Compare nodes attributes for all "normal" nodes. */
-static
-int ia32_compare_nodes_attr(ir_node *a, ir_node *b)
+static int ia32_compare_nodes_attr(const ir_node *a, const 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);
@@ -1112,8 +931,7 @@ int ia32_compare_nodes_attr(ir_node *a, ir_node *b)
 }
 
 /** Compare node attributes for nodes with condition code. */
-static
-int ia32_compare_condcode_attr(ir_node *a, ir_node *b)
+static int ia32_compare_condcode_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_condcode_attr_t *attr_a;
 	const ia32_condcode_attr_t *attr_b;
@@ -1124,14 +942,14 @@ int ia32_compare_condcode_attr(ir_node *a, ir_node *b)
 	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)
+	if (attr_a->condition_code != attr_b->condition_code)
 		return 1;
 
 	return 0;
 }
 
 /** Compare node attributes for call nodes. */
-static int ia32_compare_call_attr(ir_node *a, ir_node *b)
+static int ia32_compare_call_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_call_attr_t *attr_a;
 	const ia32_call_attr_t *attr_b;
@@ -1152,8 +970,7 @@ static int ia32_compare_call_attr(ir_node *a, ir_node *b)
 }
 
 /** Compare node attributes for CopyB nodes. */
-static
-int ia32_compare_copyb_attr(ir_node *a, ir_node *b)
+static int ia32_compare_copyb_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_copyb_attr_t *attr_a;
 	const ia32_copyb_attr_t *attr_b;
@@ -1172,8 +989,7 @@ int ia32_compare_copyb_attr(ir_node *a, ir_node *b)
 
 
 /** Compare ASM node attributes. */
-static
-int ia32_compare_asm_attr(ir_node *a, ir_node *b)
+static int ia32_compare_asm_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_asm_attr_t *attr_a;
 	const ia32_asm_attr_t *attr_b;
@@ -1184,7 +1000,7 @@ int ia32_compare_asm_attr(ir_node *a, ir_node *b)
 	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)
+	if (attr_a->asm_text != attr_b->asm_text)
 		return 1;
 
 	return 0;
@@ -1193,15 +1009,15 @@ int ia32_compare_asm_attr(ir_node *a, ir_node *b)
 /**
  * Hash function for Immediates
  */
-static unsigned ia32_hash_Immediate(const ir_node *irn) {
+static unsigned ia32_hash_Immediate(const ir_node *irn)
+{
 	const ia32_immediate_attr_t *a = get_ia32_immediate_attr_const(irn);
 
-	return HASH_PTR(a->symconst) + (a->sc_sign << 16) + a->offset;
+	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)
+static int ia32_compare_immediate_attr(const ir_node *a, const 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);
@@ -1217,15 +1033,13 @@ int ia32_compare_immediate_attr(ir_node *a, ir_node *b)
 }
 
 /** Compare node attributes for x87 nodes. */
-static
-int ia32_compare_x87_attr(ir_node *a, ir_node *b)
+static int ia32_compare_x87_attr(const ir_node *a, const ir_node *b)
 {
 	return ia32_compare_nodes_attr(a, b);
 }
 
 /** Compare node attributes for ClimbFrame nodes. */
-static
-int ia32_compare_climbframe_attr(ir_node *a, ir_node *b)
+static int ia32_compare_climbframe_attr(const ir_node *a, const ir_node *b)
 {
 	const ia32_climbframe_attr_t *attr_a;
 	const ia32_climbframe_attr_t *attr_b;
@@ -1243,9 +1057,9 @@ int ia32_compare_climbframe_attr(ir_node *a, ir_node *b)
 }
 
 /* copies the ia32 attributes */
-static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node)
+static void ia32_copy_attr(ir_graph *irg, 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);
@@ -1258,6 +1072,15 @@ static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node)
 	/* copy out flags */
 	new_info->out_infos =
 		DUP_ARR_D(reg_out_info_t, obst, old_info->out_infos);
+	new_info->in_reqs = old_info->in_reqs;
+	new_info->flags = old_info->flags;
+}
+
+static void ia32_init_op(ir_op *op, unsigned latency)
+{
+	ia32_op_attr_t *attr = OALLOCZ(&opcodes_obst, ia32_op_attr_t);
+	attr->latency = latency;
+	set_op_attr(op, attr);
 }
 
 /* Include the generated constructor functions */