Reduce code duplication and resolve inconsistencies (due to code duplication) in...
[libfirm] / ir / be / ia32 / ia32_emitter.c
index 188a9c0..d2dddc2 100644 (file)
@@ -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.
  *
  * @version     $Id$
  *
  * Summary table for x86 floatingpoint compares:
+ * (remember effect of unordered on x86: ZF=1, PF=1, CF=1)
+ *
  *   pnc_Eq  => !P && E
  *   pnc_Lt  => !P && B
  *   pnc_Le  => !P && BE
  *   pnc_Gt  => A
  *   pnc_Ge  => AE
- *   pnc_Lg  => P || NE
+ *   pnc_Lg  => NE
  *   pnc_Leg => NP  (ordered)
  *   pnc_Uo  => P
  *   pnc_Ue  => E
@@ -37,7 +39,7 @@
  *   pnc_Ule => BE
  *   pnc_Ug  => P || A
  *   pnc_Uge => P || AE
- *   pnc_Ne  => NE
+ *   pnc_Ne  => P || NE
  */
 #include "config.h"
 
 #include "../be_dbgout.h"
 
 #include "ia32_emitter.h"
+#include "ia32_common_transform.h"
 #include "gen_ia32_emitter.h"
 #include "gen_ia32_regalloc_if.h"
 #include "ia32_nodes_attr.h"
 #include "ia32_new_nodes.h"
-#include "ia32_map_regs.h"
 #include "ia32_architecture.h"
 #include "bearch_ia32_t.h"
 
@@ -83,7 +85,6 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 #define SNPRINTF_BUF_LEN 128
 
 static const ia32_isa_t *isa;
-static ia32_code_gen_t  *cg;
 static char              pic_base_label[128];
 static ir_label_t        exc_label_id;
 static int               mark_spill_reload = 0;
@@ -92,7 +93,7 @@ static int               do_pic;
 /** Return the next block in Block schedule */
 static ir_node *get_prev_block_sched(const ir_node *block)
 {
-       return get_irn_link(block);
+       return (ir_node*)get_irn_link(block);
 }
 
 /** Checks if the current block is a fall-through target. */
@@ -154,23 +155,9 @@ static const arch_register_t *get_in_reg(const ir_node *irn, int pos)
 
        assert(reg && "no in register found");
 
-       if (reg == &ia32_gp_regs[REG_GP_NOREG])
+       if (reg == &ia32_registers[REG_GP_NOREG])
                panic("trying to emit noreg for %+F input %d", irn, pos);
 
-       /* in case of unknown register: just return a valid register */
-       if (reg == &ia32_gp_regs[REG_GP_UKNWN]) {
-               const arch_register_req_t *req = arch_get_register_req(irn, pos);
-
-               if (arch_register_req_is(req, limited)) {
-                       /* in case of limited requirements: get the first allowed register */
-                       unsigned idx = rbitset_next(req->limited, 0, 1);
-                       reg = arch_register_for_index(req->cls, idx);
-               } else {
-                       /* otherwise get first register in class */
-                       reg = arch_register_for_index(req->cls, 0);
-               }
-       }
-
        return reg;
 }
 
@@ -219,26 +206,17 @@ static char *get_unique_label(char *buf, size_t buflen, const char *prefix)
        return buf;
 }
 
-/*************************************************************
- *             _       _    __   _          _
- *            (_)     | |  / _| | |        | |
- *  _ __  _ __ _ _ __ | |_| |_  | |__   ___| |_ __   ___ _ __
- * | '_ \| '__| | '_ \| __|  _| | '_ \ / _ \ | '_ \ / _ \ '__|
- * | |_) | |  | | | | | |_| |   | | | |  __/ | |_) |  __/ |
- * | .__/|_|  |_|_| |_|\__|_|   |_| |_|\___|_| .__/ \___|_|
- * | |                                       | |
- * |_|                                       |_|
- *************************************************************/
-
 /**
  * Emit the name of the 8bit low register
  */
 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]);
+       be_emit_char(reg_name[1]); /* get the basic name of the register */
        be_emit_char('l');
 }
 
@@ -248,18 +226,20 @@ 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]);
+       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 = ia32_get_mapped_reg_name(isa->regs_16bit, reg);
+       const char *reg_name = arch_register_get_name(reg);
 
        be_emit_char('%');
-       be_emit_string(reg_name);
+       be_emit_string(reg_name+1); /* skip the 'e' prefix of the 32bit names */
 }
 
 /**
@@ -443,7 +423,7 @@ void ia32_emit_x87_mode_suffix(const ir_node *node)
                        case 128: be_emit_char('t'); return;
                }
        } else {
-               assert(mode_is_int(mode));
+               assert(mode_is_int(mode) || mode_is_reference(mode));
                switch (get_mode_size_bits(mode)) {
                        case 16: be_emit_char('s');     return;
                        case 32: be_emit_char('l');     return;
@@ -507,7 +487,7 @@ void ia32_emit_source_register_or_immediate(const ir_node *node, int pos)
 static ir_node *get_cfop_target_block(const ir_node *irn)
 {
        assert(get_irn_mode(irn) == mode_X);
-       return get_irn_link(irn);
+       return (ir_node*)get_irn_link(irn);
 }
 
 /**
@@ -519,62 +499,54 @@ static void ia32_emit_cfop_target(const ir_node *node)
        be_gas_emit_block_name(block);
 }
 
-/*
- * positive conditions for signed compares
- */
-static const char *const cmp2condition_s[] = {
-       NULL, /* always false */
-       "e",  /* == */
-       "l",  /* <  */
-       "le", /* <= */
-       "g",  /* >  */
-       "ge", /* >= */
-       "ne", /* != */
-       NULL  /* always true */
-};
-
-/*
- * positive conditions for unsigned compares
- */
-static const char *const cmp2condition_u[] = {
-       NULL, /* always false */
-       "e",  /* == */
-       "b",  /* <  */
-       "be", /* <= */
-       "a",  /* >  */
-       "ae", /* >= */
-       "ne", /* != */
-       NULL  /* always true */
-};
-
 /**
  * Emit the suffix for a compare instruction.
  */
-static void ia32_emit_cmp_suffix(int pnc)
-{
-       const char *str;
-
-       if (pnc == ia32_pn_Cmp_parity) {
-               be_emit_char('p');
-               return;
-       }
-
-       if (pnc & ia32_pn_Cmp_float || pnc & ia32_pn_Cmp_unsigned) {
-               str = cmp2condition_u[pnc & 7];
-       } else {
-               str = cmp2condition_s[pnc & 7];
+static void ia32_emit_condition_code(ia32_condition_code_t cc)
+{
+       switch (cc) {
+       case ia32_cc_overflow:      be_emit_cstring("o");  return;
+       case ia32_cc_not_overflow:  be_emit_cstring("no"); return;
+       case ia32_cc_float_below:
+       case ia32_cc_float_unordered_below:
+       case ia32_cc_below:         be_emit_cstring("b");  return;
+       case ia32_cc_float_above_equal:
+       case ia32_cc_float_unordered_above_equal:
+       case ia32_cc_above_equal:   be_emit_cstring("ae"); return;
+       case ia32_cc_float_equal:
+       case ia32_cc_equal:         be_emit_cstring("e");  return;
+       case ia32_cc_float_not_equal:
+       case ia32_cc_not_equal:     be_emit_cstring("ne"); return;
+       case ia32_cc_float_below_equal:
+       case ia32_cc_float_unordered_below_equal:
+       case ia32_cc_below_equal:   be_emit_cstring("be"); return;
+       case ia32_cc_float_above:
+       case ia32_cc_float_unordered_above:
+       case ia32_cc_above:         be_emit_cstring("a");  return;
+       case ia32_cc_sign:          be_emit_cstring("s");  return;
+       case ia32_cc_not_sign:      be_emit_cstring("ns"); return;
+       case ia32_cc_parity:        be_emit_cstring("p");  return;
+       case ia32_cc_not_parity:    be_emit_cstring("np"); return;
+       case ia32_cc_less:          be_emit_cstring("l");  return;
+       case ia32_cc_greater_equal: be_emit_cstring("ge"); return;
+       case ia32_cc_less_equal:    be_emit_cstring("le"); return;
+       case ia32_cc_greater:       be_emit_cstring("g");  return;
+       case ia32_cc_float_parity_cases:
+       case ia32_cc_additional_float_cases:
+               break;
        }
-
-       be_emit_string(str);
+       panic("Invalid ia32 condition code");
 }
 
 typedef enum ia32_emit_mod_t {
+       EMIT_NONE         = 0,
        EMIT_RESPECT_LS   = 1U << 0,
        EMIT_ALTERNATE_AM = 1U << 1,
        EMIT_LONG         = 1U << 2,
        EMIT_HIGH_REG     = 1U << 3,
        EMIT_LOW_REG      = 1U << 4
 } ia32_emit_mod_t;
+ENUM_BITSET(ia32_emit_mod_t)
 
 /**
  * Emits address mode.
@@ -585,12 +557,15 @@ void ia32_emit_am(const ir_node *node)
        int        offs      = get_ia32_am_offs_int(node);
        ir_node   *base      = get_irn_n(node, n_ia32_base);
        int        has_base  = !is_ia32_NoReg_GP(base);
-       ir_node   *index     = get_irn_n(node, n_ia32_index);
-       int        has_index = !is_ia32_NoReg_GP(index);
+       ir_node   *idx       = get_irn_n(node, n_ia32_index);
+       int        has_index = !is_ia32_NoReg_GP(idx);
 
        /* just to be sure... */
        assert(!is_ia32_use_frame(node) || get_ia32_frame_ent(node) != NULL);
 
+       if (get_ia32_am_tls_segment(node))
+               be_emit_cstring("%gs:");
+
        /* emit offset */
        if (ent != NULL) {
                const ia32_attr_t *attr = get_ia32_attr_const(node);
@@ -665,7 +640,7 @@ static void ia32_emitf(const ir_node *node, const char *fmt, ...)
 
        for (;;) {
                const char      *start = fmt;
-               ia32_emit_mod_t  mod   = 0;
+               ia32_emit_mod_t  mod   = EMIT_NONE;
 
                while (*fmt != '%' && *fmt != '\n' && *fmt != '\0')
                        ++fmt;
@@ -700,6 +675,9 @@ static void ia32_emitf(const ir_node *node, const char *fmt, ...)
 end_of_mods:
 
                switch (*fmt++) {
+                       arch_register_t const *reg;
+                       ir_node         const *imm;
+
                        case '%':
                                be_emit_char('%');
                                break;
@@ -713,17 +691,13 @@ emit_AM:
                                                ia32_emit_am(node);
                                                break;
 
-                                       case 'R': {
-                                               const arch_register_t *reg = va_arg(ap, const arch_register_t*);
+                                       case 'R':
+                                               reg = va_arg(ap, const arch_register_t*);
                                                if (get_ia32_op_type(node) == ia32_AddrModeS) {
                                                        goto emit_AM;
                                                } else {
-                                                       if (mod & EMIT_ALTERNATE_AM)
-                                                               be_emit_char('*');
-                                                       emit_register(reg, NULL);
+                                                       goto emit_R;
                                                }
-                                               break;
-                                       }
 
                                        case 'S':
                                                if (get_ia32_op_type(node) == ia32_AddrModeS) {
@@ -733,49 +707,45 @@ emit_AM:
                                                        assert(get_ia32_op_type(node) == ia32_Normal);
                                                        goto emit_S;
                                                }
-                                               break;
 
                                        default: goto unknown;
                                }
                                break;
                        }
 
-                       case 'D': {
-                               unsigned               pos;
-                               const arch_register_t *reg;
-
+                       case 'D':
                                if (*fmt < '0' || '9' <= *fmt)
                                        goto unknown;
-
-                               pos = *fmt++ - '0';
-                               reg = get_out_reg(node, pos);
-                               emit_register(reg, mod & EMIT_RESPECT_LS ? get_ia32_ls_mode(node) : NULL);
-                               break;
-                       }
+                               reg = get_out_reg(node, *fmt++ - '0');
+                               goto emit_R;
 
                        case 'I':
+                               imm = node;
+emit_I:
                                if (!(mod & EMIT_ALTERNATE_AM))
                                        be_emit_char('$');
-                               emit_ia32_Immediate_no_prefix(node);
+                               emit_ia32_Immediate_no_prefix(imm);
                                break;
 
                        case 'L':
                                ia32_emit_cfop_target(node);
                                break;
 
-                       case 'M': {
+                       case 'M':
                                ia32_emit_mode_suffix_mode(get_ia32_ls_mode(node));
                                break;
-                       }
 
                        case 'P': {
-                               int pnc = va_arg(ap, int);
-                               ia32_emit_cmp_suffix(pnc);
+                               ia32_condition_code_t cc = va_arg(ap, ia32_condition_code_t);
+                               ia32_emit_condition_code(cc);
                                break;
                        }
 
-                       case 'R': {
-                               const arch_register_t *reg = va_arg(ap, const arch_register_t*);
+                       case 'R':
+                               reg = va_arg(ap, const arch_register_t*);
+emit_R:
+                               if (mod & EMIT_ALTERNATE_AM)
+                                       be_emit_char('*');
                                if (mod & EMIT_HIGH_REG) {
                                        emit_8bit_register_high(reg);
                                } else if (mod & EMIT_LOW_REG) {
@@ -784,31 +754,22 @@ emit_AM:
                                        emit_register(reg, mod & EMIT_RESPECT_LS ? get_ia32_ls_mode(node) : NULL);
                                }
                                break;
-                       }
 
 emit_S:
                        case 'S': {
-                               unsigned       pos;
-                               const ir_node *in;
+                               unsigned pos;
 
                                if (*fmt < '0' || '9' <= *fmt)
                                        goto unknown;
 
                                pos = *fmt++ - '0';
-                               in  = get_irn_n(node, pos);
-                               if (is_ia32_Immediate(in)) {
-                                       if (!(mod & EMIT_ALTERNATE_AM))
-                                               be_emit_char('$');
-                                       emit_ia32_Immediate_no_prefix(in);
+                               imm = get_irn_n(node, pos);
+                               if (is_ia32_Immediate(imm)) {
+                                       goto emit_I;
                                } else {
-                                       const arch_register_t *reg;
-
-                                       if (mod & EMIT_ALTERNATE_AM)
-                                               be_emit_char('*');
                                        reg = get_in_reg(node, pos);
-                                       emit_register(reg, mod & EMIT_RESPECT_LS ? get_ia32_ls_mode(node) : NULL);
+                                       goto emit_R;
                                }
-                               break;
                        }
 
                        case 's': {
@@ -959,7 +920,7 @@ static ir_node *find_original_value(ir_node *node)
        }
 }
 
-static int determine_final_pnc(const ir_node *node, int flags_pos, int pnc)
+static int determine_final_cc(const ir_node *node, int flags_pos, int cc)
 {
        ir_node           *flags = get_irn_n(node, flags_pos);
        const ia32_attr_t *flags_attr;
@@ -977,40 +938,21 @@ static int determine_final_pnc(const ir_node *node, int flags_pos, int pnc)
                }
 
                flags_attr = get_ia32_attr_const(cmp);
-               if (flags_attr->data.ins_permuted)
-                       pnc = get_mirrored_pnc(pnc);
-               pnc |= ia32_pn_Cmp_float;
-       } else if (is_ia32_Ucomi(flags) || is_ia32_Fucomi(flags)
-                       || is_ia32_Fucompi(flags)) {
-               flags_attr = get_ia32_attr_const(flags);
-
-               if (flags_attr->data.ins_permuted)
-                       pnc = get_mirrored_pnc(pnc);
-               pnc |= ia32_pn_Cmp_float;
        } else {
                flags_attr = get_ia32_attr_const(flags);
-
-               if (flags_attr->data.ins_permuted)
-                       pnc = get_mirrored_pnc(pnc);
-               if (flags_attr->data.cmp_unsigned)
-                       pnc |= ia32_pn_Cmp_unsigned;
        }
 
-       return pnc;
-}
-
-static pn_Cmp ia32_get_negated_pnc(pn_Cmp pnc)
-{
-       ir_mode *mode = pnc & ia32_pn_Cmp_float ? mode_F : mode_Iu;
-       return get_negated_pnc(pnc, mode);
+       if (flags_attr->data.ins_permuted)
+               cc = ia32_invert_condition_code(cc);
+       return cc;
 }
 
 void ia32_emit_cmp_suffix_node(const ir_node *node, int flags_pos)
 {
-       pn_Cmp pnc = get_ia32_condcode(node);
-       pnc = determine_final_pnc(node, flags_pos, pnc);
+       ia32_condition_code_t cc = get_ia32_condcode(node);
+       cc = determine_final_cc(node, flags_pos, cc);
 
-       ia32_emit_cmp_suffix(pnc);
+       ia32_emit_condition_code(cc);
 }
 
 /**
@@ -1057,13 +999,12 @@ static int can_be_fallthrough(const ir_node *node)
  */
 static void emit_ia32_Jcc(const ir_node *node)
 {
-       int            need_parity_label = 0;
-       const ir_node *proj_true;
-       const ir_node *proj_false;
-       const ir_node *block;
-       pn_Cmp         pnc = get_ia32_condcode(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;
 
-       pnc = determine_final_pnc(node, 0, pnc);
+       cc = determine_final_cc(node, 0, cc);
 
        /* get both Projs */
        proj_true = get_proj(node, pn_ia32_Jcc_true);
@@ -1072,33 +1013,21 @@ static void emit_ia32_Jcc(const ir_node *node)
        proj_false = get_proj(node, pn_ia32_Jcc_false);
        assert(proj_false && "Jcc without false Proj");
 
-       block      = get_nodes_block(node);
-
        if (can_be_fallthrough(proj_true)) {
                /* exchange both proj's so the second one can be omitted */
                const ir_node *t = proj_true;
 
                proj_true  = proj_false;
                proj_false = t;
-               pnc        = ia32_get_negated_pnc(pnc);
+               cc         = ia32_negate_condition_code(cc);
        }
 
-       if (pnc & ia32_pn_Cmp_float) {
+       if (cc & ia32_cc_float_parity_cases) {
                /* Some floating point comparisons require a test of the parity flag,
                 * which indicates that the result is unordered */
-               switch (pnc & 0x0f) {
-               case pn_Cmp_Uo: {
+               if (cc & ia32_cc_negated) {
                        ia32_emitf(proj_true, "\tjp %L\n");
-                       break;
-               }
-
-               case pn_Cmp_Leg:
-                       ia32_emitf(proj_true, "\tjnp %L\n");
-                       break;
-
-               case pn_Cmp_Eq:
-               case pn_Cmp_Lt:
-               case pn_Cmp_Le:
+               } 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)) {
@@ -1107,22 +1036,9 @@ static void emit_ia32_Jcc(const ir_node *node)
                        } else {
                                ia32_emitf(proj_false, "\tjp %L\n");
                        }
-                       goto emit_jcc;
-
-               case pn_Cmp_Ug:
-               case pn_Cmp_Uge:
-               case pn_Cmp_Ne:
-                       ia32_emitf(proj_true, "\tjp %L\n");
-                       goto emit_jcc;
-
-               default:
-                       goto emit_jcc;
                }
-       } else {
-emit_jcc:
-               ia32_emitf(proj_true, "\tj%P %L\n", pnc);
        }
-
+       ia32_emitf(proj_true, "\tj%P %L\n", cc);
        if (need_parity_label) {
                ia32_emitf(NULL, "1:\n");
        }
@@ -1143,56 +1059,38 @@ static void emit_ia32_Setcc(const ir_node *node)
 {
        const arch_register_t *dreg = get_out_reg(node, pn_ia32_Setcc_res);
 
-       pn_Cmp pnc = get_ia32_condcode(node);
-       pnc        = determine_final_pnc(node, n_ia32_Setcc_eflags, pnc);
-       if (pnc & ia32_pn_Cmp_float) {
-               switch (pnc & 0x0f) {
-               case pn_Cmp_Uo:
-                       ia32_emitf(node, "\tsetp %#R\n", dreg);
-                       return;
-
-               case pn_Cmp_Leg:
-                       ia32_emitf(node, "\tsetnp %#R\n", dreg);
-                       return;
-
-               case pn_Cmp_Eq:
-               case pn_Cmp_Lt:
-               case pn_Cmp_Le:
-                       ia32_emitf(node, "\tset%P %<R\n", pnc, dreg);
-                       ia32_emitf(node, "\tsetnp %>R\n", dreg);
-                       ia32_emitf(node, "\tandb %>R, %<R\n", dreg, dreg);
-                       return;
-
-               case pn_Cmp_Ug:
-               case pn_Cmp_Uge:
-               case pn_Cmp_Ne:
-                       ia32_emitf(node, "\tset%P %<R\n", pnc, dreg);
+       ia32_condition_code_t cc = get_ia32_condcode(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);
-                       return;
-
-               default:
-                       break;
+               } 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);
                }
+       } else {
+               ia32_emitf(node, "\tset%P %#R\n", cc, dreg);
        }
-       ia32_emitf(node, "\tset%P %#R\n", pnc, dreg);
 }
 
 static void emit_ia32_CMovcc(const ir_node *node)
 {
-       const ia32_attr_t     *attr         = get_ia32_attr_const(node);
-       const arch_register_t *out          = arch_irn_get_register(node, pn_ia32_res);
-       pn_Cmp                 pnc          = get_ia32_condcode(node);
+       const ia32_attr_t     *attr = get_ia32_attr_const(node);
+       const arch_register_t *out  = arch_irn_get_register(node, pn_ia32_res);
+       ia32_condition_code_t  cc   = get_ia32_condcode(node);
        const arch_register_t *in_true;
        const arch_register_t *in_false;
 
-       pnc = determine_final_pnc(node, n_ia32_CMovcc_eflags, pnc);
+       cc = determine_final_cc(node, n_ia32_CMovcc_eflags, cc);
        /* although you can't set ins_permuted in the constructor it might still
         * be set by memory operand folding
         * Permuting inputs of a cmov means the condition is negated!
         */
        if (attr->data.ins_permuted)
-               pnc = ia32_get_negated_pnc(pnc);
+               cc = ia32_negate_condition_code(cc);
 
        in_true  = arch_get_irn_register(get_irn_n(node, n_ia32_CMovcc_val_true));
        in_false = arch_get_irn_register(get_irn_n(node, n_ia32_CMovcc_val_false));
@@ -1205,7 +1103,7 @@ static void emit_ia32_CMovcc(const ir_node *node)
 
                assert(get_ia32_op_type(node) == ia32_Normal);
 
-               pnc = ia32_get_negated_pnc(pnc);
+               cc = ia32_negate_condition_code(cc);
 
                tmp      = in_true;
                in_true  = in_false;
@@ -1215,156 +1113,24 @@ static void emit_ia32_CMovcc(const ir_node *node)
                ia32_emitf(node, "\tmovl %R, %R\n", in_false, out);
        }
 
-       /* TODO: handling of Nans isn't correct yet */
-       if (pnc & ia32_pn_Cmp_float) {
-               switch (pnc & 0x0f) {
-               case pn_Cmp_Uo:
-               case pn_Cmp_Leg:
-               case pn_Cmp_Eq:
-               case pn_Cmp_Lt:
-               case pn_Cmp_Le:
-               case pn_Cmp_Ug:
-               case pn_Cmp_Uge:
-               case pn_Cmp_Ne:
-                       panic("CMov with floatingpoint compare/parity not supported yet");
-               }
+       if (cc & ia32_cc_float_parity_cases) {
+               panic("CMov with floatingpoint compare/parity not supported yet");
        }
 
-       ia32_emitf(node, "\tcmov%P %#AR, %#R\n", pnc, in_true, out);
-}
-
-/*********************************************************
- *                 _ _       _
- *                (_) |     (_)
- *   ___ _ __ ___  _| |_     _ _   _ _ __ ___  _ __  ___
- *  / _ \ '_ ` _ \| | __|   | | | | | '_ ` _ \| '_ \/ __|
- * |  __/ | | | | | | |_    | | |_| | | | | | | |_) \__ \
- *  \___|_| |_| |_|_|\__|   | |\__,_|_| |_| |_| .__/|___/
- *                         _/ |               | |
- *                        |__/                |_|
- *********************************************************/
-
-/* jump table entry (target and corresponding number) */
-typedef struct _branch_t {
-       ir_node *target;
-       int      value;
-} branch_t;
-
-/* jump table for switch generation */
-typedef struct _jmp_tbl_t {
-       ir_node  *defProj;                 /**< default target */
-       long      min_value;               /**< smallest switch case */
-       long      max_value;               /**< largest switch case */
-       long      num_branches;            /**< number of jumps */
-       char      label[SNPRINTF_BUF_LEN]; /**< label of the jump table */
-       branch_t *branches;                /**< jump array */
-} jmp_tbl_t;
-
-/**
- * Compare two variables of type branch_t. Used to sort all switch cases
- */
-static int ia32_cmp_branch_t(const void *a, const void *b)
-{
-       branch_t *b1 = (branch_t *)a;
-       branch_t *b2 = (branch_t *)b;
-
-       if (b1->value <= b2->value)
-               return -1;
-       else
-               return 1;
-}
-
-static void generate_jump_table(jmp_tbl_t *tbl, const ir_node *node)
-{
-       int                 i;
-       long                pnc;
-       long                default_pn;
-       ir_node            *proj;
-       const ir_edge_t    *edge;
-
-       /* fill the table structure */
-       get_unique_label(tbl->label, SNPRINTF_BUF_LEN, "TBL_");
-       tbl->defProj      = NULL;
-       tbl->num_branches = get_irn_n_edges(node) - 1;
-       tbl->branches     = XMALLOCNZ(branch_t, tbl->num_branches);
-       tbl->min_value    = LONG_MAX;
-       tbl->max_value    = LONG_MIN;
-
-       default_pn = get_ia32_condcode(node);
-       i = 0;
-       /* go over all proj's and collect them */
-       foreach_out_edge(node, edge) {
-               proj = get_edge_src_irn(edge);
-               assert(is_Proj(proj) && "Only proj allowed at SwitchJmp");
-
-               pnc = get_Proj_proj(proj);
-
-               /* check for default proj */
-               if (pnc == default_pn) {
-                       assert(tbl->defProj == NULL && "found two default Projs at SwitchJmp");
-                       tbl->defProj = proj;
-               } else {
-                       tbl->min_value = pnc < tbl->min_value ? pnc : tbl->min_value;
-                       tbl->max_value = pnc > tbl->max_value ? pnc : tbl->max_value;
-
-                       /* create branch entry */
-                       tbl->branches[i].target = proj;
-                       tbl->branches[i].value  = pnc;
-                       ++i;
-               }
-
-       }
-       assert(i == tbl->num_branches);
-
-       /* sort the branches by their number */
-       qsort(tbl->branches, tbl->num_branches, sizeof(tbl->branches[0]), ia32_cmp_branch_t);
+       ia32_emitf(node, "\tcmov%P %#AR, %#R\n", cc, in_true, out);
 }
 
 /**
- * Emits code for a SwitchJmp (creates a jump table if
- * possible otherwise a cmp-jmp cascade). Port from
- * cggg ia32 backend
+ * Emits code for a SwitchJmp
  */
 static void emit_ia32_SwitchJmp(const ir_node *node)
 {
-       unsigned long       interval;
-       int                 last_value, i;
-       jmp_tbl_t           tbl;
-
-       /* fill the table structure */
-       generate_jump_table(&tbl, node);
-
-       /* two-complement's magic make this work without overflow */
-       interval = tbl.max_value - tbl.min_value;
-
-       /* emit the table */
-       ia32_emitf(node,        "\tcmpl $%u, %S0\n", interval);
-       ia32_emitf(tbl.defProj, "\tja %L\n");
+       ir_entity *jump_table = get_ia32_am_sc(node);
+       long       default_pn = get_ia32_default_pn(node);
 
-       if (tbl.num_branches > 1) {
-               /* create table */
-               ia32_emitf(node, "\tjmp *%s(,%S0,4)\n", tbl.label);
+       ia32_emitf(node, "\tjmp *%AM\n", node);
 
-               be_gas_emit_switch_section(GAS_SECTION_RODATA);
-               ia32_emitf(NULL, "\t.align 4\n");
-               ia32_emitf(NULL, "%s:\n", tbl.label);
-
-               last_value = tbl.branches[0].value;
-               for (i = 0; i != tbl.num_branches; ++i) {
-                       while (last_value != tbl.branches[i].value) {
-                               ia32_emitf(tbl.defProj, ".long %L\n");
-                               ++last_value;
-                       }
-                       ia32_emitf(tbl.branches[i].target, ".long %L\n");
-                       ++last_value;
-               }
-               be_gas_emit_switch_section(GAS_SECTION_TEXT);
-       } else {
-               /* one jump is enough */
-               ia32_emitf(tbl.branches[0].target, "\tjmp %L\n");
-       }
-
-       free(tbl.branches);
+       emit_jump_table(node, default_pn, jump_table, get_cfop_target_block);
 }
 
 /**
@@ -1372,11 +1138,6 @@ static void emit_ia32_SwitchJmp(const ir_node *node)
  */
 static void emit_ia32_Jmp(const ir_node *node)
 {
-       ir_node *block;
-
-       /* for now, the code works for scheduled and non-schedules blocks */
-       block = get_nodes_block(node);
-
        /* we have a block schedule */
        if (can_be_fallthrough(node)) {
                ia32_emitf(node, "\t/* fallthrough to %L */\n");
@@ -1401,10 +1162,9 @@ static const char* emit_asm_operand(const ir_node *node, const char *s)
        const arch_register_t *reg;
        const ia32_asm_reg_t  *asm_regs = attr->register_map;
        const ia32_asm_reg_t  *asm_reg;
-       const char            *reg_name;
        char                   c;
        char                   modifier = 0;
-       int                    num      = -1;
+       int                    num;
        int                    p;
 
        assert(*s == '%');
@@ -1445,8 +1205,7 @@ static const char* emit_asm_operand(const ir_node *node, const char *s)
        }
 
        /* parse number */
-       sscanf(s, "%d%n", &num, &p);
-       if (num < 0) {
+       if (sscanf(s, "%d%n", &num, &p) != 1) {
                ir_fprintf(stderr, "Warning: Couldn't parse assembler operand (%+F)\n",
                           node);
                return s;
@@ -1454,7 +1213,7 @@ static const char* emit_asm_operand(const ir_node *node, const char *s)
                s += p;
        }
 
-       if (num < 0 || ARR_LEN(asm_regs) <= num) {
+       if (num < 0 || ARR_LEN(asm_regs) <= (size_t)num) {
                ir_fprintf(stderr,
                                "Error: Custom assembler references invalid input/output (%+F)\n",
                                node);
@@ -1489,21 +1248,19 @@ static const char* emit_asm_operand(const ir_node *node, const char *s)
 
        /* emit it */
        if (modifier != 0) {
-               be_emit_char('%');
                switch (modifier) {
                case 'b':
-                       reg_name = ia32_get_mapped_reg_name(isa->regs_8bit, reg);
+                       emit_8bit_register(reg);
                        break;
                case 'h':
-                       reg_name = ia32_get_mapped_reg_name(isa->regs_8bit_high, reg);
+                       emit_8bit_register_high(reg);
                        break;
                case 'w':
-                       reg_name = ia32_get_mapped_reg_name(isa->regs_16bit, reg);
+                       emit_16bit_register(reg);
                        break;
                default:
                        panic("Invalid asm op modifier");
                }
-               be_emit_string(reg_name);
        } else {
                emit_register(reg, asm_reg->mode);
        }
@@ -1542,16 +1299,6 @@ static void emit_ia32_Asm(const ir_node *node)
        ia32_emitf(NULL, "\n#NO_APP\n");
 }
 
-/**********************************
- *   _____                  ____
- *  / ____|                |  _ \
- * | |     ___  _ __  _   _| |_) |
- * | |    / _ \| '_ \| | | |  _ <
- * | |___| (_) | |_) | |_| | |_) |
- *  \_____\___/| .__/ \__, |____/
- *             | |     __/ |
- *             |_|    |___/
- **********************************/
 
 /**
  * Emit movsb/w instructions to make mov count divideable by 4
@@ -1591,17 +1338,6 @@ static void emit_ia32_CopyB_i(const ir_node *node)
 }
 
 
-
-/***************************
- *   _____
- *  / ____|
- * | |     ___  _ ____   __
- * | |    / _ \| '_ \ \ / /
- * | |___| (_) | | | \ V /
- *  \_____\___/|_| |_|\_/
- *
- ***************************/
-
 /**
  * Emit code for conversions (I, FP), (FP, I) and (FP, FP).
  */
@@ -1635,8 +1371,8 @@ static void emit_ia32_Conv_FP2FP(const ir_node *node)
  */
 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);
+       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));
@@ -1656,16 +1392,6 @@ static void emit_ia32_Call(const ir_node *node)
 }
 
 
-/*******************************************
- *  _                          _
- * | |                        | |
- * | |__   ___ _ __   ___   __| | ___  ___
- * | '_ \ / _ \ '_ \ / _ \ / _` |/ _ \/ __|
- * | |_) |  __/ | | | (_) | (_| |  __/\__ \
- * |_.__/ \___|_| |_|\___/ \__,_|\___||___/
- *
- *******************************************/
-
 /**
  * Emits code to increase stack pointer.
  */
@@ -1683,16 +1409,6 @@ static void emit_be_IncSP(const ir_node *node)
        }
 }
 
-static inline bool is_unknown_reg(const arch_register_t *reg)
-{
-       if (reg == &ia32_gp_regs[REG_GP_UKNWN]
-                       || reg == &ia32_xmm_regs[REG_XMM_UKNWN]
-                       || reg == &ia32_vfp_regs[REG_VFP_UKNWN])
-               return true;
-
-       return false;
-}
-
 /**
  * Emits code for Copy/CopyKeep.
  */
@@ -1704,8 +1420,6 @@ static void Copy_emitter(const ir_node *node, const ir_node *op)
        if (in == out) {
                return;
        }
-       if (is_unknown_reg(in))
-               return;
        /* copies of vf nodes aren't real... */
        if (arch_register_get_class(in) == &ia32_reg_classes[CLASS_ia32_vfp])
                return;
@@ -1766,14 +1480,6 @@ static void emit_ia32_Const(const ir_node *node)
        ia32_emitf(node, "\tmovl %I, %D0\n");
 }
 
-/**
- * Emits code to load the TLS base
- */
-static void emit_ia32_LdTls(const ir_node *node)
-{
-       ia32_emitf(node, "\tmovl %%gs:0, %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)
 {
@@ -1904,16 +1610,6 @@ static void emit_Nothing(const ir_node *node)
 }
 
 
-/***********************************************************************************
- *                  _          __                                             _
- *                 (_)        / _|                                           | |
- *  _ __ ___   __ _ _ _ __   | |_ _ __ __ _ _ __ ___   _____      _____  _ __| | __
- * | '_ ` _ \ / _` | | '_ \  |  _| '__/ _` | '_ ` _ \ / _ \ \ /\ / / _ \| '__| |/ /
- * | | | | | | (_| | | | | | | | | | | (_| | | | | | |  __/\ V  V / (_) | |  |   <
- * |_| |_| |_|\__,_|_|_| |_| |_| |_|  \__,_|_| |_| |_|\___| \_/\_/ \___/|_|  |_|\_\
- *
- ***********************************************************************************/
-
 /**
  * Enters the emitter functions for handled nodes into the generic
  * pointer of an opcode.
@@ -1923,9 +1619,9 @@ 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 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 BE_IGN(a)       op_be_##a->ops.generic = (op_func)emit_Nothing
 
        /* first clear the generic function pointer for all ops */
        clear_irp_opcodes_generic_func();
@@ -1949,7 +1645,6 @@ static void ia32_register_emitters(void)
        IA32_EMIT(IMul);
        IA32_EMIT(Jcc);
        IA32_EMIT(Setcc);
-       IA32_EMIT(LdTls);
        IA32_EMIT(Minus64Bit);
        IA32_EMIT(SwitchJmp);
        IA32_EMIT(ClimbFrame);
@@ -1962,7 +1657,6 @@ static void ia32_register_emitters(void)
        BE_EMIT(Perm);
        BE_EMIT(Return);
 
-       BE_IGN(Barrier);
        BE_IGN(Keep);
        BE_IGN(Start);
 
@@ -2061,7 +1755,8 @@ static void ia32_emit_align_label(void)
 static int should_align_block(const ir_node *block)
 {
        static const double DELTA = .0001;
-       ir_exec_freq *exec_freq   = cg->birg->exec_freq;
+       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 */
@@ -2105,10 +1800,10 @@ static int should_align_block(const ir_node *block)
  */
 static void ia32_emit_block_header(ir_node *block)
 {
-       ir_graph     *irg = current_ir_graph;
+       ir_graph     *irg        = current_ir_graph;
        int           need_label = block_needs_label(block);
-       int           i, arity;
-       ir_exec_freq *exec_freq = cg->birg->exec_freq;
+       ir_exec_freq *exec_freq  = be_get_irg_exec_freq(irg);
+       int           arity;
 
        if (block == get_irg_end_block(irg))
                return;
@@ -2158,6 +1853,7 @@ static void ia32_emit_block_header(ir_node *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));
@@ -2200,7 +1896,7 @@ typedef struct exc_entry {
  */
 static void ia32_gen_labels(ir_node *block, void *data)
 {
-       exc_entry **exc_list = data;
+       exc_entry **exc_list = (exc_entry**)data;
        ir_node *pred;
        int     n;
 
@@ -2225,8 +1921,8 @@ static void ia32_gen_labels(ir_node *block, void *data)
  */
 static int cmp_exc_entry(const void *a, const void *b)
 {
-       const exc_entry *ea = a;
-       const exc_entry *eb = b;
+       const exc_entry *ea = (const exc_entry*)a;
+       const exc_entry *eb = (const exc_entry*)b;
 
        if (get_ia32_exc_label_id(ea->exc_instr) < get_ia32_exc_label_id(eb->exc_instr))
                return -1;
@@ -2236,15 +1932,17 @@ static int cmp_exc_entry(const void *a, const void *b)
 /**
  * Main driver. Emits the code for one routine.
  */
-void ia32_gen_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg)
+void ia32_gen_routine(ir_graph *irg)
 {
-       ir_entity *entity     = get_irg_entity(irg);
-       exc_entry *exc_list   = NEW_ARR_F(exc_entry, 0);
+       ir_entity        *entity    = get_irg_entity(irg);
+       exc_entry        *exc_list  = NEW_ARR_F(exc_entry, 0);
+       const arch_env_t *arch_env  = be_get_irg_arch_env(irg);
+       ia32_irg_data_t  *irg_data  = ia32_get_irg_data(irg);
+       ir_node         **blk_sched = irg_data->blk_sched;
        int i, n;
 
-       cg       = ia32_cg;
-       isa      = cg->isa;
-       do_pic   = cg->birg->main_env->options->pic;
+       isa      = (ia32_isa_t*) arch_env;
+       do_pic   = be_get_irg_options(irg)->pic;
 
        be_gas_elf_type_char = '@';
 
@@ -2252,7 +1950,7 @@ void ia32_gen_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg)
 
        get_unique_label(pic_base_label, sizeof(pic_base_label), "PIC_BASE");
 
-       be_dbg_method_begin(entity, be_abi_get_stack_layout(cg->birg->abi));
+       be_dbg_method_begin(entity);
        be_gas_emit_function_prolog(entity, ia32_cg_config.function_alignment);
 
        /* we use links to point to target blocks */
@@ -2260,16 +1958,16 @@ void ia32_gen_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg)
        irg_block_walk_graph(irg, ia32_gen_labels, NULL, &exc_list);
 
        /* initialize next block links */
-       n = ARR_LEN(cg->blk_sched);
+       n = ARR_LEN(blk_sched);
        for (i = 0; i < n; ++i) {
-               ir_node *block = cg->blk_sched[i];
-               ir_node *prev  = i > 0 ? cg->blk_sched[i-1] : NULL;
+               ir_node *block = blk_sched[i];
+               ir_node *prev  = i > 0 ? blk_sched[i-1] : NULL;
 
                set_irn_link(block, prev);
        }
 
        for (i = 0; i < n; ++i) {
-               ir_node *block = cg->blk_sched[i];
+               ir_node *block = blk_sched[i];
 
                ia32_gen_block(block);
        }
@@ -2285,14 +1983,14 @@ void ia32_gen_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg)
           Those are ascending with ascending addresses. */
        qsort(exc_list, ARR_LEN(exc_list), sizeof(exc_list[0]), cmp_exc_entry);
        {
-               int i;
+               size_t e;
 
-               for (i = 0; i < ARR_LEN(exc_list); ++i) {
+               for (e = 0; e < ARR_LEN(exc_list); ++e) {
                        be_emit_cstring("\t.long ");
-                       ia32_emit_exc_label(exc_list[i].exc_instr);
+                       ia32_emit_exc_label(exc_list[e].exc_instr);
                        be_emit_char('\n');
                        be_emit_cstring("\t.long ");
-                       be_gas_emit_block_name(exc_list[i].block);
+                       be_gas_emit_block_name(exc_list[e].block);
                        be_emit_char('\n');
                }
        }
@@ -2309,48 +2007,23 @@ static const lc_opt_table_entry_t ia32_emitter_options[] = {
 static unsigned char reg_gp_map[N_ia32_gp_REGS];
 //static unsigned char reg_mmx_map[N_ia32_mmx_REGS];
 //static unsigned char reg_sse_map[N_ia32_xmm_REGS];
-static unsigned char pnc_map_signed[8];
-static unsigned char pnc_map_unsigned[8];
 
 static void build_reg_map(void)
 {
-       reg_gp_map[REG_EAX] = 0x0;
-       reg_gp_map[REG_ECX] = 0x1;
-       reg_gp_map[REG_EDX] = 0x2;
-       reg_gp_map[REG_EBX] = 0x3;
-       reg_gp_map[REG_ESP] = 0x4;
-       reg_gp_map[REG_EBP] = 0x5;
-       reg_gp_map[REG_ESI] = 0x6;
-       reg_gp_map[REG_EDI] = 0x7;
-
-       pnc_map_signed[pn_Cmp_Eq]    = 0x04;
-       pnc_map_signed[pn_Cmp_Lt]    = 0x0C;
-       pnc_map_signed[pn_Cmp_Le]    = 0x0E;
-       pnc_map_signed[pn_Cmp_Gt]    = 0x0F;
-       pnc_map_signed[pn_Cmp_Ge]    = 0x0D;
-       pnc_map_signed[pn_Cmp_Lg]    = 0x05;
-
-       pnc_map_unsigned[pn_Cmp_Eq]    = 0x04;
-       pnc_map_unsigned[pn_Cmp_Lt]    = 0x02;
-       pnc_map_unsigned[pn_Cmp_Le]    = 0x06;
-       pnc_map_unsigned[pn_Cmp_Gt]    = 0x07;
-       pnc_map_unsigned[pn_Cmp_Ge]    = 0x03;
-       pnc_map_unsigned[pn_Cmp_Lg]    = 0x05;
+       reg_gp_map[REG_GP_EAX] = 0x0;
+       reg_gp_map[REG_GP_ECX] = 0x1;
+       reg_gp_map[REG_GP_EDX] = 0x2;
+       reg_gp_map[REG_GP_EBX] = 0x3;
+       reg_gp_map[REG_GP_ESP] = 0x4;
+       reg_gp_map[REG_GP_EBP] = 0x5;
+       reg_gp_map[REG_GP_ESI] = 0x6;
+       reg_gp_map[REG_GP_EDI] = 0x7;
 }
 
 /** Returns the encoding for a pnc field. */
-static unsigned char pnc2cc(int pnc)
+static unsigned char pnc2cc(ia32_condition_code_t cc)
 {
-       unsigned char cc;
-       if (pnc == ia32_pn_Cmp_parity) {
-               cc = 0x0A;
-       } else if (pnc & ia32_pn_Cmp_float || pnc & ia32_pn_Cmp_unsigned) {
-               cc = pnc_map_unsigned[pnc & 0x07];
-       } else {
-               cc = pnc_map_signed[pnc & 0x07];
-       }
-       assert(cc != 0);
-       return cc;
+       return cc & 0xf;
 }
 
 /** Sign extension bit values for binops */
@@ -2523,8 +2196,8 @@ static void bemit_mod_am(unsigned reg, const ir_node *node)
        int        offs      = get_ia32_am_offs_int(node);
        ir_node   *base      = get_irn_n(node, n_ia32_base);
        int        has_base  = !is_ia32_NoReg_GP(base);
-       ir_node   *index     = get_irn_n(node, n_ia32_index);
-       int        has_index = !is_ia32_NoReg_GP(index);
+       ir_node   *idx       = get_irn_n(node, n_ia32_index);
+       int        has_index = !is_ia32_NoReg_GP(idx);
        unsigned   modrm     = 0;
        unsigned   sib       = 0;
        unsigned   emitoffs  = 0;
@@ -2559,7 +2232,7 @@ static void bemit_mod_am(unsigned reg, const ir_node *node)
 
        /* Determine if we need a SIB byte. */
        if (has_index) {
-               const arch_register_t *reg_index = arch_get_irn_register(index);
+               const arch_register_t *reg_index = arch_get_irn_register(idx);
                int                    scale     = get_ia32_am_scale(node);
                assert(scale < 4);
                /* R/M set to ESP means SIB in 32bit mode. */
@@ -2645,7 +2318,7 @@ static void bemit_binop_with_imm(
                        bemit_mod_am(ruval, node);
                } else {
                        const arch_register_t *reg = get_in_reg(node, n_ia32_binary_left);
-                       if (reg->index == REG_EAX) {
+                       if (reg->index == REG_GP_EAX) {
                                bemit8(opcode_ax);
                        } else {
                                bemit8(opcode);
@@ -2726,7 +2399,7 @@ static void bemit_copy(const ir_node *copy)
        const arch_register_t *in  = get_in_reg(copy, 0);
        const arch_register_t *out = get_out_reg(copy, 0);
 
-       if (in == out || is_unknown_reg(in))
+       if (in == out)
                return;
        /* copies of vf nodes aren't real... */
        if (arch_register_get_class(in) == &ia32_reg_classes[CLASS_ia32_vfp])
@@ -2750,9 +2423,9 @@ static void bemit_perm(const ir_node *node)
        assert(cls0 == arch_register_get_class(in1) && "Register class mismatch at Perm");
 
        if (cls0 == &ia32_reg_classes[CLASS_ia32_gp]) {
-               if (in0->index == REG_EAX) {
+               if (in0->index == REG_GP_EAX) {
                        bemit8(0x90 + reg_gp_map[in1->index]);
-               } else if (in1->index == REG_EAX) {
+               } else if (in1->index == REG_GP_EAX) {
                        bemit8(0x90 + reg_gp_map[in0->index]);
                } else {
                        bemit8(0x87);
@@ -2962,30 +2635,27 @@ static void bemit_setcc(const ir_node *node)
 {
        const arch_register_t *dreg = get_out_reg(node, pn_ia32_Setcc_res);
 
-       pn_Cmp pnc = get_ia32_condcode(node);
-       pnc        = determine_final_pnc(node, n_ia32_Setcc_eflags, pnc);
-       if (pnc & ia32_pn_Cmp_float) {
-               switch (pnc & 0x0f) {
-               case pn_Cmp_Uo:
-                        /* setp <dreg */
+       ia32_condition_code_t cc = get_ia32_condcode(node);
+       cc = determine_final_cc(node, n_ia32_Setcc_eflags, cc);
+       if (cc & ia32_cc_float_parity_cases) {
+               if (cc & ia32_cc_negated) {
+                       /* set%PNC <dreg */
                        bemit8(0x0F);
-                       bemit8(0x9A);
+                       bemit8(0x90 | pnc2cc(cc));
                        bemit_modrm8(REG_LOW, dreg);
-                       return;
 
-               case pn_Cmp_Leg:
-                        /* setnp <dreg*/
+                       /* setp >dreg */
                        bemit8(0x0F);
-                       bemit8(0x9B);
-                       bemit_modrm8(REG_LOW, dreg);
-                       return;
+                       bemit8(0x9A);
+                       bemit_modrm8(REG_HIGH, dreg);
 
-               case pn_Cmp_Eq:
-               case pn_Cmp_Lt:
-               case pn_Cmp_Le:
+                       /* orb %>dreg, %<dreg */
+                       bemit8(0x08);
+                       bemit_modrr8(REG_LOW, dreg, REG_HIGH, dreg);
+               } else {
                         /* set%PNC <dreg */
                        bemit8(0x0F);
-                       bemit8(0x90 | pnc2cc(pnc));
+                       bemit8(0x90 | pnc2cc(cc));
                        bemit_modrm8(REG_LOW, dreg);
 
                        /* setnp >dreg */
@@ -2996,34 +2666,13 @@ static void bemit_setcc(const ir_node *node)
                        /* andb %>dreg, %<dreg */
                        bemit8(0x20);
                        bemit_modrr8(REG_LOW, dreg, REG_HIGH, dreg);
-                       return;
-
-               case pn_Cmp_Ug:
-               case pn_Cmp_Uge:
-               case pn_Cmp_Ne:
-                       /* set%PNC <dreg */
-                       bemit8(0x0F);
-                       bemit8(0x90 | pnc2cc(pnc));
-                       bemit_modrm8(REG_LOW, dreg);
-
-                       /* setp >dreg */
-                       bemit8(0x0F);
-                       bemit8(0x9A);
-                       bemit_modrm8(REG_HIGH, dreg);
-
-                       /* orb %>dreg, %<dreg */
-                       bemit8(0x08);
-                       bemit_modrr8(REG_LOW, dreg, REG_HIGH, dreg);
-                       return;
-
-               default:
-                       break;
                }
+       } else {
+               /* set%PNC <dreg */
+               bemit8(0x0F);
+               bemit8(0x90 | pnc2cc(cc));
+               bemit_modrm8(REG_LOW, dreg);
        }
-       /* set%PNC <dreg */
-       bemit8(0x0F);
-       bemit8(0x90 | pnc2cc(pnc));
-       bemit_modrm8(REG_LOW, dreg);
 }
 
 static void bemit_cmovcc(const ir_node *node)
@@ -3031,11 +2680,11 @@ static void bemit_cmovcc(const ir_node *node)
        const ia32_attr_t     *attr         = get_ia32_attr_const(node);
        int                    ins_permuted = attr->data.ins_permuted;
        const arch_register_t *out          = arch_irn_get_register(node, pn_ia32_res);
-       pn_Cmp                 pnc          = get_ia32_condcode(node);
+       ia32_condition_code_t  cc           = get_ia32_condcode(node);
        const arch_register_t *in_true;
        const arch_register_t *in_false;
 
-       pnc = determine_final_pnc(node, n_ia32_CMovcc_eflags, pnc);
+       cc = determine_final_cc(node, n_ia32_CMovcc_eflags, cc);
 
        in_true  = arch_get_irn_register(get_irn_n(node, n_ia32_CMovcc_val_true));
        in_false = arch_get_irn_register(get_irn_n(node, n_ia32_CMovcc_val_false));
@@ -3054,12 +2703,13 @@ static void bemit_cmovcc(const ir_node *node)
        }
 
        if (ins_permuted)
-               pnc = ia32_get_negated_pnc(pnc);
+               cc = ia32_negate_condition_code(cc);
 
-       /* TODO: handling of Nans isn't correct yet */
+       if (cc & ia32_cc_float_parity_cases)
+               panic("cmov can't handle parity float cases");
 
        bemit8(0x0F);
-       bemit8(0x40 | pnc2cc(pnc));
+       bemit8(0x40 | pnc2cc(cc));
        if (get_ia32_op_type(node) == ia32_Normal) {
                bemit_modrr(in_true, out);
        } else {
@@ -3109,7 +2759,7 @@ static void bemit_cmp(const ir_node *node)
                                        bemit_mod_am(7, node);
                                } else {
                                        const arch_register_t *reg = get_in_reg(node, n_ia32_binary_left);
-                                       if (reg->index == REG_EAX) {
+                                       if (reg->index == REG_GP_EAX) {
                                                bemit8(0x3D);
                                        } else {
                                                bemit8(0x81);
@@ -3142,7 +2792,7 @@ static void bemit_cmp8bit(const ir_node *node)
        if (is_ia32_Immediate(right)) {
                if (get_ia32_op_type(node) == ia32_Normal) {
                        const arch_register_t *out = get_in_reg(node, n_ia32_Cmp_left);
-                       if (out->index == REG_EAX) {
+                       if (out->index == REG_GP_EAX) {
                                bemit8(0x3C);
                        } else {
                                bemit8(0x80);
@@ -3171,7 +2821,7 @@ static void bemit_test8bit(const ir_node *node)
        if (is_ia32_Immediate(right)) {
                if (get_ia32_op_type(node) == ia32_Normal) {
                        const arch_register_t *out = get_in_reg(node, n_ia32_Test8Bit_left);
-                       if (out->index == REG_EAX) {
+                       if (out->index == REG_GP_EAX) {
                                bemit8(0xA8);
                        } else {
                                bemit8(0xF6);
@@ -3241,7 +2891,7 @@ static void bemit_ldtls(const ir_node *node)
        const arch_register_t *out = get_out_reg(node, 0);
 
        bemit8(0x65); // gs:
-       if (out->index == REG_EAX) {
+       if (out->index == REG_GP_EAX) {
                bemit8(0xA1); // movl 0, %eax
        } else {
                bemit8(0x8B); // movl 0, %reg
@@ -3292,9 +2942,9 @@ static void bemit_helper_sbb(const arch_register_t *src, const arch_register_t *
 /* helper function for bemit_minus64bit */
 static void bemit_helper_xchg(const arch_register_t *src, const arch_register_t *dst)
 {
-       if (src->index == REG_EAX) {
+       if (src->index == REG_GP_EAX) {
                bemit8(0x90 + reg_gp_map[dst->index]); // xchgl %eax, %dst
-       } else if (dst->index == REG_EAX) {
+       } else if (dst->index == REG_GP_EAX) {
                bemit8(0x90 + reg_gp_map[src->index]); // xchgl %src, %eax
        } else {
                bemit8(0x87); // xchgl %src, %dst
@@ -3402,11 +3052,11 @@ static void bemit_load(const ir_node *node)
 {
        const arch_register_t *out = get_out_reg(node, 0);
 
-       if (out->index == REG_EAX) {
+       if (out->index == REG_GP_EAX) {
                ir_node   *base      = get_irn_n(node, n_ia32_base);
                int        has_base  = !is_ia32_NoReg_GP(base);
-               ir_node   *index     = get_irn_n(node, n_ia32_index);
-               int        has_index = !is_ia32_NoReg_GP(index);
+               ir_node   *idx       = get_irn_n(node, n_ia32_index);
+               int        has_index = !is_ia32_NoReg_GP(idx);
                if (!has_base && !has_index) {
                        ir_entity *ent  = get_ia32_am_sc(node);
                        int        offs = get_ia32_am_offs_int(node);
@@ -3447,11 +3097,11 @@ static void bemit_store(const ir_node *node)
        } else {
                const arch_register_t *in = get_in_reg(node, n_ia32_Store_val);
 
-               if (in->index == REG_EAX) {
+               if (in->index == REG_GP_EAX) {
                        ir_node   *base      = get_irn_n(node, n_ia32_base);
                        int        has_base  = !is_ia32_NoReg_GP(base);
-                       ir_node   *index     = get_irn_n(node, n_ia32_index);
-                       int        has_index = !is_ia32_NoReg_GP(index);
+                       ir_node   *idx       = get_irn_n(node, n_ia32_index);
+                       int        has_index = !is_ia32_NoReg_GP(idx);
                        if (!has_base && !has_index) {
                                ir_entity *ent  = get_ia32_am_sc(node);
                                int        offs = get_ia32_am_offs_int(node);
@@ -3587,14 +3237,13 @@ static void bemit_jp(bool odd, const ir_node *dest_block)
 
 static void bemit_ia32_jcc(const ir_node *node)
 {
-       int            pnc = get_ia32_condcode(node);
-       const ir_node *proj_true;
-       const ir_node *proj_false;
-       const ir_node *dest_true;
-       const ir_node *dest_false;
-       const ir_node *block;
+       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;
 
-       pnc = determine_final_pnc(node, 0, pnc);
+       cc = determine_final_cc(node, 0, cc);
 
        /* get both Projs */
        proj_true = get_proj(node, pn_ia32_Jcc_true);
@@ -3603,59 +3252,35 @@ static void bemit_ia32_jcc(const ir_node *node)
        proj_false = get_proj(node, pn_ia32_Jcc_false);
        assert(proj_false && "Jcc without false Proj");
 
-       block = get_nodes_block(node);
-
        if (can_be_fallthrough(proj_true)) {
                /* exchange both proj's so the second one can be omitted */
                const ir_node *t = proj_true;
 
                proj_true  = proj_false;
                proj_false = t;
-               pnc        = ia32_get_negated_pnc(pnc);
+               cc         = ia32_negate_condition_code(cc);
        }
 
        dest_true  = get_cfop_target_block(proj_true);
        dest_false = get_cfop_target_block(proj_false);
 
-       if (pnc & ia32_pn_Cmp_float) {
+       if (cc & ia32_cc_float_parity_cases) {
                /* Some floating point comparisons require a test of the parity flag,
                 * which indicates that the result is unordered */
-               switch (pnc & 15) {
-                       case pn_Cmp_Uo: {
-                               bemit_jp(false, dest_true);
-                               break;
+               if (cc & ia32_cc_negated) {
+                       bemit_jp(false, dest_true);
+               } 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)) {
+                               bemit8(0x7A);
+                               bemit8(0x06);  // jp + 6
+                       } else {
+                               bemit_jp(false, dest_false);
                        }
-
-                       case pn_Cmp_Leg:
-                               bemit_jp(true, dest_true);
-                               break;
-
-                       case pn_Cmp_Eq:
-                       case pn_Cmp_Lt:
-                       case pn_Cmp_Le:
-                               /* 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)) {
-                                       bemit8(0x7A);
-                                       bemit8(0x06);  // jp + 6
-                               } else {
-                                       bemit_jp(false, dest_false);
-                               }
-                               goto emit_jcc;
-
-                       case pn_Cmp_Ug:
-                       case pn_Cmp_Uge:
-                       case pn_Cmp_Ne:
-                               bemit_jp(false, dest_true);
-                               goto emit_jcc;
-
-                       default:
-                               goto emit_jcc;
                }
-       } else {
-emit_jcc:
-               bemit_jcc(pnc, dest_true);
        }
+       bemit_jcc(cc, dest_true);
 
        /* the second Proj might be a fallthrough */
        if (can_be_fallthrough(proj_false)) {
@@ -3667,63 +3292,13 @@ emit_jcc:
 
 static void bemit_switchjmp(const ir_node *node)
 {
-       unsigned long          interval;
-       int                    last_value;
-       int                    i;
-       jmp_tbl_t              tbl;
-       const arch_register_t *in;
-
-       /* fill the table structure */
-       generate_jump_table(&tbl, node);
+       ir_entity *jump_table = get_ia32_am_sc(node);
+       long       default_pn = get_ia32_default_pn(node);
 
-       /* two-complement's magic make this work without overflow */
-       interval = tbl.max_value - tbl.min_value;
+       bemit8(0xFF); // jmp *tbl.label(,%in,4)
+       bemit_mod_am(0x05, node);
 
-       in = get_in_reg(node, 0);
-       /* emit the table */
-       if (get_signed_imm_size(interval) == 1) {
-               bemit8(0x83); // cmpl $imm8, %in
-               bemit_modru(in, 7);
-               bemit8(interval);
-       } else {
-               bemit8(0x81); // cmpl $imm32, %in
-               bemit_modru(in, 7);
-               bemit32(interval);
-       }
-       bemit8(0x0F); // ja tbl.defProj
-       bemit8(0x87);
-       ia32_emitf(tbl.defProj, ".long %L - . - 4\n");
-
-       if (tbl.num_branches > 1) {
-               /* create table */
-               bemit8(0xFF); // jmp *tbl.label(,%in,4)
-               bemit8(MOD_IND | ENC_REG(4) | ENC_RM(0x04));
-               bemit8(ENC_SIB(2, reg_gp_map[in->index], 0x05));
-               be_emit_irprintf("\t.long %s\n", tbl.label);
-
-               be_gas_emit_switch_section(GAS_SECTION_RODATA);
-               be_emit_cstring(".align 4\n");
-               be_emit_irprintf("%s:\n", tbl.label);
-
-               last_value = tbl.branches[0].value;
-               for (i = 0; i != tbl.num_branches; ++i) {
-                       while (last_value != tbl.branches[i].value) {
-                               ia32_emitf(tbl.defProj, ".long %L\n");
-                               ++last_value;
-                       }
-                       ia32_emitf(tbl.branches[i].target, ".long %L\n");
-                       ++last_value;
-               }
-               be_gas_emit_switch_section(GAS_SECTION_TEXT);
-       } else {
-               /* one jump is enough */
-               panic("switch only has one case");
-               //ia32_emitf(tbl.branches[0].target, "\tjmp %L\n");
-       }
-
-       be_emit_write_line();
-
-       free(tbl.branches);
+       emit_jump_table(node, default_pn, jump_table, get_cfop_target_block);
 }
 
 /**
@@ -4287,7 +3862,6 @@ static void ia32_register_binary_emitters(void)
 
        /* ignore the following nodes */
        register_emitter(op_ia32_ProduceVal,   emit_Nothing);
-       register_emitter(op_be_Barrier,        emit_Nothing);
        register_emitter(op_be_Keep,           emit_Nothing);
        register_emitter(op_be_Start,          emit_Nothing);
        register_emitter(op_Phi,               emit_Nothing);
@@ -4306,13 +3880,15 @@ static void gen_binary_block(ir_node *block)
        }
 }
 
-void ia32_gen_binary_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg)
+void ia32_gen_binary_routine(ir_graph *irg)
 {
-       ir_entity *entity     = get_irg_entity(irg);
-       int i, n;
+       ir_entity        *entity    = get_irg_entity(irg);
+       const arch_env_t *arch_env  = be_get_irg_arch_env(irg);
+       ia32_irg_data_t  *irg_data  = ia32_get_irg_data(irg);
+       ir_node         **blk_sched = irg_data->blk_sched;
+       size_t            i, n;
 
-       cg  = ia32_cg;
-       isa = cg->isa;
+       isa = (ia32_isa_t*) arch_env;
 
        ia32_register_binary_emitters();
 
@@ -4323,16 +3899,16 @@ void ia32_gen_binary_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg)
        irg_block_walk_graph(irg, ia32_gen_labels, NULL, NULL);
 
        /* initialize next block links */
-       n = ARR_LEN(cg->blk_sched);
+       n = ARR_LEN(blk_sched);
        for (i = 0; i < n; ++i) {
-               ir_node *block = cg->blk_sched[i];
-               ir_node *prev  = i > 0 ? cg->blk_sched[i-1] : NULL;
+               ir_node *block = blk_sched[i];
+               ir_node *prev  = i > 0 ? blk_sched[i-1] : NULL;
 
                set_irn_link(block, prev);
        }
 
        for (i = 0; i < n; ++i) {
-               ir_node *block = cg->blk_sched[i];
+               ir_node *block = blk_sched[i];
                gen_binary_block(block);
        }
 
@@ -4345,8 +3921,6 @@ void ia32_gen_binary_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg)
 }
 
 
-
-
 void ia32_init_emitter(void)
 {
        lc_opt_entry_t *be_grp;