X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_emitter.c;h=4b39bcd9e865f237885e3266ecefd70a3bf5f563;hb=731e9399d5d23b6a15ed4b705f6e6542cb90e55b;hp=62bdca4051981fed9df20da992ddbdf49bcabc92;hpb=381cf8f2c9b564356058b2390567e3bc1602131d;p=libfirm

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index 62bdca405..4b39bcd9e 100644
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -68,7 +68,7 @@
 #include "bedwarf.h"
 #include "beemitter.h"
 #include "begnuas.h"
-#include "beirg.h"
+#include "beutil.h"
 
 #include "ia32_emitter.h"
 #include "ia32_common_transform.h"
@@ -153,12 +153,11 @@ static char *get_unique_label(char *buf, size_t buflen, const char *prefix)
  */
 static void emit_8bit_register(const arch_register_t *reg)
 {
-	const char *reg_name = arch_register_get_name(reg);
 	assert(reg->index == REG_GP_EAX || reg->index == REG_GP_EBX
 			|| reg->index == REG_GP_ECX || reg->index == REG_GP_EDX);
 
 	be_emit_char('%');
-	be_emit_char(reg_name[1]); /* get the basic name of the register */
+	be_emit_char(reg->name[1]); /* get the basic name of the register */
 	be_emit_char('l');
 }
 
@@ -167,21 +166,18 @@ static void emit_8bit_register(const arch_register_t *reg)
  */
 static void emit_8bit_register_high(const arch_register_t *reg)
 {
-	const char *reg_name = arch_register_get_name(reg);
 	assert(reg->index == REG_GP_EAX || reg->index == REG_GP_EBX
 			|| reg->index == REG_GP_ECX || reg->index == REG_GP_EDX);
 
 	be_emit_char('%');
-	be_emit_char(reg_name[1]); /* get the basic name of the register */
+	be_emit_char(reg->name[1]); /* get the basic name of the register */
 	be_emit_char('h');
 }
 
 static void emit_16bit_register(const arch_register_t *reg)
 {
-	const char *reg_name = arch_register_get_name(reg);
-
 	be_emit_char('%');
-	be_emit_string(reg_name+1); /* skip the 'e' prefix of the 32bit names */
+	be_emit_string(reg->name + 1); /* skip the 'e' prefix of the 32bit names */
 }
 
 /**
@@ -192,8 +188,6 @@ static void emit_16bit_register(const arch_register_t *reg)
  */
 static void emit_register(const arch_register_t *reg, const ir_mode *mode)
 {
-	const char *reg_name;
-
 	if (mode != NULL) {
 		int size = get_mode_size_bits(mode);
 		switch (size) {
@@ -203,17 +197,8 @@ static void emit_register(const arch_register_t *reg, const ir_mode *mode)
 		assert(mode_is_float(mode) || size == 32);
 	}
 
-	reg_name = arch_register_get_name(reg);
-
 	be_emit_char('%');
-	be_emit_string(reg_name);
-}
-
-void ia32_emit_source_register(const ir_node *node, int pos)
-{
-	const arch_register_t *reg = arch_get_irn_register_in(node, pos);
-
-	emit_register(reg, NULL);
+	be_emit_string(reg->name);
 }
 
 static void ia32_emit_entity(ir_entity *entity, int no_pic_adjust)
@@ -258,68 +243,6 @@ static void emit_ia32_Immediate(const ir_node *node)
 	emit_ia32_Immediate_no_prefix(node);
 }
 
-void ia32_emit_8bit_source_register_or_immediate(const ir_node *node, int pos)
-{
-	const arch_register_t *reg;
-	const ir_node         *in = get_irn_n(node, pos);
-	if (is_ia32_Immediate(in)) {
-		emit_ia32_Immediate(in);
-		return;
-	}
-
-	reg = arch_get_irn_register_in(node, pos);
-	emit_8bit_register(reg);
-}
-
-void ia32_emit_8bit_high_source_register(const ir_node *node, int pos)
-{
-	const arch_register_t *reg = arch_get_irn_register_in(node, pos);
-	emit_8bit_register_high(reg);
-}
-
-void ia32_emit_16bit_source_register_or_immediate(const ir_node *node, int pos)
-{
-	const arch_register_t *reg;
-	const ir_node         *in = get_irn_n(node, pos);
-	if (is_ia32_Immediate(in)) {
-		emit_ia32_Immediate(in);
-		return;
-	}
-
-	reg = arch_get_irn_register_in(node, pos);
-	emit_16bit_register(reg);
-}
-
-void ia32_emit_dest_register(const ir_node *node, int pos)
-{
-	const arch_register_t *reg  = arch_get_irn_register_out(node, pos);
-
-	emit_register(reg, NULL);
-}
-
-void ia32_emit_dest_register_size(const ir_node *node, int pos)
-{
-	const arch_register_t *reg  = arch_get_irn_register_out(node, pos);
-
-	emit_register(reg, get_ia32_ls_mode(node));
-}
-
-void ia32_emit_8bit_dest_register(const ir_node *node, int pos)
-{
-	const arch_register_t *reg  = arch_get_irn_register_out(node, pos);
-
-	emit_register(reg, mode_Bu);
-}
-
-void ia32_emit_x87_register(const ir_node *node, int pos)
-{
-	const ia32_x87_attr_t *attr = get_ia32_x87_attr_const(node);
-
-	assert(pos < 3);
-	be_emit_char('%');
-	be_emit_string(attr->x87[pos]->name);
-}
-
 static void ia32_emit_mode_suffix_mode(const ir_mode *mode)
 {
 	assert(mode_is_int(mode) || mode_is_reference(mode));
@@ -334,16 +257,7 @@ static void ia32_emit_mode_suffix_mode(const ir_mode *mode)
 	panic("Can't output mode_suffix for %+F", mode);
 }
 
-void ia32_emit_mode_suffix(const ir_node *node)
-{
-	ir_mode *mode = get_ia32_ls_mode(node);
-	if (mode == NULL)
-		mode = mode_Iu;
-
-	ia32_emit_mode_suffix_mode(mode);
-}
-
-void ia32_emit_x87_mode_suffix(const ir_node *node)
+static void ia32_emit_x87_mode_suffix(ir_node const *const node)
 {
 	ir_mode *mode;
 
@@ -387,42 +301,13 @@ static char get_xmm_mode_suffix(ir_mode *mode)
 	}
 }
 
-void ia32_emit_xmm_mode_suffix(const ir_node *node)
-{
-	ir_mode *mode = get_ia32_ls_mode(node);
-	assert(mode != NULL);
-	be_emit_char('s');
-	be_emit_char(get_xmm_mode_suffix(mode));
-}
-
-void ia32_emit_xmm_mode_suffix_s(const ir_node *node)
+static void ia32_emit_xmm_mode_suffix(ir_node const *const node)
 {
 	ir_mode *mode = get_ia32_ls_mode(node);
 	assert(mode != NULL);
 	be_emit_char(get_xmm_mode_suffix(mode));
 }
 
-void ia32_emit_extend_suffix(const ir_node *node)
-{
-	ir_mode *mode = get_ia32_ls_mode(node);
-	if (get_mode_size_bits(mode) == 32)
-		return;
-	be_emit_char(mode_is_signed(mode) ? 's' : 'z');
-	ia32_emit_mode_suffix_mode(mode);
-}
-
-void ia32_emit_source_register_or_immediate(const ir_node *node, int pos)
-{
-	ir_node *in = get_irn_n(node, pos);
-	if (is_ia32_Immediate(in)) {
-		emit_ia32_Immediate(in);
-	} else {
-		const ir_mode         *mode = get_ia32_ls_mode(node);
-		const arch_register_t *reg  = arch_get_irn_register_in(node, pos);
-		emit_register(reg, mode);
-	}
-}
-
 /**
  * Returns the target block for a control flow node.
  */
@@ -486,14 +371,15 @@ typedef enum ia32_emit_mod_t {
 	EMIT_ALTERNATE_AM = 1U << 1,
 	EMIT_LONG         = 1U << 2,
 	EMIT_HIGH_REG     = 1U << 3,
-	EMIT_LOW_REG      = 1U << 4
+	EMIT_LOW_REG      = 1U << 4,
+	EMIT_16BIT_REG    = 1U << 5
 } ia32_emit_mod_t;
 ENUM_BITSET(ia32_emit_mod_t)
 
 /**
  * Emits address mode.
  */
-void ia32_emit_am(const ir_node *node)
+static void ia32_emit_am(ir_node const *const node)
 {
 	ir_entity *ent       = get_ia32_am_sc(node);
 	int        offs      = get_ia32_am_offs_int(node);
@@ -550,36 +436,14 @@ void ia32_emit_am(const ir_node *node)
 	}
 }
 
-/**
- * fmt  parameter               output
- * ---- ----------------------  ---------------------------------------------
- * %%                           %
- * %AM  <node>                  address mode of the node
- * %AR  const arch_register_t*  address mode of the node or register
- * %ASx <node>                  address mode of the node or source register x
- * %Dx  <node>                  destination register x
- * %I   <node>                  immediate of the node
- * %L   <node>                  control flow target of the node
- * %M   <node>                  mode suffix of the node
- * %P   int                     condition code
- * %R   const arch_register_t*  register
- * %Sx  <node>                  source register x
- * %s   const char*             string
- * %u   unsigned int            unsigned int
- * %d   signed int              signed int
- *
- * x starts at 0
- * # modifier for %ASx, %D, %R, and %S uses ls mode of node to alter register width
- * * modifier does not prefix immediates with $, but AM with *
- * l modifier for %lu and %ld
- * > modifier to output high 8bit register (ah, bh)
- * < modifier to output low 8bit register (al, bl)
- */
-static void ia32_emitf(const ir_node *node, const char *fmt, ...)
+static ia32_condition_code_t determine_final_cc(ir_node const *node, int flags_pos, ia32_condition_code_t cc);
+
+void ia32_emitf(ir_node const *const node, char const *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
 
+	be_emit_char('\t');
 	for (;;) {
 		const char      *start = fmt;
 		ia32_emit_mod_t  mod   = EMIT_NONE;
@@ -591,7 +455,9 @@ static void ia32_emitf(const ir_node *node, const char *fmt, ...)
 		}
 
 		if (*fmt == '\n') {
-			be_emit_finish_line_gas(node);
+			be_emit_char('\n');
+			be_emit_write_line();
+			be_emit_char('\t');
 			++fmt;
 			if (*fmt == '\0')
 				break;
@@ -609,6 +475,7 @@ static void ia32_emitf(const ir_node *node, const char *fmt, ...)
 			case 'l': mod |= EMIT_LONG;         break;
 			case '>': mod |= EMIT_HIGH_REG;     break;
 			case '<': mod |= EMIT_LOW_REG;      break;
+			case '^': mod |= EMIT_16BIT_REG;    break;
 			default:
 				goto end_of_mods;
 			}
@@ -626,6 +493,16 @@ end_of_mods:
 
 			case 'A': {
 				switch (*fmt++) {
+					case 'F':
+						if (get_ia32_op_type(node) == ia32_Normal) {
+							ia32_x87_attr_t const *const attr = get_ia32_x87_attr_const(node);
+							char            const *const fmt  = attr->res_in_reg ? "%%st, %%%s" : "%%%s, %%st";
+							be_emit_irprintf(fmt, attr->reg->name);
+							break;
+						} else {
+							goto emit_AM;
+						}
+
 emit_AM:
 					case 'M':
 						if (mod & EMIT_ALTERNATE_AM)
@@ -635,19 +512,18 @@ emit_AM:
 
 					case 'R':
 						reg = va_arg(ap, const arch_register_t*);
-						if (get_ia32_op_type(node) == ia32_AddrModeS) {
-							goto emit_AM;
-						} else {
+						if (get_ia32_op_type(node) == ia32_Normal) {
 							goto emit_R;
+						} else {
+							goto emit_AM;
 						}
 
 					case 'S':
-						if (get_ia32_op_type(node) == ia32_AddrModeS) {
+						if (get_ia32_op_type(node) == ia32_Normal) {
+							goto emit_S;
+						} else {
 							++fmt;
 							goto emit_AM;
-						} else {
-							assert(get_ia32_op_type(node) == ia32_Normal);
-							goto emit_S;
 						}
 
 					default: goto unknown;
@@ -655,12 +531,71 @@ emit_AM:
 				break;
 			}
 
+			case 'B':
+				imm = get_irn_n(node, n_ia32_binary_right);
+				if (is_ia32_Immediate(imm)) {
+					emit_ia32_Immediate(imm);
+					be_emit_cstring(", ");
+					if (get_ia32_op_type(node) == ia32_Normal) {
+						goto destination_operand;
+					} else {
+						ia32_emit_am(node);
+					}
+				} else {
+					if (get_ia32_op_type(node) == ia32_Normal) {
+						reg = arch_get_irn_register_in(node, n_ia32_binary_right);
+						emit_register(reg, get_ia32_ls_mode(node));
+					} else {
+						ia32_emit_am(node);
+					}
+					be_emit_cstring(", ");
+destination_operand:
+					reg = arch_get_irn_register_in(node, n_ia32_binary_left);
+					emit_register(reg, get_ia32_ls_mode(node));
+				}
+				break;
+
 			case 'D':
-				if (*fmt < '0' || '9' <= *fmt)
+				if (*fmt < '0' || '9' < *fmt)
 					goto unknown;
 				reg = arch_get_irn_register_out(node, *fmt++ - '0');
 				goto emit_R;
 
+			case 'F':
+				if (*fmt == 'M') {
+					ia32_emit_x87_mode_suffix(node);
+				} else if (*fmt == 'P') {
+					ia32_x87_attr_t const *const attr = get_ia32_x87_attr_const(node);
+					if (attr->pop)
+						be_emit_char('p');
+				} else if (*fmt == 'R') {
+					/* NOTE: Work around a gas quirk for non-commutative operations if the
+					 * destination register is not %st0.  In this case r/non-r is swapped.
+					 * %st0 = %st0 - %st1 -> fsub  %st1, %st0 (as expected)
+					 * %st0 = %st1 - %st0 -> fsubr %st1, %st0 (as expected)
+					 * %st1 = %st0 - %st1 -> fsub  %st0, %st1 (expected: fsubr)
+					 * %st1 = %st1 - %st0 -> fsubr %st0, %st1 (expected: fsub)
+					 * In fact this corresponds to the encoding of the instruction:
+					 * - The r suffix selects whether %st0 is on the left (no r) or on the
+					 *   right (r) side of the executed operation.
+					 * - The placement of %st0 selects whether the result is written to
+					 *   %st0 (right) or the other register (left).
+					 * This means that it is sufficient to test whether the operands are
+					 * permuted.  In particular it is not necessary to consider wether the
+					 * result is to be placed into the explicit register operand. */
+					if (get_ia32_x87_attr_const(node)->attr.data.ins_permuted)
+						be_emit_char('r');
+				} else if (*fmt == 'X') {
+					ia32_emit_xmm_mode_suffix(node);
+				} else if (*fmt == '0') {
+					be_emit_char('%');
+					be_emit_string(get_ia32_x87_attr_const(node)->reg->name);
+				} else {
+					goto unknown;
+				}
+				++fmt;
+				break;
+
 			case 'I':
 				imm = node;
 emit_I:
@@ -673,12 +608,31 @@ emit_I:
 				ia32_emit_cfop_target(node);
 				break;
 
-			case 'M':
-				ia32_emit_mode_suffix_mode(get_ia32_ls_mode(node));
+			case 'M': {
+				ir_mode *mode = get_ia32_ls_mode(node);
+				if (!mode)
+					mode = mode_Iu;
+				if (mod & EMIT_RESPECT_LS) {
+					if (get_mode_size_bits(mode) == 32)
+						break;
+					be_emit_char(mode_is_signed(mode) ? 's' : 'z');
+				}
+				ia32_emit_mode_suffix_mode(mode);
 				break;
+			}
 
 			case 'P': {
-				ia32_condition_code_t cc = va_arg(ap, ia32_condition_code_t);
+				ia32_condition_code_t cc;
+				if (*fmt == 'X') {
+					++fmt;
+					cc = (ia32_condition_code_t)va_arg(ap, int);
+				} else if ('0' <= *fmt && *fmt <= '9') {
+					cc = get_ia32_condcode(node);
+					cc = determine_final_cc(node, *fmt - '0', cc);
+					++fmt;
+				} else {
+					goto unknown;
+				}
 				ia32_emit_condition_code(cc);
 				break;
 			}
@@ -692,6 +646,8 @@ emit_R:
 					emit_8bit_register_high(reg);
 				} else if (mod & EMIT_LOW_REG) {
 					emit_8bit_register(reg);
+				} else if (mod & EMIT_16BIT_REG) {
+					emit_16bit_register(reg);
 				} else {
 					emit_register(reg, mod & EMIT_RESPECT_LS ? get_ia32_ls_mode(node) : NULL);
 				}
@@ -701,7 +657,7 @@ emit_S:
 			case 'S': {
 				unsigned pos;
 
-				if (*fmt < '0' || '9' <= *fmt)
+				if (*fmt < '0' || '9' < *fmt)
 					goto unknown;
 
 				pos = *fmt++ - '0';
@@ -742,69 +698,14 @@ emit_S:
 
 			default:
 unknown:
-				panic("unknown format conversion in ia32_emitf()");
+				panic("unknown format conversion");
 		}
 	}
 
+	be_emit_finish_line_gas(node);
 	va_end(ap);
 }
 
-/**
- * Emits registers and/or address mode of a binary operation.
- */
-void ia32_emit_binop(const ir_node *node)
-{
-	if (is_ia32_Immediate(get_irn_n(node, n_ia32_binary_right))) {
-		ia32_emitf(node, "%#S4, %#AS3");
-	} else {
-		ia32_emitf(node, "%#AS4, %#S3");
-	}
-}
-
-/**
- * Emits registers and/or address mode of a binary operation.
- */
-void ia32_emit_x87_binop(const ir_node *node)
-{
-	switch (get_ia32_op_type(node)) {
-		case ia32_Normal:
-			{
-				const ia32_x87_attr_t *x87_attr = get_ia32_x87_attr_const(node);
-				const arch_register_t *in1      = x87_attr->x87[0];
-				const arch_register_t *in       = x87_attr->x87[1];
-				const arch_register_t *out      = x87_attr->x87[2];
-
-				if (out == NULL) {
-					out = in1;
-				} else if (out == in) {
-					in = in1;
-				}
-
-				be_emit_char('%');
-				be_emit_string(arch_register_get_name(in));
-				be_emit_cstring(", %");
-				be_emit_string(arch_register_get_name(out));
-			}
-			break;
-		case ia32_AddrModeS:
-			ia32_emit_am(node);
-			break;
-		case ia32_AddrModeD:
-		default:
-			assert(0 && "unsupported op type");
-	}
-}
-
-/**
- * Emits registers and/or address mode of a unary operation.
- */
-void ia32_emit_unop(const ir_node *node, int pos)
-{
-	char fmt[] = "%ASx";
-	fmt[3] = '0' + pos;
-	ia32_emitf(node, fmt);
-}
-
 static void emit_ia32_IMul(const ir_node *node)
 {
 	ir_node               *left    = get_irn_n(node, n_ia32_IMul_left);
@@ -813,9 +714,9 @@ static void emit_ia32_IMul(const ir_node *node)
 	/* do we need the 3-address form? */
 	if (is_ia32_NoReg_GP(left) ||
 			arch_get_irn_register_in(node, n_ia32_IMul_left) != out_reg) {
-		ia32_emitf(node, "\timul%M %#S4, %#AS3, %#D0\n");
+		ia32_emitf(node, "imul%M %#S4, %#AS3, %#D0");
 	} else {
-		ia32_emitf(node, "\timul%M %#AS4, %#S3\n");
+		ia32_emitf(node, "imul%M %#AS4, %#S3");
 	}
 }
 
@@ -862,7 +763,8 @@ static ir_node *find_original_value(ir_node *node)
 	}
 }
 
-static int determine_final_cc(const ir_node *node, int flags_pos, int cc)
+static ia32_condition_code_t determine_final_cc(const ir_node *node,
+		int flags_pos, ia32_condition_code_t cc)
 {
 	ir_node           *flags = get_irn_n(node, flags_pos);
 	const ia32_attr_t *flags_attr;
@@ -870,13 +772,11 @@ static int determine_final_cc(const ir_node *node, int flags_pos, int cc)
 
 	if (is_ia32_Sahf(flags)) {
 		ir_node *cmp = get_irn_n(flags, n_ia32_Sahf_val);
-		if (!(is_ia32_FucomFnstsw(cmp) || is_ia32_FucompFnstsw(cmp)
-				|| is_ia32_FucomppFnstsw(cmp) || is_ia32_FtstFnstsw(cmp))) {
+		if (!(is_ia32_FucomFnstsw(cmp) || is_ia32_FucomppFnstsw(cmp) || is_ia32_FtstFnstsw(cmp))) {
 			inc_irg_visited(current_ir_graph);
 			cmp = find_original_value(cmp);
 			assert(cmp != NULL);
-			assert(is_ia32_FucomFnstsw(cmp) || is_ia32_FucompFnstsw(cmp)
-			       || is_ia32_FucomppFnstsw(cmp) || is_ia32_FtstFnstsw(cmp));
+			assert(is_ia32_FucomFnstsw(cmp) || is_ia32_FucomppFnstsw(cmp) || is_ia32_FtstFnstsw(cmp));
 		}
 
 		flags_attr = get_ia32_attr_const(cmp);
@@ -889,14 +789,6 @@ static int determine_final_cc(const ir_node *node, int flags_pos, int cc)
 	return cc;
 }
 
-void ia32_emit_cmp_suffix_node(const ir_node *node, int flags_pos)
-{
-	ia32_condition_code_t cc = get_ia32_condcode(node);
-	cc = determine_final_cc(node, flags_pos, cc);
-
-	ia32_emit_condition_code(cc);
-}
-
 /**
  * Emits an exception label for a given node.
  */
@@ -906,29 +798,6 @@ static void ia32_emit_exc_label(const ir_node *node)
 	be_emit_irprintf("%lu", get_ia32_exc_label_id(node));
 }
 
-/**
- * Returns the Proj with projection number proj and NOT mode_M
- */
-static ir_node *get_proj(const ir_node *node, long proj)
-{
-	const ir_edge_t *edge;
-	ir_node         *src;
-
-	assert(get_irn_mode(node) == mode_T && "expected mode_T node");
-
-	foreach_out_edge(node, edge) {
-		src = get_edge_src_irn(edge);
-
-		assert(is_Proj(src) && "Proj expected");
-		if (get_irn_mode(src) == mode_M)
-			continue;
-
-		if (get_Proj_proj(src) == proj)
-			return src;
-	}
-	return NULL;
-}
-
 static int can_be_fallthrough(const ir_node *node)
 {
 	ir_node *target_block = get_cfop_target_block(node);
@@ -943,16 +812,14 @@ static void emit_ia32_Jcc(const ir_node *node)
 {
 	int                   need_parity_label = 0;
 	ia32_condition_code_t cc                = get_ia32_condcode(node);
-	const ir_node        *proj_true;
-	const ir_node        *proj_false;
 
 	cc = determine_final_cc(node, 0, cc);
 
 	/* get both Projs */
-	proj_true = get_proj(node, pn_ia32_Jcc_true);
+	ir_node const *proj_true = be_get_Proj_for_pn(node, pn_ia32_Jcc_true);
 	assert(proj_true && "Jcc without true Proj");
 
-	proj_false = get_proj(node, pn_ia32_Jcc_false);
+	ir_node const *proj_false = be_get_Proj_for_pn(node, pn_ia32_Jcc_false);
 	assert(proj_false && "Jcc without false Proj");
 
 	if (can_be_fallthrough(proj_true)) {
@@ -968,28 +835,30 @@ static void emit_ia32_Jcc(const ir_node *node)
 		/* Some floating point comparisons require a test of the parity flag,
 		 * which indicates that the result is unordered */
 		if (cc & ia32_cc_negated) {
-			ia32_emitf(proj_true, "\tjp %L\n");
+			ia32_emitf(proj_true, "jp %L");
 		} else {
 			/* we need a local label if the false proj is a fallthrough
 			 * as the falseblock might have no label emitted then */
 			if (can_be_fallthrough(proj_false)) {
 				need_parity_label = 1;
-				ia32_emitf(proj_false, "\tjp 1f\n");
+				ia32_emitf(proj_false, "jp 1f");
 			} else {
-				ia32_emitf(proj_false, "\tjp %L\n");
+				ia32_emitf(proj_false, "jp %L");
 			}
 		}
 	}
-	ia32_emitf(proj_true, "\tj%P %L\n", cc);
+	ia32_emitf(proj_true, "j%PX %L", (int)cc);
 	if (need_parity_label) {
-		ia32_emitf(NULL, "1:\n");
+		be_emit_cstring("1:\n");
+		be_emit_write_line();
 	}
 
 	/* the second Proj might be a fallthrough */
 	if (can_be_fallthrough(proj_false)) {
-		ia32_emitf(proj_false, "\t/* fallthrough to %L */\n");
+		if (be_options.verbose_asm)
+			ia32_emitf(proj_false, "/* fallthrough to %L */");
 	} else {
-		ia32_emitf(proj_false, "\tjmp %L\n");
+		ia32_emitf(proj_false, "jmp %L");
 	}
 }
 
@@ -1005,16 +874,16 @@ static void emit_ia32_Setcc(const ir_node *node)
 	cc = determine_final_cc(node, n_ia32_Setcc_eflags, cc);
 	if (cc & ia32_cc_float_parity_cases) {
 		if (cc & ia32_cc_negated) {
-			ia32_emitf(node, "\tset%P %<R\n", cc, dreg);
-			ia32_emitf(node, "\tsetp %>R\n", dreg);
-			ia32_emitf(node, "\torb %>R, %<R\n", dreg, dreg);
+			ia32_emitf(node, "set%PX %<R", (int)cc, dreg);
+			ia32_emitf(node, "setp %>R", dreg);
+			ia32_emitf(node, "orb %>R, %<R", dreg, dreg);
 		} else {
-			ia32_emitf(node, "\tset%P %<R\n", cc, dreg);
-			ia32_emitf(node, "\tsetnp %>R\n", dreg);
-			ia32_emitf(node, "\tandb %>R, %<R\n", dreg, dreg);
+			ia32_emitf(node, "set%PX %<R", (int)cc, dreg);
+			ia32_emitf(node, "setnp %>R", dreg);
+			ia32_emitf(node, "andb %>R, %<R", dreg, dreg);
 		}
 	} else {
-		ia32_emitf(node, "\tset%P %#R\n", cc, dreg);
+		ia32_emitf(node, "set%PX %#R", (int)cc, dreg);
 	}
 }
 
@@ -1052,14 +921,14 @@ static void emit_ia32_CMovcc(const ir_node *node)
 		in_false = tmp;
 	} else {
 		/* we need a mov */
-		ia32_emitf(node, "\tmovl %R, %R\n", in_false, out);
+		ia32_emitf(node, "movl %R, %R", in_false, out);
 	}
 
 	if (cc & ia32_cc_float_parity_cases) {
 		panic("CMov with floatingpoint compare/parity not supported yet");
 	}
 
-	ia32_emitf(node, "\tcmov%P %#AR, %#R\n", cc, in_true, out);
+	ia32_emitf(node, "cmov%PX %#AR, %#R", (int)cc, in_true, out);
 }
 
 /**
@@ -1070,7 +939,7 @@ static void emit_ia32_SwitchJmp(const ir_node *node)
 	ir_entity             *jump_table = get_ia32_am_sc(node);
 	const ir_switch_table *table      = get_ia32_switch_table(node);
 
-	ia32_emitf(node, "\tjmp %*AM\n");
+	ia32_emitf(node, "jmp %*AM");
 	be_emit_jump_table(node, table, jump_table, get_cfop_target_block);
 }
 
@@ -1081,9 +950,10 @@ static void emit_ia32_Jmp(const ir_node *node)
 {
 	/* we have a block schedule */
 	if (can_be_fallthrough(node)) {
-		ia32_emitf(node, "\t/* fallthrough to %L */\n");
+		if (be_options.verbose_asm)
+			ia32_emitf(node, "/* fallthrough to %L */");
 	} else {
-		ia32_emitf(node, "\tjmp %L\n");
+		ia32_emitf(node, "jmp %L");
 	}
 }
 
@@ -1116,7 +986,8 @@ static const char* emit_asm_operand(const ir_node *node, const char *s)
 	case 0:
 		ir_fprintf(stderr, "Warning: asm text (%+F) ends with %%\n", node);
 		be_emit_char('%');
-		return s + 1;
+		return s;
+
 	case '%':
 		be_emit_char('%');
 		return s + 1;
@@ -1183,31 +1054,19 @@ static const char* emit_asm_operand(const ir_node *node, const char *s)
 		return s;
 	}
 
+	/* Emit the register. */
 	if (asm_reg->memory) {
 		be_emit_char('(');
-	}
-
-	/* emit it */
-	if (modifier != 0) {
+		emit_register(reg, NULL);
+		be_emit_char(')');
+	} else {
 		switch (modifier) {
-		case 'b':
-			emit_8bit_register(reg);
-			break;
-		case 'h':
-			emit_8bit_register_high(reg);
-			break;
-		case 'w':
-			emit_16bit_register(reg);
-			break;
-		default:
-			panic("Invalid asm op modifier");
+		case '\0': emit_register(reg, asm_reg->mode); break;
+		case  'b': emit_8bit_register(reg);           break;
+		case  'h': emit_8bit_register_high(reg);      break;
+		case  'w': emit_16bit_register(reg);          break;
+		default:   panic("Invalid asm op modifier");
 		}
-	} else {
-		emit_register(reg, asm_reg->memory ? mode_Iu : asm_reg->mode);
-	}
-
-	if (asm_reg->memory) {
-		be_emit_char(')');
 	}
 
 	return s;
@@ -1224,7 +1083,8 @@ static void emit_ia32_Asm(const ir_node *node)
 	ident                 *asm_text = attr->asm_text;
 	const char            *s        = get_id_str(asm_text);
 
-	ia32_emitf(node, "#APP\t\n");
+	be_emit_cstring("#APP\n");
+	be_emit_write_line();
 
 	if (s[0] != '\t')
 		be_emit_char('\t');
@@ -1237,7 +1097,8 @@ static void emit_ia32_Asm(const ir_node *node)
 		}
 	}
 
-	ia32_emitf(NULL, "\n#NO_APP\n");
+	be_emit_cstring("\n#NO_APP\n");
+	be_emit_write_line();
 }
 
 
@@ -1247,9 +1108,9 @@ static void emit_ia32_Asm(const ir_node *node)
 static void emit_CopyB_prolog(unsigned size)
 {
 	if (size & 1)
-		ia32_emitf(NULL, "\tmovsb\n");
+		ia32_emitf(NULL, "movsb");
 	if (size & 2)
-		ia32_emitf(NULL, "\tmovsw\n");
+		ia32_emitf(NULL, "movsw");
 }
 
 /**
@@ -1260,7 +1121,7 @@ static void emit_ia32_CopyB(const ir_node *node)
 	unsigned size = get_ia32_copyb_size(node);
 
 	emit_CopyB_prolog(size);
-	ia32_emitf(node, "\trep movsd\n");
+	ia32_emitf(node, "rep movsd");
 }
 
 /**
@@ -1274,7 +1135,7 @@ static void emit_ia32_CopyB_i(const ir_node *node)
 
 	size >>= 2;
 	while (size--) {
-		ia32_emitf(NULL, "\tmovsd\n");
+		ia32_emitf(NULL, "movsd");
 	}
 }
 
@@ -1289,7 +1150,7 @@ static void emit_ia32_Conv_with_FP(const ir_node *node, const char* conv_f,
 	int                 ls_bits = get_mode_size_bits(ls_mode);
 	const char         *conv    = ls_bits == 32 ? conv_f : conv_d;
 
-	ia32_emitf(node, "\tcvt%s %AS3, %D0\n", conv);
+	ia32_emitf(node, "cvt%s %AS3, %D0", conv);
 }
 
 static void emit_ia32_Conv_I2FP(const ir_node *node)
@@ -1307,32 +1168,6 @@ static void emit_ia32_Conv_FP2FP(const ir_node *node)
 	emit_ia32_Conv_with_FP(node, "sd2ss", "ss2sd");
 }
 
-/**
- * Emits code for an Int conversion.
- */
-static void emit_ia32_Conv_I2I(const ir_node *node)
-{
-	ir_mode    *smaller_mode = get_ia32_ls_mode(node);
-	int         signed_mode  = mode_is_signed(smaller_mode);
-	const char *sign_suffix;
-
-	assert(!mode_is_float(smaller_mode));
-
-	sign_suffix = signed_mode ? "s" : "z";
-	ia32_emitf(node, "\tmov%s%Ml %#AS3, %D0\n", sign_suffix);
-}
-
-/**
- * Emits a call
- */
-static void emit_ia32_Call(const ir_node *node)
-{
-	/* Special case: Call must not have its immediates prefixed by $, instead
-	 * address mode is prefixed by *. */
-	ia32_emitf(node, "\tcall %*AS3\n");
-}
-
-
 /**
  * Emits code to increase stack pointer.
  */
@@ -1344,9 +1179,9 @@ static void emit_be_IncSP(const ir_node *node)
 		return;
 
 	if (offs > 0) {
-		ia32_emitf(node, "\tsubl $%u, %D0\n", offs);
+		ia32_emitf(node, "subl $%u, %D0", offs);
 	} else {
-		ia32_emitf(node, "\taddl $%u, %D0\n", -offs);
+		ia32_emitf(node, "addl $%u, %D0", -offs);
 	}
 }
 
@@ -1361,11 +1196,11 @@ static void Copy_emitter(const ir_node *node, const ir_node *op)
 	if (in == out) {
 		return;
 	}
-	/* copies of vf nodes aren't real... */
-	if (arch_register_get_class(in) == &ia32_reg_classes[CLASS_ia32_vfp])
+	/* copies of fp nodes aren't real... */
+	if (in->reg_class == &ia32_reg_classes[CLASS_ia32_fp])
 		return;
 
-	ia32_emitf(node, "\tmovl %R, %R\n", in, out);
+	ia32_emitf(node, "movl %R, %R", in, out);
 }
 
 static void emit_be_Copy(const ir_node *node)
@@ -1384,73 +1219,60 @@ static void emit_be_CopyKeep(const ir_node *node)
 static void emit_be_Perm(const ir_node *node)
 {
 	const arch_register_t *in0, *in1;
-	const arch_register_class_t *cls0, *cls1;
 
 	in0 = arch_get_irn_register(get_irn_n(node, 0));
 	in1 = arch_get_irn_register(get_irn_n(node, 1));
 
-	cls0 = arch_register_get_class(in0);
-	cls1 = arch_register_get_class(in1);
-
-	assert(cls0 == cls1 && "Register class mismatch at Perm");
+	arch_register_class_t const *const cls0 = in0->reg_class;
+	assert(cls0 == in1->reg_class && "Register class mismatch at Perm");
 
 	if (cls0 == &ia32_reg_classes[CLASS_ia32_gp]) {
-		ia32_emitf(node, "\txchg %R, %R\n", in1, in0);
+		ia32_emitf(node, "xchg %R, %R", in1, in0);
 	} else if (cls0 == &ia32_reg_classes[CLASS_ia32_xmm]) {
-		ia32_emitf(NULL, "\txorpd %R, %R\n", in1, in0);
-		ia32_emitf(NULL, "\txorpd %R, %R\n", in0, in1);
-		ia32_emitf(node, "\txorpd %R, %R\n", in1, in0);
-	} else if (cls0 == &ia32_reg_classes[CLASS_ia32_vfp]) {
-		/* is a NOP */
-	} else if (cls0 == &ia32_reg_classes[CLASS_ia32_st]) {
+		ia32_emitf(NULL, "xorpd %R, %R", in1, in0);
+		ia32_emitf(NULL, "xorpd %R, %R", in0, in1);
+		ia32_emitf(node, "xorpd %R, %R", in1, in0);
+	} else if (cls0 == &ia32_reg_classes[CLASS_ia32_fp]) {
 		/* is a NOP */
 	} else {
 		panic("unexpected register class in be_Perm (%+F)", node);
 	}
 }
 
-/**
- * Emits code for Constant loading.
- */
-static void emit_ia32_Const(const ir_node *node)
-{
-	ia32_emitf(node, "\tmovl %I, %D0\n");
-}
-
 /* helper function for emit_ia32_Minus64Bit */
 static void emit_mov(const ir_node* node, const arch_register_t *src, const arch_register_t *dst)
 {
-	ia32_emitf(node, "\tmovl %R, %R\n", src, dst);
+	ia32_emitf(node, "movl %R, %R", src, dst);
 }
 
 /* helper function for emit_ia32_Minus64Bit */
 static void emit_neg(const ir_node* node, const arch_register_t *reg)
 {
-	ia32_emitf(node, "\tnegl %R\n", reg);
+	ia32_emitf(node, "negl %R", reg);
 }
 
 /* helper function for emit_ia32_Minus64Bit */
 static void emit_sbb0(const ir_node* node, const arch_register_t *reg)
 {
-	ia32_emitf(node, "\tsbbl $0, %R\n", reg);
+	ia32_emitf(node, "sbbl $0, %R", reg);
 }
 
 /* helper function for emit_ia32_Minus64Bit */
 static void emit_sbb(const ir_node* node, const arch_register_t *src, const arch_register_t *dst)
 {
-	ia32_emitf(node, "\tsbbl %R, %R\n", src, dst);
+	ia32_emitf(node, "sbbl %R, %R", src, dst);
 }
 
 /* helper function for emit_ia32_Minus64Bit */
 static void emit_xchg(const ir_node* node, const arch_register_t *src, const arch_register_t *dst)
 {
-	ia32_emitf(node, "\txchgl %R, %R\n", src, dst);
+	ia32_emitf(node, "xchgl %R, %R", src, dst);
 }
 
 /* helper function for emit_ia32_Minus64Bit */
 static void emit_zero(const ir_node* node, const arch_register_t *reg)
 {
-	ia32_emitf(node, "\txorl %R, %R\n", reg, reg);
+	ia32_emitf(node, "xorl %R, %R", reg, reg);
 }
 
 static void emit_ia32_Minus64Bit(const ir_node *node)
@@ -1509,22 +1331,23 @@ zero_neg:
 
 static void emit_ia32_GetEIP(const ir_node *node)
 {
-	ia32_emitf(node, "\tcall %s\n", pic_base_label);
-	ia32_emitf(NULL, "%s:\n", pic_base_label);
-	ia32_emitf(node, "\tpopl %D0\n");
+	ia32_emitf(node, "call %s", pic_base_label);
+	be_emit_irprintf("%s:\n", pic_base_label);
+	be_emit_write_line();
+	ia32_emitf(node, "popl %D0");
 }
 
 static void emit_ia32_ClimbFrame(const ir_node *node)
 {
 	const ia32_climbframe_attr_t *attr = get_ia32_climbframe_attr_const(node);
 
-	ia32_emitf(node, "\tmovl %S0, %D0\n");
-	ia32_emitf(node, "\tmovl $%u, %S1\n", attr->count);
+	ia32_emitf(node, "movl %S0, %D0");
+	ia32_emitf(node, "movl $%u, %S1", attr->count);
 	be_gas_emit_block_name(node);
 	be_emit_cstring(":\n");
 	be_emit_write_line();
-	ia32_emitf(node, "\tmovl (%D0), %D0\n");
-	ia32_emitf(node, "\tdec %S1\n");
+	ia32_emitf(node, "movl (%D0), %D0");
+	ia32_emitf(node, "dec %S1");
 	be_emit_cstring("\tjnz ");
 	be_gas_emit_block_name(node);
 	be_emit_finish_line_gas(node);
@@ -1535,17 +1358,12 @@ static void emit_be_Return(const ir_node *node)
 	unsigned pop = be_Return_get_pop(node);
 
 	if (pop > 0 || be_Return_get_emit_pop(node)) {
-		ia32_emitf(node, "\tret $%u\n", pop);
+		ia32_emitf(node, "ret $%u", pop);
 	} else {
-		ia32_emitf(node, "\tret\n");
+		ia32_emitf(node, "ret");
 	}
 }
 
-static void emit_Nothing(const ir_node *node)
-{
-	(void) node;
-}
-
 
 /**
  * Enters the emitter functions for handled nodes into the generic
@@ -1553,12 +1371,11 @@ static void emit_Nothing(const ir_node *node)
  */
 static void ia32_register_emitters(void)
 {
-#define IA32_EMIT2(a,b) op_ia32_##a->ops.generic = (op_func)emit_ia32_##b
-#define IA32_EMIT(a)    IA32_EMIT2(a,a)
-#define EMIT(a)         op_##a->ops.generic = (op_func)emit_##a
-#define IGN(a)          op_##a->ops.generic = (op_func)emit_Nothing
-#define BE_EMIT(a)      op_be_##a->ops.generic = (op_func)emit_be_##a
-#define BE_IGN(a)       op_be_##a->ops.generic = (op_func)emit_Nothing
+#define IA32_EMIT(a)    be_set_emitter(op_ia32_##a, emit_ia32_##a)
+#define EMIT(a)         be_set_emitter(op_##a,      emit_##a)
+#define IGN(a)          be_set_emitter(op_##a,      be_emit_nothing)
+#define BE_EMIT(a)      be_set_emitter(op_be_##a,   emit_be_##a)
+#define BE_IGN(a)       be_set_emitter(op_be_##a,   be_emit_nothing)
 
 	/* first clear the generic function pointer for all ops */
 	ir_clear_opcodes_generic_func();
@@ -1567,15 +1384,11 @@ static void ia32_register_emitters(void)
 	ia32_register_spec_emitters();
 
 	/* other ia32 emitter functions */
-	IA32_EMIT2(Conv_I2I8Bit, Conv_I2I);
 	IA32_EMIT(Asm);
 	IA32_EMIT(CMovcc);
-	IA32_EMIT(Call);
-	IA32_EMIT(Const);
 	IA32_EMIT(Conv_FP2FP);
 	IA32_EMIT(Conv_FP2I);
 	IA32_EMIT(Conv_I2FP);
-	IA32_EMIT(Conv_I2I);
 	IA32_EMIT(CopyB);
 	IA32_EMIT(CopyB_i);
 	IA32_EMIT(GetEIP);
@@ -1603,12 +1416,9 @@ static void ia32_register_emitters(void)
 #undef BE_EMIT
 #undef EMIT
 #undef IGN
-#undef IA32_EMIT2
 #undef IA32_EMIT
 }
 
-typedef void (*emit_func_ptr) (const ir_node *);
-
 /**
  * Assign and emit an exception label if the current instruction can fail.
  */
@@ -1631,8 +1441,6 @@ static void ia32_assign_exc_label(ir_node *node)
  */
 static void ia32_emit_node(ir_node *node)
 {
-	ir_op *op = get_irn_op(node);
-
 	DBG((dbg, LEVEL_1, "emitting code for %+F\n", node));
 
 	if (is_ia32_irn(node)) {
@@ -1642,27 +1450,18 @@ static void ia32_emit_node(ir_node *node)
 		}
 		if (mark_spill_reload) {
 			if (is_ia32_is_spill(node)) {
-				ia32_emitf(NULL, "\txchg %ebx, %ebx        /* spill mark */\n");
+				ia32_emitf(NULL, "xchg %ebx, %ebx        /* spill mark */");
 			}
 			if (is_ia32_is_reload(node)) {
-				ia32_emitf(NULL, "\txchg %edx, %edx        /* reload mark */\n");
+				ia32_emitf(NULL, "xchg %edx, %edx        /* reload mark */");
 			}
 			if (is_ia32_is_remat(node)) {
-				ia32_emitf(NULL, "\txchg %ecx, %ecx        /* remat mark */\n");
+				ia32_emitf(NULL, "xchg %ecx, %ecx        /* remat mark */");
 			}
 		}
 	}
-	if (op->ops.generic) {
-		emit_func_ptr func = (emit_func_ptr) op->ops.generic;
-
-		be_dwarf_location(get_irn_dbg_info(node));
 
-		(*func) (node);
-	} else {
-		emit_Nothing(node);
-		ir_fprintf(stderr, "Error: No emit handler for node %+F (%+G, graph %+F)\n", node, node, current_ir_graph);
-		abort();
-	}
+	be_emit_node(node);
 
 	if (sp_relative) {
 		int sp_change = arch_get_sp_bias(node);
@@ -1679,7 +1478,7 @@ static void ia32_emit_node(ir_node *node)
  */
 static void ia32_emit_alignment(unsigned align, unsigned skip)
 {
-	ia32_emitf(NULL, "\t.p2align %u,,%u\n", align, skip);
+	ia32_emitf(NULL, ".p2align %u,,%u", align, skip);
 }
 
 /**
@@ -1701,27 +1500,23 @@ static void ia32_emit_align_label(void)
 static int should_align_block(const ir_node *block)
 {
 	static const double DELTA = .0001;
-	ir_graph     *irg         = get_irn_irg(block);
-	ir_exec_freq *exec_freq   = be_get_irg_exec_freq(irg);
-	ir_node      *prev        = get_prev_block_sched(block);
-	double        block_freq;
-	double        prev_freq = 0;  /**< execfreq of the fallthrough block */
-	double        jmp_freq  = 0;  /**< execfreq of all non-fallthrough blocks */
-	int           i, n_cfgpreds;
-
-	if (exec_freq == NULL)
-		return 0;
+	ir_node *prev      = get_prev_block_sched(block);
+	double   prev_freq = 0;  /**< execfreq of the fallthrough block */
+	double   jmp_freq  = 0;  /**< execfreq of all non-fallthrough blocks */
+	double   block_freq;
+	int      i, n_cfgpreds;
+
 	if (ia32_cg_config.label_alignment_factor <= 0)
 		return 0;
 
-	block_freq = get_block_execfreq(exec_freq, block);
+	block_freq = get_block_execfreq(block);
 	if (block_freq < DELTA)
 		return 0;
 
 	n_cfgpreds = get_Block_n_cfgpreds(block);
 	for (i = 0; i < n_cfgpreds; ++i) {
 		const ir_node *pred      = get_Block_cfgpred_block(block, i);
-		double         pred_freq = get_block_execfreq(exec_freq, pred);
+		double         pred_freq = get_block_execfreq(pred);
 
 		if (pred == prev) {
 			prev_freq += pred_freq;
@@ -1746,11 +1541,7 @@ static int should_align_block(const ir_node *block)
  */
 static void ia32_emit_block_header(ir_node *block)
 {
-	ir_graph     *irg        = current_ir_graph;
-	int           need_label = block_needs_label(block);
-	ir_exec_freq *exec_freq  = be_get_irg_exec_freq(irg);
-	int           arity;
-
+	ir_graph *const irg = get_Block_irg(block);
 	if (block == get_irg_end_block(irg))
 		return;
 
@@ -1780,37 +1571,8 @@ static void ia32_emit_block_header(ir_node *block)
 		}
 	}
 
-	if (need_label) {
-		be_gas_emit_block_name(block);
-		be_emit_char(':');
-
-		be_emit_pad_comment();
-		be_emit_cstring("   /* ");
-	} else {
-		be_emit_cstring("\t/* ");
-		be_gas_emit_block_name(block);
-		be_emit_cstring(": ");
-	}
-
-	be_emit_cstring("preds:");
-
-	/* emit list of pred blocks in comment */
-	arity = get_irn_arity(block);
-	if (arity <= 0) {
-		be_emit_cstring(" none");
-	} else {
-		int i;
-		for (i = 0; i < arity; ++i) {
-			ir_node *predblock = get_Block_cfgpred_block(block, i);
-			be_emit_irprintf(" %d", get_irn_node_nr(predblock));
-		}
-	}
-	if (exec_freq != NULL) {
-		be_emit_irprintf(", freq: %f",
-		                 get_block_execfreq(exec_freq, block));
-	}
-	be_emit_cstring(" */\n");
-	be_emit_write_line();
+	int const need_label = block_needs_label(block);
+	be_gas_begin_block(block, need_label);
 }
 
 /**
@@ -1819,8 +1581,6 @@ static void ia32_emit_block_header(ir_node *block)
  */
 static void ia32_gen_block(ir_node *block)
 {
-	ir_node *node;
-
 	ia32_emit_block_header(block);
 
 	if (sp_relative) {
@@ -2300,21 +2060,18 @@ static void bemit_binop_with_imm(
 	case 1:
 		bemit8(opcode | SIGNEXT_IMM);
 		/* cmp has this special mode */
-		if (get_ia32_op_type(node) == ia32_AddrModeS) {
-			bemit_mod_am(ruval, node);
-		} else {
+		if (get_ia32_op_type(node) == ia32_Normal) {
 			const arch_register_t *reg = arch_get_irn_register_in(node, n_ia32_binary_left);
 			bemit_modru(reg, ruval);
+		} else {
+			bemit_mod_am(ruval, node);
 		}
 		bemit8((unsigned char)attr->offset);
 		return;
 	case 2:
 	case 4:
-		/* check for eax variant: this variant is shorter for 32bit immediates only */
-		if (get_ia32_op_type(node) == ia32_AddrModeS) {
-			bemit8(opcode);
-			bemit_mod_am(ruval, node);
-		} else {
+		if (get_ia32_op_type(node) == ia32_Normal) {
+			/* check for eax variant: this variant is shorter for 32bit immediates only */
 			const arch_register_t *reg = arch_get_irn_register_in(node, n_ia32_binary_left);
 			if (reg->index == REG_GP_EAX) {
 				bemit8(opcode_ax);
@@ -2322,6 +2079,9 @@ static void bemit_binop_with_imm(
 				bemit8(opcode);
 				bemit_modru(reg, ruval);
 			}
+		} else {
+			bemit8(opcode);
+			bemit_mod_am(ruval, node);
 		}
 		bemit_entity(attr->symconst, attr->sc_sign, attr->offset, false);
 		return;
@@ -2386,6 +2146,12 @@ static void bemit_unop_mem(const ir_node *node, unsigned char code, unsigned cha
 	bemit_mod_am(ext, node);
 }
 
+static void bemit_0f_unop_reg(ir_node const *const node, unsigned char const code, int const input)
+{
+	bemit8(0x0F);
+	bemit_unop_reg(node, code, input);
+}
+
 static void bemit_immediate(const ir_node *node, bool relative)
 {
 	const ia32_immediate_attr_t *attr = get_ia32_immediate_attr_const(node);
@@ -2399,11 +2165,11 @@ static void bemit_copy(const ir_node *copy)
 
 	if (in == out)
 		return;
-	/* copies of vf nodes aren't real... */
-	if (arch_register_get_class(in) == &ia32_reg_classes[CLASS_ia32_vfp])
+	/* copies of fp nodes aren't real... */
+	if (in->reg_class == &ia32_reg_classes[CLASS_ia32_fp])
 		return;
 
-	assert(arch_register_get_class(in) == &ia32_reg_classes[CLASS_ia32_gp]);
+	assert(in->reg_class == &ia32_reg_classes[CLASS_ia32_gp]);
 	bemit8(0x8B);
 	bemit_modrr(in, out);
 }
@@ -2412,9 +2178,9 @@ static void bemit_perm(const ir_node *node)
 {
 	const arch_register_t       *in0  = arch_get_irn_register(get_irn_n(node, 0));
 	const arch_register_t       *in1  = arch_get_irn_register(get_irn_n(node, 1));
-	const arch_register_class_t *cls0 = arch_register_get_class(in0);
+	const arch_register_class_t *cls0 = in0->reg_class;
 
-	assert(cls0 == arch_register_get_class(in1) && "Register class mismatch at Perm");
+	assert(cls0 == in1->reg_class && "Register class mismatch at Perm");
 
 	if (cls0 == &ia32_reg_classes[CLASS_ia32_gp]) {
 		if (in0->index == REG_GP_EAX) {
@@ -2427,12 +2193,10 @@ static void bemit_perm(const ir_node *node)
 		}
 	} else if (cls0 == &ia32_reg_classes[CLASS_ia32_xmm]) {
 		panic("unimplemented"); // TODO implement
-		//ia32_emitf(NULL, "\txorpd %R, %R\n", in1, in0);
-		//ia32_emitf(NULL, "\txorpd %R, %R\n", in0, in1);
-		//ia32_emitf(node, "\txorpd %R, %R\n", in1, in0);
-	} else if (cls0 == &ia32_reg_classes[CLASS_ia32_vfp]) {
-		/* is a NOP */
-	} else if (cls0 == &ia32_reg_classes[CLASS_ia32_st]) {
+		//ia32_emitf(NULL, "xorpd %R, %R", in1, in0);
+		//ia32_emitf(NULL, "xorpd %R, %R", in0, in1);
+		//ia32_emitf(node, "xorpd %R, %R", in1, in0);
+	} else if (cls0 == &ia32_reg_classes[CLASS_ia32_fp]) {
 		/* is a NOP */
 	} else {
 		panic("unexpected register class in be_Perm (%+F)", node);
@@ -2498,7 +2262,7 @@ static void bemit_##op(const ir_node *node) \
 		} \
 	} else { \
 		bemit8(ext << 3 | 1); \
-		bemit_mod_am(reg_gp_map[arch_get_irn_register_out(val, 0)->index], node); \
+		bemit_mod_am(reg_gp_map[arch_get_irn_register(val)->index], node); \
 	} \
 } \
  \
@@ -2511,7 +2275,7 @@ static void bemit_##op##8bit(const ir_node *node) \
 		bemit8(get_ia32_immediate_attr_const(val)->offset); \
 	} else { \
 		bemit8(ext << 3); \
-		bemit_mod_am(reg_gp_map[arch_get_irn_register_out(val, 0)->index], node); \
+		bemit_mod_am(reg_gp_map[arch_get_irn_register(val)->index], node); \
 	} \
 }
 
@@ -2622,6 +2386,14 @@ static void bemit_shrd(const ir_node *node)
 	}
 }
 
+static void bemit_sbb0(ir_node const *const node)
+{
+	arch_register_t const *const out = arch_get_irn_register_out(node, pn_ia32_Sbb0_res);
+	unsigned char          const reg = reg_gp_map[out->index];
+	bemit8(0x1B);
+	bemit8(MOD_REG | ENC_REG(reg) | ENC_RM(reg));
+}
+
 /**
  * binary emitter for setcc.
  */
@@ -2669,6 +2441,41 @@ static void bemit_setcc(const ir_node *node)
 	}
 }
 
+static void bemit_bsf(ir_node const *const node)
+{
+	bemit_0f_unop_reg(node, 0xBC, n_ia32_Bsf_operand);
+}
+
+static void bemit_bsr(ir_node const *const node)
+{
+	bemit_0f_unop_reg(node, 0xBD, n_ia32_Bsr_operand);
+}
+
+static void bemit_bswap(ir_node const *const node)
+{
+	bemit8(0x0F);
+	bemit_modru(arch_get_irn_register_out(node, pn_ia32_Bswap_res), 1);
+}
+
+static void bemit_bt(ir_node const *const node)
+{
+	bemit8(0x0F);
+	arch_register_t const *const lreg  = arch_get_irn_register_in(node, n_ia32_Bt_left);
+	ir_node         const *const right = get_irn_n(node, n_ia32_Bt_right);
+	if (is_ia32_Immediate(right)) {
+		ia32_immediate_attr_t const *const attr   = get_ia32_immediate_attr_const(right);
+		int                          const offset = attr->offset;
+		assert(!attr->symconst);
+		assert(get_signed_imm_size(offset) == 1);
+		bemit8(0xBA);
+		bemit_modru(lreg, 4);
+		bemit8(offset);
+	} else {
+		bemit8(0xA3);
+		bemit_modrr(lreg, arch_get_irn_register(right));
+	}
+}
+
 static void bemit_cmovcc(const ir_node *node)
 {
 	const ia32_attr_t     *attr         = get_ia32_attr_const(node);
@@ -2737,21 +2544,18 @@ static void bemit_cmp(const ir_node *node)
 			case 1:
 				bemit8(0x81 | SIGNEXT_IMM);
 				/* cmp has this special mode */
-				if (get_ia32_op_type(node) == ia32_AddrModeS) {
-					bemit_mod_am(7, node);
-				} else {
+				if (get_ia32_op_type(node) == ia32_Normal) {
 					const arch_register_t *reg = arch_get_irn_register_in(node, n_ia32_binary_left);
 					bemit_modru(reg, 7);
+				} else {
+					bemit_mod_am(7, node);
 				}
 				bemit8((unsigned char)attr->offset);
 				return;
 			case 2:
 			case 4:
 				/* check for eax variant: this variant is shorter for 32bit immediates only */
-				if (get_ia32_op_type(node) == ia32_AddrModeS) {
-					bemit8(0x81);
-					bemit_mod_am(7, node);
-				} else {
+				if (get_ia32_op_type(node) == ia32_Normal) {
 					const arch_register_t *reg = arch_get_irn_register_in(node, n_ia32_binary_left);
 					if (reg->index == REG_GP_EAX) {
 						bemit8(0x3D);
@@ -2759,6 +2563,9 @@ static void bemit_cmp(const ir_node *node)
 						bemit8(0x81);
 						bemit_modru(reg, 7);
 					}
+				} else {
+					bemit8(0x81);
+					bemit_mod_am(7, node);
 				}
 				if (ls_size == 16) {
 					bemit16(attr->offset);
@@ -2852,8 +2659,7 @@ static void bemit_imul(const ir_node *node)
 			bemit32(imm);
 		}
 	} else {
-		bemit8(0x0F);
-		bemit_unop_reg(node, 0xAF, n_ia32_IMul_right);
+		bemit_0f_unop_reg(node, 0xAF, n_ia32_IMul_right);
 	}
 }
 
@@ -3126,18 +2932,20 @@ static void bemit_store(const ir_node *node)
 
 static void bemit_conv_i2i(const ir_node *node)
 {
-	ir_mode  *smaller_mode = get_ia32_ls_mode(node);
-	unsigned  opcode;
-
-	bemit8(0x0F);
 	/*        8 16 bit source
 	 * movzx B6 B7
-	 * movsx BE BF
-	 */
-	opcode = 0xB6;
+	 * movsx BE BF */
+	ir_mode *const smaller_mode = get_ia32_ls_mode(node);
+	unsigned       opcode       = 0xB6;
 	if (mode_is_signed(smaller_mode))           opcode |= 0x08;
 	if (get_mode_size_bits(smaller_mode) == 16) opcode |= 0x01;
-	bemit_unop_reg(node, opcode, n_ia32_Conv_I2I_val);
+	bemit_0f_unop_reg(node, opcode, n_ia32_Conv_I2I_val);
+}
+
+static void bemit_popcnt(ir_node const *const node)
+{
+	bemit8(0xF3);
+	bemit_0f_unop_reg(node, 0xB8, n_ia32_Popcnt_operand);
 }
 
 /**
@@ -3214,7 +3022,7 @@ static void bemit_jump(const ir_node *node)
 	bemit_jmp(get_cfop_target_block(node));
 }
 
-static void bemit_jcc(int pnc, const ir_node *dest_block)
+static void bemit_jcc(ia32_condition_code_t pnc, const ir_node *dest_block)
 {
 	unsigned char cc = pnc2cc(pnc);
 	bemit8(0x0F);
@@ -3232,18 +3040,16 @@ static void bemit_jp(bool odd, const ir_node *dest_block)
 static void bemit_ia32_jcc(const ir_node *node)
 {
 	ia32_condition_code_t cc = get_ia32_condcode(node);
-	const ir_node        *proj_true;
-	const ir_node        *proj_false;
 	const ir_node        *dest_true;
 	const ir_node        *dest_false;
 
 	cc = determine_final_cc(node, 0, cc);
 
 	/* get both Projs */
-	proj_true = get_proj(node, pn_ia32_Jcc_true);
+	ir_node const *proj_true = be_get_Proj_for_pn(node, pn_ia32_Jcc_true);
 	assert(proj_true && "Jcc without true Proj");
 
-	proj_false = get_proj(node, pn_ia32_Jcc_false);
+	ir_node const *proj_false = be_get_Proj_for_pn(node, pn_ia32_Jcc_false);
 	assert(proj_false && "Jcc without false Proj");
 
 	if (can_be_fallthrough(proj_true)) {
@@ -3367,43 +3173,33 @@ static void bemit_copybi(const ir_node *node)
 	}
 }
 
-static void bemit_fbinop(const ir_node *node, unsigned code, unsigned code_to)
+static void bemit_fbinop(ir_node const *const node, unsigned const op_fwd, unsigned const op_rev)
 {
+	ia32_x87_attr_t const *const attr = get_ia32_x87_attr_const(node);
+	unsigned               const op   = attr->attr.data.ins_permuted ? op_rev : op_fwd;
 	if (get_ia32_op_type(node) == ia32_Normal) {
-		const ia32_x87_attr_t *x87_attr = get_ia32_x87_attr_const(node);
-		const arch_register_t *in1      = x87_attr->x87[0];
-		const arch_register_t *in       = x87_attr->x87[1];
-		const arch_register_t *out      = x87_attr->x87[2];
-
-		if (out == NULL) {
-			out = in1;
-		} else if (out == in) {
-			in = in1;
-		}
+		assert(!attr->pop || attr->res_in_reg);
 
-		if (out->index == 0) {
-			bemit8(0xD8);
-			bemit8(MOD_REG | ENC_REG(code) | ENC_RM(in->index));
-		} else {
-			bemit8(0xDC);
-			bemit8(MOD_REG | ENC_REG(code_to) | ENC_RM(out->index));
-		}
+		unsigned char op0 = 0xD8;
+		if (attr->res_in_reg) op0 |= 0x04;
+		if (attr->pop)        op0 |= 0x02;
+		bemit8(op0);
+
+		bemit8(MOD_REG | ENC_REG(op) | ENC_RM(attr->reg->index));
 	} else {
-		if (get_mode_size_bits(get_ia32_ls_mode(node)) == 32) {
-			bemit8(0xD8);
-		} else {
-			bemit8(0xDC);
-		}
-		bemit_mod_am(code, node);
+		assert(!attr->reg);
+		assert(!attr->pop);
+
+		unsigned const size = get_mode_size_bits(get_ia32_ls_mode(node));
+		bemit8(size == 32 ? 0xD8 : 0xDC);
+		bemit_mod_am(op, node);
 	}
 }
 
-static void bemit_fbinopp(const ir_node *node, unsigned const code)
+static void bemit_fop_reg(ir_node const *const node, unsigned char const op0, unsigned char const op1)
 {
-	const ia32_x87_attr_t *x87_attr = get_ia32_x87_attr_const(node);
-	const arch_register_t *out      = x87_attr->x87[2];
-	bemit8(0xDE);
-	bemit8(code + out->index);
+	bemit8(op0);
+	bemit8(op1 + get_ia32_x87_attr_const(node)->reg->index);
 }
 
 static void bemit_fabs(const ir_node *node)
@@ -3419,11 +3215,6 @@ static void bemit_fadd(const ir_node *node)
 	bemit_fbinop(node, 0, 0);
 }
 
-static void bemit_faddp(const ir_node *node)
-{
-	bemit_fbinopp(node, 0xC0);
-}
-
 static void bemit_fchs(const ir_node *node)
 {
 	(void)node;
@@ -3437,19 +3228,9 @@ static void bemit_fdiv(const ir_node *node)
 	bemit_fbinop(node, 6, 7);
 }
 
-static void bemit_fdivp(const ir_node *node)
-{
-	bemit_fbinopp(node, 0xF8);
-}
-
-static void bemit_fdivr(const ir_node *node)
+static void bemit_ffreep(ir_node const *const node)
 {
-	bemit_fbinop(node, 7, 6);
-}
-
-static void bemit_fdivrp(const ir_node *node)
-{
-	bemit_fbinopp(node, 0xF0);
+	bemit_fop_reg(node, 0xDF, 0xC0);
 }
 
 static void bemit_fild(const ir_node *node)
@@ -3477,42 +3258,30 @@ static void bemit_fild(const ir_node *node)
 
 static void bemit_fist(const ir_node *node)
 {
-	switch (get_mode_size_bits(get_ia32_ls_mode(node))) {
-		case 16:
-			bemit8(0xDF); // fists
-			break;
-
-		case 32:
-			bemit8(0xDB); // fistl
-			break;
-
-		default:
-			panic("invalid mode size");
+	unsigned       op;
+	unsigned const size = get_mode_size_bits(get_ia32_ls_mode(node));
+	switch (size) {
+	case 16: bemit8(0xDF); op = 2; break; // fist[p]s
+	case 32: bemit8(0xDB); op = 2; break; // fist[p]l
+	case 64: bemit8(0xDF); op = 6; break; // fistpll
+	default: panic("invalid mode size");
 	}
-	bemit_mod_am(2, node);
+	if (get_ia32_x87_attr_const(node)->pop)
+		++op;
+	// There is only a pop variant for 64 bit integer store.
+	assert(size < 64 || get_ia32_x87_attr_const(node)->pop);
+	bemit_mod_am(op, node);
 }
 
-static void bemit_fistp(const ir_node *node)
+static void bemit_fisttp(ir_node const *const node)
 {
 	switch (get_mode_size_bits(get_ia32_ls_mode(node))) {
-		case 16:
-			bemit8(0xDF); // fistps
-			bemit_mod_am(3, node);
-			return;
-
-		case 32:
-			bemit8(0xDB); // fistpl
-			bemit_mod_am(3, node);
-			return;
-
-		case 64:
-			bemit8(0xDF); // fistpll
-			bemit_mod_am(7, node);
-			return;
-
-		default:
-			panic("invalid mode size");
+	case 16: bemit8(0xDF); break; // fisttps
+	case 32: bemit8(0xDB); break; // fisttpl
+	case 64: bemit8(0xDD); break; // fisttpll
+	default: panic("Invalid mode size");
 	}
+	bemit_mod_am(1, node);
 }
 
 static void bemit_fld(const ir_node *node)
@@ -3564,71 +3333,37 @@ static void bemit_fmul(const ir_node *node)
 	bemit_fbinop(node, 1, 1);
 }
 
-static void bemit_fmulp(const ir_node *node)
-{
-	bemit_fbinopp(node, 0xC8);
-}
-
 static void bemit_fpop(const ir_node *node)
 {
-	const ia32_x87_attr_t *attr = get_ia32_x87_attr_const(node);
-	bemit8(0xDD);
-	bemit8(0xD8 + attr->x87[0]->index);
+	bemit_fop_reg(node, 0xDD, 0xD8);
 }
 
 static void bemit_fpush(const ir_node *node)
 {
-	const ia32_x87_attr_t *attr = get_ia32_x87_attr_const(node);
-	bemit8(0xD9);
-	bemit8(0xC0 + attr->x87[0]->index);
+	bemit_fop_reg(node, 0xD9, 0xC0);
 }
 
 static void bemit_fpushcopy(const ir_node *node)
 {
-	const ia32_x87_attr_t *attr = get_ia32_x87_attr_const(node);
-	bemit8(0xD9);
-	bemit8(0xC0 + attr->x87[0]->index);
+	bemit_fop_reg(node, 0xD9, 0xC0);
 }
 
 static void bemit_fst(const ir_node *node)
 {
-	switch (get_mode_size_bits(get_ia32_ls_mode(node))) {
-		case 32:
-			bemit8(0xD9); // fsts
-			break;
-
-		case 64:
-			bemit8(0xDD); // fstl
-			break;
-
-		default:
-			panic("invalid mode size");
-	}
-	bemit_mod_am(2, node);
-}
-
-static void bemit_fstp(const ir_node *node)
-{
-	switch (get_mode_size_bits(get_ia32_ls_mode(node))) {
-		case 32:
-			bemit8(0xD9); // fstps
-			bemit_mod_am(3, node);
-			return;
-
-		case 64:
-			bemit8(0xDD); // fstpl
-			bemit_mod_am(3, node);
-			return;
-
-		case 80:
-		case 96:
-			bemit8(0xDB); // fstpt
-			bemit_mod_am(7, node);
-			return;
-
-		default:
-			panic("invalid mode size");
+	unsigned       op;
+	unsigned const size = get_mode_size_bits(get_ia32_ls_mode(node));
+	switch (size) {
+	case 32: bemit8(0xD9); op = 2; break; // fst[p]s
+	case 64: bemit8(0xDD); op = 2; break; // fst[p]l
+	case 80:
+	case 96: bemit8(0xDB); op = 6; break; // fstpt
+	default: panic("invalid mode size");
 	}
+	if (get_ia32_x87_attr_const(node)->pop)
+		++op;
+	// There is only a pop variant for long double store.
+	assert(size < 80 || get_ia32_x87_attr_const(node)->pop);
+	bemit_mod_am(op, node);
 }
 
 static void bemit_fsub(const ir_node *node)
@@ -3636,21 +3371,6 @@ static void bemit_fsub(const ir_node *node)
 	bemit_fbinop(node, 4, 5);
 }
 
-static void bemit_fsubp(const ir_node *node)
-{
-	bemit_fbinopp(node, 0xE8);
-}
-
-static void bemit_fsubr(const ir_node *node)
-{
-	bemit_fbinop(node, 5, 4);
-}
-
-static void bemit_fsubrp(const ir_node *node)
-{
-	bemit_fbinopp(node, 0xE0);
-}
-
 static void bemit_fnstcw(const ir_node *node)
 {
 	bemit8(0xD9); // fnstcw
@@ -3675,30 +3395,15 @@ static void bemit_ftstfnstsw(const ir_node *node)
 static void bemit_fucomi(const ir_node *node)
 {
 	const ia32_x87_attr_t *attr = get_ia32_x87_attr_const(node);
-	bemit8(0xDB); // fucomi
-	bemit8(0xE8 + attr->x87[1]->index);
-}
-
-static void bemit_fucomip(const ir_node *node)
-{
-	const ia32_x87_attr_t *attr = get_ia32_x87_attr_const(node);
-	bemit8(0xDF); // fucomip
-	bemit8(0xE8 + attr->x87[1]->index);
+	bemit8(attr->pop ? 0xDF : 0xDB); // fucom[p]i
+	bemit8(0xE8 + attr->reg->index);
 }
 
 static void bemit_fucomfnstsw(const ir_node *node)
 {
 	const ia32_x87_attr_t *attr = get_ia32_x87_attr_const(node);
-	bemit8(0xDD); // fucom
-	bemit8(0xE0 + attr->x87[1]->index);
-	bemit_fnstsw();
-}
-
-static void bemit_fucompfnstsw(const ir_node *node)
-{
-	const ia32_x87_attr_t *attr = get_ia32_x87_attr_const(node);
-	bemit8(0xDD); // fucomp
-	bemit8(0xE8 + attr->x87[1]->index);
+	bemit8(0xDD); // fucom[p]
+	bemit8((attr->pop ? 0xE8 : 0xE0) + attr->reg->index);
 	bemit_fnstsw();
 }
 
@@ -3713,22 +3418,7 @@ static void bemit_fucomppfnstsw(const ir_node *node)
 
 static void bemit_fxch(const ir_node *node)
 {
-	const ia32_x87_attr_t *attr = get_ia32_x87_attr_const(node);
-	bemit8(0xD9);
-	bemit8(0xC8 + attr->x87[0]->index);
-}
-
-/**
- * The type of a emitter function.
- */
-typedef void (*emit_func) (const ir_node *);
-
-/**
- * Set a node emitter. Make it a bit more type safe.
- */
-static void register_emitter(ir_op *op, emit_func func)
-{
-	op->ops.generic = (op_func) func;
+	bemit_fop_reg(node, 0xD9, 0xC8);
 }
 
 static void ia32_register_binary_emitters(void)
@@ -3737,135 +3427,130 @@ static void ia32_register_binary_emitters(void)
 	ir_clear_opcodes_generic_func();
 
 	/* benode emitter */
-	register_emitter(op_be_Copy,            bemit_copy);
-	register_emitter(op_be_CopyKeep,        bemit_copy);
-	register_emitter(op_be_IncSP,           bemit_incsp);
-	register_emitter(op_be_Perm,            bemit_perm);
-	register_emitter(op_be_Return,          bemit_return);
-	register_emitter(op_ia32_Adc,           bemit_adc);
-	register_emitter(op_ia32_Add,           bemit_add);
-	register_emitter(op_ia32_AddMem,        bemit_addmem);
-	register_emitter(op_ia32_AddMem8Bit,    bemit_addmem8bit);
-	register_emitter(op_ia32_And,           bemit_and);
-	register_emitter(op_ia32_AndMem,        bemit_andmem);
-	register_emitter(op_ia32_AndMem8Bit,    bemit_andmem8bit);
-	register_emitter(op_ia32_Breakpoint,    bemit_int3);
-	register_emitter(op_ia32_CMovcc,        bemit_cmovcc);
-	register_emitter(op_ia32_Call,          bemit_call);
-	register_emitter(op_ia32_Cltd,          bemit_cltd);
-	register_emitter(op_ia32_Cmc,           bemit_cmc);
-	register_emitter(op_ia32_Cmp,           bemit_cmp);
-	register_emitter(op_ia32_Cmp8Bit,       bemit_cmp8bit);
-	register_emitter(op_ia32_Const,         bemit_mov_const);
-	register_emitter(op_ia32_Conv_I2I,      bemit_conv_i2i);
-	register_emitter(op_ia32_Conv_I2I8Bit,  bemit_conv_i2i);
-	register_emitter(op_ia32_CopyB_i,       bemit_copybi);
-	register_emitter(op_ia32_Cwtl,          bemit_cwtl);
-	register_emitter(op_ia32_Dec,           bemit_dec);
-	register_emitter(op_ia32_DecMem,        bemit_decmem);
-	register_emitter(op_ia32_Div,           bemit_div);
-	register_emitter(op_ia32_FldCW,         bemit_fldcw);
-	register_emitter(op_ia32_FnstCW,        bemit_fnstcw);
-	register_emitter(op_ia32_FtstFnstsw,    bemit_ftstfnstsw);
-	register_emitter(op_ia32_FucomFnstsw,   bemit_fucomfnstsw);
-	register_emitter(op_ia32_Fucomi,        bemit_fucomi);
-	register_emitter(op_ia32_FucompFnstsw,  bemit_fucompfnstsw);
-	register_emitter(op_ia32_Fucompi,       bemit_fucomip);
-	register_emitter(op_ia32_FucomppFnstsw, bemit_fucomppfnstsw);
-	register_emitter(op_ia32_IDiv,          bemit_idiv);
-	register_emitter(op_ia32_IJmp,          bemit_ijmp);
-	register_emitter(op_ia32_IMul,          bemit_imul);
-	register_emitter(op_ia32_IMul1OP,       bemit_imul1op);
-	register_emitter(op_ia32_Inc,           bemit_inc);
-	register_emitter(op_ia32_IncMem,        bemit_incmem);
-	register_emitter(op_ia32_Jcc,           bemit_ia32_jcc);
-	register_emitter(op_ia32_Jmp,           bemit_jump);
-	register_emitter(op_ia32_LdTls,         bemit_ldtls);
-	register_emitter(op_ia32_Lea,           bemit_lea);
-	register_emitter(op_ia32_Leave,         bemit_leave);
-	register_emitter(op_ia32_Load,          bemit_load);
-	register_emitter(op_ia32_Minus64Bit,    bemit_minus64bit);
-	register_emitter(op_ia32_Mul,           bemit_mul);
-	register_emitter(op_ia32_Neg,           bemit_neg);
-	register_emitter(op_ia32_NegMem,        bemit_negmem);
-	register_emitter(op_ia32_Not,           bemit_not);
-	register_emitter(op_ia32_NotMem,        bemit_notmem);
-	register_emitter(op_ia32_Or,            bemit_or);
-	register_emitter(op_ia32_OrMem,         bemit_ormem);
-	register_emitter(op_ia32_OrMem8Bit,     bemit_ormem8bit);
-	register_emitter(op_ia32_Pop,           bemit_pop);
-	register_emitter(op_ia32_PopEbp,        bemit_pop);
-	register_emitter(op_ia32_PopMem,        bemit_popmem);
-	register_emitter(op_ia32_Push,          bemit_push);
-	register_emitter(op_ia32_RepPrefix,     bemit_rep);
-	register_emitter(op_ia32_Rol,           bemit_rol);
-	register_emitter(op_ia32_RolMem,        bemit_rolmem);
-	register_emitter(op_ia32_Ror,           bemit_ror);
-	register_emitter(op_ia32_RorMem,        bemit_rormem);
-	register_emitter(op_ia32_Sahf,          bemit_sahf);
-	register_emitter(op_ia32_Sar,           bemit_sar);
-	register_emitter(op_ia32_SarMem,        bemit_sarmem);
-	register_emitter(op_ia32_Sbb,           bemit_sbb);
-	register_emitter(op_ia32_Setcc,         bemit_setcc);
-	register_emitter(op_ia32_Shl,           bemit_shl);
-	register_emitter(op_ia32_ShlD,          bemit_shld);
-	register_emitter(op_ia32_ShlMem,        bemit_shlmem);
-	register_emitter(op_ia32_Shr,           bemit_shr);
-	register_emitter(op_ia32_ShrD,          bemit_shrd);
-	register_emitter(op_ia32_ShrMem,        bemit_shrmem);
-	register_emitter(op_ia32_Stc,           bemit_stc);
-	register_emitter(op_ia32_Store,         bemit_store);
-	register_emitter(op_ia32_Store8Bit,     bemit_store);
-	register_emitter(op_ia32_Sub,           bemit_sub);
-	register_emitter(op_ia32_SubMem,        bemit_submem);
-	register_emitter(op_ia32_SubMem8Bit,    bemit_submem8bit);
-	register_emitter(op_ia32_SubSP,         bemit_subsp);
-	register_emitter(op_ia32_SwitchJmp,     bemit_switchjmp);
-	register_emitter(op_ia32_Test,          bemit_test);
-	register_emitter(op_ia32_Test8Bit,      bemit_test8bit);
-	register_emitter(op_ia32_Xor,           bemit_xor);
-	register_emitter(op_ia32_Xor0,          bemit_xor0);
-	register_emitter(op_ia32_XorMem,        bemit_xormem);
-	register_emitter(op_ia32_XorMem8Bit,    bemit_xormem8bit);
-	register_emitter(op_ia32_fabs,          bemit_fabs);
-	register_emitter(op_ia32_fadd,          bemit_fadd);
-	register_emitter(op_ia32_faddp,         bemit_faddp);
-	register_emitter(op_ia32_fchs,          bemit_fchs);
-	register_emitter(op_ia32_fdiv,          bemit_fdiv);
-	register_emitter(op_ia32_fdivp,         bemit_fdivp);
-	register_emitter(op_ia32_fdivr,         bemit_fdivr);
-	register_emitter(op_ia32_fdivrp,        bemit_fdivrp);
-	register_emitter(op_ia32_fild,          bemit_fild);
-	register_emitter(op_ia32_fist,          bemit_fist);
-	register_emitter(op_ia32_fistp,         bemit_fistp);
-	register_emitter(op_ia32_fld,           bemit_fld);
-	register_emitter(op_ia32_fld1,          bemit_fld1);
-	register_emitter(op_ia32_fldz,          bemit_fldz);
-	register_emitter(op_ia32_fmul,          bemit_fmul);
-	register_emitter(op_ia32_fmulp,         bemit_fmulp);
-	register_emitter(op_ia32_fpop,          bemit_fpop);
-	register_emitter(op_ia32_fpush,         bemit_fpush);
-	register_emitter(op_ia32_fpushCopy,     bemit_fpushcopy);
-	register_emitter(op_ia32_fst,           bemit_fst);
-	register_emitter(op_ia32_fstp,          bemit_fstp);
-	register_emitter(op_ia32_fsub,          bemit_fsub);
-	register_emitter(op_ia32_fsubp,         bemit_fsubp);
-	register_emitter(op_ia32_fsubr,         bemit_fsubr);
-	register_emitter(op_ia32_fsubrp,        bemit_fsubrp);
-	register_emitter(op_ia32_fxch,          bemit_fxch);
+	be_set_emitter(op_be_Copy,            bemit_copy);
+	be_set_emitter(op_be_CopyKeep,        bemit_copy);
+	be_set_emitter(op_be_IncSP,           bemit_incsp);
+	be_set_emitter(op_be_Perm,            bemit_perm);
+	be_set_emitter(op_be_Return,          bemit_return);
+	be_set_emitter(op_ia32_Adc,           bemit_adc);
+	be_set_emitter(op_ia32_Add,           bemit_add);
+	be_set_emitter(op_ia32_AddMem,        bemit_addmem);
+	be_set_emitter(op_ia32_AddMem8Bit,    bemit_addmem8bit);
+	be_set_emitter(op_ia32_And,           bemit_and);
+	be_set_emitter(op_ia32_AndMem,        bemit_andmem);
+	be_set_emitter(op_ia32_AndMem8Bit,    bemit_andmem8bit);
+	be_set_emitter(op_ia32_Asm,           emit_ia32_Asm); // TODO implement binary emitter
+	be_set_emitter(op_ia32_Breakpoint,    bemit_int3);
+	be_set_emitter(op_ia32_Bsf,           bemit_bsf);
+	be_set_emitter(op_ia32_Bsr,           bemit_bsr);
+	be_set_emitter(op_ia32_Bswap,         bemit_bswap);
+	be_set_emitter(op_ia32_Bt,            bemit_bt);
+	be_set_emitter(op_ia32_CMovcc,        bemit_cmovcc);
+	be_set_emitter(op_ia32_Call,          bemit_call);
+	be_set_emitter(op_ia32_Cltd,          bemit_cltd);
+	be_set_emitter(op_ia32_Cmc,           bemit_cmc);
+	be_set_emitter(op_ia32_Cmp,           bemit_cmp);
+	be_set_emitter(op_ia32_Cmp8Bit,       bemit_cmp8bit);
+	be_set_emitter(op_ia32_Const,         bemit_mov_const);
+	be_set_emitter(op_ia32_Conv_I2I,      bemit_conv_i2i);
+	be_set_emitter(op_ia32_Conv_I2I8Bit,  bemit_conv_i2i);
+	be_set_emitter(op_ia32_CopyB_i,       bemit_copybi);
+	be_set_emitter(op_ia32_Cwtl,          bemit_cwtl);
+	be_set_emitter(op_ia32_Dec,           bemit_dec);
+	be_set_emitter(op_ia32_DecMem,        bemit_decmem);
+	be_set_emitter(op_ia32_Div,           bemit_div);
+	be_set_emitter(op_ia32_FldCW,         bemit_fldcw);
+	be_set_emitter(op_ia32_FnstCW,        bemit_fnstcw);
+	be_set_emitter(op_ia32_FtstFnstsw,    bemit_ftstfnstsw);
+	be_set_emitter(op_ia32_FucomFnstsw,   bemit_fucomfnstsw);
+	be_set_emitter(op_ia32_Fucomi,        bemit_fucomi);
+	be_set_emitter(op_ia32_FucomppFnstsw, bemit_fucomppfnstsw);
+	be_set_emitter(op_ia32_IDiv,          bemit_idiv);
+	be_set_emitter(op_ia32_IJmp,          bemit_ijmp);
+	be_set_emitter(op_ia32_IMul,          bemit_imul);
+	be_set_emitter(op_ia32_IMul1OP,       bemit_imul1op);
+	be_set_emitter(op_ia32_Inc,           bemit_inc);
+	be_set_emitter(op_ia32_IncMem,        bemit_incmem);
+	be_set_emitter(op_ia32_Jcc,           bemit_ia32_jcc);
+	be_set_emitter(op_ia32_Jmp,           bemit_jump);
+	be_set_emitter(op_ia32_LdTls,         bemit_ldtls);
+	be_set_emitter(op_ia32_Lea,           bemit_lea);
+	be_set_emitter(op_ia32_Leave,         bemit_leave);
+	be_set_emitter(op_ia32_Load,          bemit_load);
+	be_set_emitter(op_ia32_Minus64Bit,    bemit_minus64bit);
+	be_set_emitter(op_ia32_Mul,           bemit_mul);
+	be_set_emitter(op_ia32_Neg,           bemit_neg);
+	be_set_emitter(op_ia32_NegMem,        bemit_negmem);
+	be_set_emitter(op_ia32_Not,           bemit_not);
+	be_set_emitter(op_ia32_NotMem,        bemit_notmem);
+	be_set_emitter(op_ia32_Or,            bemit_or);
+	be_set_emitter(op_ia32_OrMem,         bemit_ormem);
+	be_set_emitter(op_ia32_OrMem8Bit,     bemit_ormem8bit);
+	be_set_emitter(op_ia32_Pop,           bemit_pop);
+	be_set_emitter(op_ia32_PopEbp,        bemit_pop);
+	be_set_emitter(op_ia32_PopMem,        bemit_popmem);
+	be_set_emitter(op_ia32_Popcnt,        bemit_popcnt);
+	be_set_emitter(op_ia32_Push,          bemit_push);
+	be_set_emitter(op_ia32_RepPrefix,     bemit_rep);
+	be_set_emitter(op_ia32_Rol,           bemit_rol);
+	be_set_emitter(op_ia32_RolMem,        bemit_rolmem);
+	be_set_emitter(op_ia32_Ror,           bemit_ror);
+	be_set_emitter(op_ia32_RorMem,        bemit_rormem);
+	be_set_emitter(op_ia32_Sahf,          bemit_sahf);
+	be_set_emitter(op_ia32_Sar,           bemit_sar);
+	be_set_emitter(op_ia32_SarMem,        bemit_sarmem);
+	be_set_emitter(op_ia32_Sbb,           bemit_sbb);
+	be_set_emitter(op_ia32_Sbb0,          bemit_sbb0);
+	be_set_emitter(op_ia32_Setcc,         bemit_setcc);
+	be_set_emitter(op_ia32_Shl,           bemit_shl);
+	be_set_emitter(op_ia32_ShlD,          bemit_shld);
+	be_set_emitter(op_ia32_ShlMem,        bemit_shlmem);
+	be_set_emitter(op_ia32_Shr,           bemit_shr);
+	be_set_emitter(op_ia32_ShrD,          bemit_shrd);
+	be_set_emitter(op_ia32_ShrMem,        bemit_shrmem);
+	be_set_emitter(op_ia32_Stc,           bemit_stc);
+	be_set_emitter(op_ia32_Store,         bemit_store);
+	be_set_emitter(op_ia32_Store8Bit,     bemit_store);
+	be_set_emitter(op_ia32_Sub,           bemit_sub);
+	be_set_emitter(op_ia32_SubMem,        bemit_submem);
+	be_set_emitter(op_ia32_SubMem8Bit,    bemit_submem8bit);
+	be_set_emitter(op_ia32_SubSP,         bemit_subsp);
+	be_set_emitter(op_ia32_SwitchJmp,     bemit_switchjmp);
+	be_set_emitter(op_ia32_Test,          bemit_test);
+	be_set_emitter(op_ia32_Test8Bit,      bemit_test8bit);
+	be_set_emitter(op_ia32_Xor,           bemit_xor);
+	be_set_emitter(op_ia32_Xor0,          bemit_xor0);
+	be_set_emitter(op_ia32_XorMem,        bemit_xormem);
+	be_set_emitter(op_ia32_XorMem8Bit,    bemit_xormem8bit);
+	be_set_emitter(op_ia32_fabs,          bemit_fabs);
+	be_set_emitter(op_ia32_fadd,          bemit_fadd);
+	be_set_emitter(op_ia32_fchs,          bemit_fchs);
+	be_set_emitter(op_ia32_fdiv,          bemit_fdiv);
+	be_set_emitter(op_ia32_ffreep,        bemit_ffreep);
+	be_set_emitter(op_ia32_fild,          bemit_fild);
+	be_set_emitter(op_ia32_fist,          bemit_fist);
+	be_set_emitter(op_ia32_fisttp,        bemit_fisttp);
+	be_set_emitter(op_ia32_fld,           bemit_fld);
+	be_set_emitter(op_ia32_fld1,          bemit_fld1);
+	be_set_emitter(op_ia32_fldz,          bemit_fldz);
+	be_set_emitter(op_ia32_fmul,          bemit_fmul);
+	be_set_emitter(op_ia32_fpop,          bemit_fpop);
+	be_set_emitter(op_ia32_fpush,         bemit_fpush);
+	be_set_emitter(op_ia32_fpushCopy,     bemit_fpushcopy);
+	be_set_emitter(op_ia32_fst,           bemit_fst);
+	be_set_emitter(op_ia32_fsub,          bemit_fsub);
+	be_set_emitter(op_ia32_fxch,          bemit_fxch);
 
 	/* ignore the following nodes */
-	register_emitter(op_ia32_ProduceVal,   emit_Nothing);
-	register_emitter(op_be_Keep,           emit_Nothing);
-	register_emitter(op_be_Start,          emit_Nothing);
-	register_emitter(op_Phi,               emit_Nothing);
-	register_emitter(op_Start,             emit_Nothing);
+	be_set_emitter(op_Phi,             be_emit_nothing);
+	be_set_emitter(op_be_Keep,         be_emit_nothing);
+	be_set_emitter(op_be_Start,        be_emit_nothing);
+	be_set_emitter(op_ia32_ProduceVal, be_emit_nothing);
+	be_set_emitter(op_ia32_Unknown,    be_emit_nothing);
 }
 
 static void gen_binary_block(ir_node *block)
 {
-	ir_node *node;
-
 	ia32_emit_block_header(block);
 
 	/* emit the contents of the block */