big refactoring of arch_XXX functions
[libfirm] / ir / be / ia32 / ia32_emitter.c
index e840ecc..045ea1b 100644 (file)
@@ -137,65 +137,6 @@ static int block_needs_label(const ir_node *block)
        return need_label;
 }
 
-/**
- * Returns the register at in position pos.
- */
-static const arch_register_t *get_in_reg(const ir_node *irn, int pos)
-{
-       ir_node               *op;
-       const arch_register_t *reg = NULL;
-
-       assert(get_irn_arity(irn) > pos && "Invalid IN position");
-
-       /* The out register of the operator at position pos is the
-          in register we need. */
-       op = get_irn_n(irn, pos);
-
-       reg = arch_get_irn_register(op);
-
-       assert(reg && "no in register found");
-
-       if (reg == &ia32_registers[REG_GP_NOREG])
-               panic("trying to emit noreg for %+F input %d", irn, pos);
-
-       return reg;
-}
-
-/**
- * Returns the register at out position pos.
- */
-static const arch_register_t *get_out_reg(const ir_node *irn, int pos)
-{
-       ir_node               *proj;
-       const arch_register_t *reg = NULL;
-
-       /* 1st case: irn is not of mode_T, so it has only                 */
-       /*           one OUT register -> good                             */
-       /* 2nd case: irn is of mode_T -> collect all Projs and ask the    */
-       /*           Proj with the corresponding projnum for the register */
-
-       if (get_irn_mode(irn) != mode_T) {
-               assert(pos == 0);
-               reg = arch_get_irn_register(irn);
-       } else if (is_ia32_irn(irn)) {
-               reg = arch_irn_get_register(irn, pos);
-       } else {
-               const ir_edge_t *edge;
-
-               foreach_out_edge(irn, edge) {
-                       proj = get_edge_src_irn(edge);
-                       assert(is_Proj(proj) && "non-Proj from mode_T node");
-                       if (get_Proj_proj(proj) == pos) {
-                               reg = arch_get_irn_register(proj);
-                               break;
-                       }
-               }
-       }
-
-       assert(reg && "no out register found");
-       return reg;
-}
-
 /**
  * Add a number to a prefix. This number will not be used a second time.
  */
@@ -269,7 +210,7 @@ static void emit_register(const arch_register_t *reg, const ir_mode *mode)
 
 void ia32_emit_source_register(const ir_node *node, int pos)
 {
-       const arch_register_t *reg = get_in_reg(node, pos);
+       const arch_register_t *reg = arch_get_irn_register_in(node, pos);
 
        emit_register(reg, NULL);
 }
@@ -325,13 +266,13 @@ void ia32_emit_8bit_source_register_or_immediate(const ir_node *node, int pos)
                return;
        }
 
-       reg = get_in_reg(node, pos);
+       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 = get_in_reg(node, pos);
+       const arch_register_t *reg = arch_get_irn_register_in(node, pos);
        emit_8bit_register_high(reg);
 }
 
@@ -344,27 +285,27 @@ void ia32_emit_16bit_source_register_or_immediate(const ir_node *node, int pos)
                return;
        }
 
-       reg = get_in_reg(node, pos);
+       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  = get_out_reg(node, 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  = get_out_reg(node, 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  = get_out_reg(node, pos);
+       const arch_register_t *reg  = arch_get_irn_register_out(node, pos);
 
        emit_register(reg, mode_Bu);
 }
@@ -476,7 +417,7 @@ void ia32_emit_source_register_or_immediate(const ir_node *node, int pos)
                emit_ia32_Immediate(in);
        } else {
                const ir_mode         *mode = get_ia32_ls_mode(node);
-               const arch_register_t *reg  = get_in_reg(node, pos);
+               const arch_register_t *reg  = arch_get_irn_register_in(node, pos);
                emit_register(reg, mode);
        }
 }
@@ -557,8 +498,8 @@ 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);
@@ -588,13 +529,13 @@ void ia32_emit_am(const ir_node *node)
 
                /* emit base */
                if (has_base) {
-                       const arch_register_t *reg = get_in_reg(node, n_ia32_base);
+                       const arch_register_t *reg = arch_get_irn_register_in(node, n_ia32_base);
                        emit_register(reg, NULL);
                }
 
                /* emit index + scale */
                if (has_index) {
-                       const arch_register_t *reg = get_in_reg(node, n_ia32_index);
+                       const arch_register_t *reg = arch_get_irn_register_in(node, n_ia32_index);
                        int scale;
                        be_emit_char(',');
                        emit_register(reg, NULL);
@@ -675,6 +616,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;
@@ -688,17 +632,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) {
@@ -708,40 +648,33 @@ 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 = arch_get_irn_register_out(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': {
                                ia32_condition_code_t cc = va_arg(ap, ia32_condition_code_t);
@@ -749,8 +682,11 @@ emit_AM:
                                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) {
@@ -759,31 +695,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);
+                                       reg = arch_get_irn_register_in(node, pos);
+                                       goto emit_R;
                                }
-                               break;
                        }
 
                        case 's': {
@@ -880,11 +807,11 @@ void ia32_emit_unop(const ir_node *node, int pos)
 static void emit_ia32_IMul(const ir_node *node)
 {
        ir_node               *left    = get_irn_n(node, n_ia32_IMul_left);
-       const arch_register_t *out_reg = get_out_reg(node, pn_ia32_IMul_res);
+       const arch_register_t *out_reg = arch_get_irn_register_out(node, pn_ia32_IMul_res);
 
        /* do we need the 3-address form? */
        if (is_ia32_NoReg_GP(left) ||
-                       get_in_reg(node, n_ia32_IMul_left) != out_reg) {
+                       arch_get_irn_register_in(node, n_ia32_IMul_left) != out_reg) {
                ia32_emitf(node, "\timul%M %#S4, %#AS3, %#D0\n");
        } else {
                ia32_emitf(node, "\timul%M %#AS4, %#S3\n");
@@ -913,11 +840,11 @@ static ir_node *find_original_value(ir_node *node)
                        return find_original_value(get_irn_n(pred, get_Proj_proj(node) + 1));
                } else if (is_ia32_Load(pred)) {
                        return find_original_value(get_irn_n(pred, n_ia32_Load_mem));
+               } else if (is_ia32_Store(pred)) {
+                       return find_original_value(get_irn_n(pred, n_ia32_Store_val));
                } else {
                        return node;
                }
-       } else if (is_ia32_Store(node)) {
-               return find_original_value(get_irn_n(node, n_ia32_Store_val));
        } else if (is_Phi(node)) {
                int i, arity;
                arity = get_irn_arity(node);
@@ -1071,7 +998,7 @@ static void emit_ia32_Jcc(const ir_node *node)
  */
 static void emit_ia32_Setcc(const ir_node *node)
 {
-       const arch_register_t *dreg = get_out_reg(node, pn_ia32_Setcc_res);
+       const arch_register_t *dreg = arch_get_irn_register_out(node, pn_ia32_Setcc_res);
 
        ia32_condition_code_t cc = get_ia32_condcode(node);
        cc = determine_final_cc(node, n_ia32_Setcc_eflags, cc);
@@ -1093,7 +1020,7 @@ static void emit_ia32_Setcc(const ir_node *node)
 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);
+       const arch_register_t *out  = arch_get_irn_register_out(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;
@@ -1134,127 +1061,16 @@ static void emit_ia32_CMovcc(const ir_node *node)
        ia32_emitf(node, "\tcmov%P %#AR, %#R\n", cc, 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                default_pn = get_ia32_default_pn(node);
-       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;
-
-       i = 0;
-       /* go over all proj's and collect them */
-       foreach_out_edge(node, edge) {
-               long pn;
-               proj = get_edge_src_irn(edge);
-               assert(is_Proj(proj) && "Only proj allowed at SwitchJmp");
-
-               pn = get_Proj_proj(proj);
-
-               /* check for default proj */
-               if (pn == default_pn) {
-                       assert(tbl->defProj == NULL && "found two default Projs at SwitchJmp");
-                       tbl->defProj = proj;
-               } else {
-                       tbl->min_value = pn < tbl->min_value ? pn : tbl->min_value;
-                       tbl->max_value = pn > tbl->max_value ? pn : tbl->max_value;
-
-                       /* create branch entry */
-                       tbl->branches[i].target = proj;
-                       tbl->branches[i].value  = pn;
-                       ++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);
-}
-
-/**
- * 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;
+       ir_entity *jump_table = get_ia32_am_sc(node);
+       long       default_pn = get_ia32_default_pn(node);
 
-       /* emit the table */
-       ia32_emitf(node,        "\tcmpl $%u, %S0\n", interval);
-       ia32_emitf(tbl.defProj, "\tja %L\n");
-
-       if (tbl.num_branches > 1) {
-               /* create table */
-               ia32_emitf(node, "\tjmp *%s(,%S0,4)\n", tbl.label);
-
-               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);
+       ia32_emitf(node, "\tjmp %*AM\n");
+       emit_jump_table(node, default_pn, jump_table, get_cfop_target_block);
 }
 
 /**
@@ -1262,11 +1078,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");
@@ -1353,7 +1164,7 @@ static const char* emit_asm_operand(const ir_node *node, const char *s)
 
        /* get register */
        if (asm_reg->use_input == 0) {
-               reg = get_out_reg(node, asm_reg->inout_pos);
+               reg = arch_get_irn_register_out(node, asm_reg->inout_pos);
        } else {
                ir_node *pred = get_irn_n(node, asm_reg->inout_pos);
 
@@ -1362,7 +1173,7 @@ static const char* emit_asm_operand(const ir_node *node, const char *s)
                        emit_ia32_Immediate(pred);
                        return s;
                }
-               reg = get_in_reg(node, asm_reg->inout_pos);
+               reg = arch_get_irn_register_in(node, asm_reg->inout_pos);
        }
        if (reg == NULL) {
                ir_fprintf(stderr,
@@ -1500,8 +1311,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));
@@ -1647,10 +1458,10 @@ static void emit_zero(const ir_node* node, const arch_register_t *reg)
 
 static void emit_ia32_Minus64Bit(const ir_node *node)
 {
-       const arch_register_t *in_lo  = get_in_reg(node, 0);
-       const arch_register_t *in_hi  = get_in_reg(node, 1);
-       const arch_register_t *out_lo = get_out_reg(node, 0);
-       const arch_register_t *out_hi = get_out_reg(node, 1);
+       const arch_register_t *in_lo  = arch_get_irn_register_in(node, 0);
+       const arch_register_t *in_hi  = arch_get_irn_register_in(node, 1);
+       const arch_register_t *out_lo = arch_get_irn_register_out(node, 0);
+       const arch_register_t *out_hi = arch_get_irn_register_out(node, 1);
 
        if (out_lo == in_lo) {
                if (out_hi != in_hi) {
@@ -1929,10 +1740,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 = be_get_irg_exec_freq(irg);
+       ir_exec_freq *exec_freq  = be_get_irg_exec_freq(irg);
+       int           arity;
 
        if (block == get_irg_end_block(irg))
                return;
@@ -1982,6 +1793,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));
@@ -2111,14 +1923,14 @@ void ia32_gen_routine(ir_graph *irg)
           Those are ascending with ascending addresses. */
        qsort(exc_list, ARR_LEN(exc_list), sizeof(exc_list[0]), cmp_exc_entry);
        {
-               size_t 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');
                }
        }
@@ -2324,8 +2136,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;
@@ -2360,7 +2172,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. */
@@ -2433,7 +2245,7 @@ static void bemit_binop_with_imm(
                if (get_ia32_op_type(node) == ia32_AddrModeS) {
                        bemit_mod_am(ruval, node);
                } else {
-                       const arch_register_t *reg = get_in_reg(node, n_ia32_binary_left);
+                       const arch_register_t *reg = arch_get_irn_register_in(node, n_ia32_binary_left);
                        bemit_modru(reg, ruval);
                }
                bemit8((unsigned char)attr->offset);
@@ -2445,7 +2257,7 @@ static void bemit_binop_with_imm(
                        bemit8(opcode);
                        bemit_mod_am(ruval, node);
                } else {
-                       const arch_register_t *reg = get_in_reg(node, n_ia32_binary_left);
+                       const arch_register_t *reg = arch_get_irn_register_in(node, n_ia32_binary_left);
                        if (reg->index == REG_GP_EAX) {
                                bemit8(opcode_ax);
                        } else {
@@ -2464,10 +2276,10 @@ static void bemit_binop_with_imm(
  */
 static void bemit_binop_2(const ir_node *node, unsigned code)
 {
-       const arch_register_t *out = get_in_reg(node, n_ia32_binary_left);
+       const arch_register_t *out = arch_get_irn_register_in(node, n_ia32_binary_left);
        bemit8(code);
        if (get_ia32_op_type(node) == ia32_Normal) {
-               const arch_register_t *op2 = get_in_reg(node, n_ia32_binary_right);
+               const arch_register_t *op2 = arch_get_irn_register_in(node, n_ia32_binary_right);
                bemit_modrr(op2, out);
        } else {
                bemit_mod_am(reg_gp_map[out->index], node);
@@ -2494,7 +2306,7 @@ static void bemit_unop(const ir_node *node, unsigned char code, unsigned char ex
 {
        bemit8(code);
        if (get_ia32_op_type(node) == ia32_Normal) {
-               const arch_register_t *in = get_in_reg(node, input);
+               const arch_register_t *in = arch_get_irn_register_in(node, input);
                bemit_modru(in, ext);
        } else {
                bemit_mod_am(ext, node);
@@ -2503,7 +2315,7 @@ static void bemit_unop(const ir_node *node, unsigned char code, unsigned char ex
 
 static void bemit_unop_reg(const ir_node *node, unsigned char code, int input)
 {
-       const arch_register_t *out = get_out_reg(node, 0);
+       const arch_register_t *out = arch_get_irn_register_out(node, 0);
        bemit_unop(node, code, reg_gp_map[out->index], input);
 }
 
@@ -2524,8 +2336,8 @@ static void bemit_immediate(const ir_node *node, bool relative)
 
 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);
+       const arch_register_t *in  = arch_get_irn_register_in(copy, 0);
+       const arch_register_t *out = arch_get_irn_register_out(copy, 0);
 
        if (in == out)
                return;
@@ -2575,14 +2387,14 @@ static void bemit_perm(const ir_node *node)
 
 static void bemit_xor0(const ir_node *node)
 {
-       const arch_register_t *out = get_out_reg(node, 0);
+       const arch_register_t *out = arch_get_irn_register_out(node, 0);
        bemit8(0x31);
        bemit_modrr(out, out);
 }
 
 static void bemit_mov_const(const ir_node *node)
 {
-       const arch_register_t *out = get_out_reg(node, 0);
+       const arch_register_t *out = arch_get_irn_register_out(node, 0);
        bemit8(0xB8 + reg_gp_map[out->index]);
        bemit_immediate(node, false);
 }
@@ -2632,7 +2444,7 @@ static void bemit_##op(const ir_node *node) \
                } \
        } else { \
                bemit8(ext << 3 | 1); \
-               bemit_mod_am(reg_gp_map[get_out_reg(val, 0)->index], node); \
+               bemit_mod_am(reg_gp_map[arch_get_irn_register_out(val, 0)->index], node); \
        } \
 } \
  \
@@ -2645,7 +2457,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[get_out_reg(val, 0)->index], node); \
+               bemit_mod_am(reg_gp_map[arch_get_irn_register_out(val, 0)->index], node); \
        } \
 }
 
@@ -2677,7 +2489,7 @@ UNOP(ijmp,    0xFF, 4, n_ia32_IJmp_target)
 #define SHIFT(op, ext) \
 static void bemit_##op(const ir_node *node) \
 { \
-       const arch_register_t *out   = get_out_reg(node, 0); \
+       const arch_register_t *out   = arch_get_irn_register_out(node, 0); \
        ir_node               *count = get_irn_n(node, 1); \
        if (is_ia32_Immediate(count)) { \
                int offset = get_ia32_immediate_attr_const(count)->offset; \
@@ -2726,8 +2538,8 @@ SHIFT(sar, 7)
 
 static void bemit_shld(const ir_node *node)
 {
-       const arch_register_t *in  = get_in_reg(node, n_ia32_ShlD_val_low);
-       const arch_register_t *out = get_out_reg(node, pn_ia32_ShlD_res);
+       const arch_register_t *in  = arch_get_irn_register_in(node, n_ia32_ShlD_val_low);
+       const arch_register_t *out = arch_get_irn_register_out(node, pn_ia32_ShlD_res);
        ir_node *count = get_irn_n(node, n_ia32_ShlD_count);
        bemit8(0x0F);
        if (is_ia32_Immediate(count)) {
@@ -2742,8 +2554,8 @@ static void bemit_shld(const ir_node *node)
 
 static void bemit_shrd(const ir_node *node)
 {
-       const arch_register_t *in  = get_in_reg(node, n_ia32_ShrD_val_low);
-       const arch_register_t *out = get_out_reg(node, pn_ia32_ShrD_res);
+       const arch_register_t *in  = arch_get_irn_register_in(node, n_ia32_ShrD_val_low);
+       const arch_register_t *out = arch_get_irn_register_out(node, pn_ia32_ShrD_res);
        ir_node *count = get_irn_n(node, n_ia32_ShrD_count);
        bemit8(0x0F);
        if (is_ia32_Immediate(count)) {
@@ -2761,7 +2573,7 @@ static void bemit_shrd(const ir_node *node)
  */
 static void bemit_setcc(const ir_node *node)
 {
-       const arch_register_t *dreg = get_out_reg(node, pn_ia32_Setcc_res);
+       const arch_register_t *dreg = arch_get_irn_register_out(node, pn_ia32_Setcc_res);
 
        ia32_condition_code_t cc = get_ia32_condcode(node);
        cc = determine_final_cc(node, n_ia32_Setcc_eflags, cc);
@@ -2807,7 +2619,7 @@ 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);
+       const arch_register_t *out          = arch_get_irn_register_out(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;
@@ -2874,7 +2686,7 @@ static void bemit_cmp(const ir_node *node)
                                if (get_ia32_op_type(node) == ia32_AddrModeS) {
                                        bemit_mod_am(7, node);
                                } else {
-                                       const arch_register_t *reg = get_in_reg(node, n_ia32_binary_left);
+                                       const arch_register_t *reg = arch_get_irn_register_in(node, n_ia32_binary_left);
                                        bemit_modru(reg, 7);
                                }
                                bemit8((unsigned char)attr->offset);
@@ -2886,7 +2698,7 @@ static void bemit_cmp(const ir_node *node)
                                        bemit8(0x81);
                                        bemit_mod_am(7, node);
                                } else {
-                                       const arch_register_t *reg = get_in_reg(node, n_ia32_binary_left);
+                                       const arch_register_t *reg = arch_get_irn_register_in(node, n_ia32_binary_left);
                                        if (reg->index == REG_GP_EAX) {
                                                bemit8(0x3D);
                                        } else {
@@ -2903,10 +2715,10 @@ static void bemit_cmp(const ir_node *node)
                }
                panic("invalid imm size?!?");
        } else {
-               const arch_register_t *out = get_in_reg(node, n_ia32_binary_left);
+               const arch_register_t *out = arch_get_irn_register_in(node, n_ia32_binary_left);
                bemit8(0x3B);
                if (get_ia32_op_type(node) == ia32_Normal) {
-                       const arch_register_t *op2 = get_in_reg(node, n_ia32_binary_right);
+                       const arch_register_t *op2 = arch_get_irn_register_in(node, n_ia32_binary_right);
                        bemit_modrr(op2, out);
                } else {
                        bemit_mod_am(reg_gp_map[out->index], node);
@@ -2919,7 +2731,7 @@ static void bemit_cmp8bit(const ir_node *node)
        ir_node *right = get_irn_n(node, n_ia32_binary_right);
        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);
+                       const arch_register_t *out = arch_get_irn_register_in(node, n_ia32_Cmp_left);
                        if (out->index == REG_GP_EAX) {
                                bemit8(0x3C);
                        } else {
@@ -2932,10 +2744,10 @@ static void bemit_cmp8bit(const ir_node *node)
                }
                bemit8(get_ia32_immediate_attr_const(right)->offset);
        } else {
-               const arch_register_t *out = get_in_reg(node, n_ia32_Cmp_left);
+               const arch_register_t *out = arch_get_irn_register_in(node, n_ia32_Cmp_left);
                bemit8(0x3A);
                if (get_ia32_op_type(node) == ia32_Normal) {
-                       const arch_register_t *in = get_in_reg(node, n_ia32_Cmp_right);
+                       const arch_register_t *in = arch_get_irn_register_in(node, n_ia32_Cmp_right);
                        bemit_modrr(out, in);
                } else {
                        bemit_mod_am(reg_gp_map[out->index], node);
@@ -2948,7 +2760,7 @@ static void bemit_test8bit(const ir_node *node)
        ir_node *right = get_irn_n(node, n_ia32_Test8Bit_right);
        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);
+                       const arch_register_t *out = arch_get_irn_register_in(node, n_ia32_Test8Bit_left);
                        if (out->index == REG_GP_EAX) {
                                bemit8(0xA8);
                        } else {
@@ -2961,10 +2773,10 @@ static void bemit_test8bit(const ir_node *node)
                }
                bemit8(get_ia32_immediate_attr_const(right)->offset);
        } else {
-               const arch_register_t *out = get_in_reg(node, n_ia32_Test8Bit_left);
+               const arch_register_t *out = arch_get_irn_register_in(node, n_ia32_Test8Bit_left);
                bemit8(0x84);
                if (get_ia32_op_type(node) == ia32_Normal) {
-                       const arch_register_t *in = get_in_reg(node, n_ia32_Test8Bit_right);
+                       const arch_register_t *in = arch_get_irn_register_in(node, n_ia32_Test8Bit_right);
                        bemit_modrr(out, in);
                } else {
                        bemit_mod_am(reg_gp_map[out->index], node);
@@ -2993,13 +2805,13 @@ static void bemit_imul(const ir_node *node)
 
 static void bemit_dec(const ir_node *node)
 {
-       const arch_register_t *out = get_out_reg(node, pn_ia32_Dec_res);
+       const arch_register_t *out = arch_get_irn_register_out(node, pn_ia32_Dec_res);
        bemit8(0x48 + reg_gp_map[out->index]);
 }
 
 static void bemit_inc(const ir_node *node)
 {
-       const arch_register_t *out = get_out_reg(node, pn_ia32_Inc_res);
+       const arch_register_t *out = arch_get_irn_register_out(node, pn_ia32_Inc_res);
        bemit8(0x40 + reg_gp_map[out->index]);
 }
 
@@ -3016,7 +2828,7 @@ UNOPMEM(decmem, 0xFE, 1)
 
 static void bemit_ldtls(const ir_node *node)
 {
-       const arch_register_t *out = get_out_reg(node, 0);
+       const arch_register_t *out = arch_get_irn_register_out(node, 0);
 
        bemit8(0x65); // gs:
        if (out->index == REG_GP_EAX) {
@@ -3033,7 +2845,7 @@ static void bemit_ldtls(const ir_node *node)
  */
 static void bemit_lea(const ir_node *node)
 {
-       const arch_register_t *out = get_out_reg(node, 0);
+       const arch_register_t *out = arch_get_irn_register_out(node, 0);
        bemit8(0x8D);
        bemit_mod_am(reg_gp_map[out->index], node);
 }
@@ -3089,10 +2901,10 @@ static void bemit_helper_zero(const arch_register_t *reg)
 
 static void bemit_minus64bit(const ir_node *node)
 {
-       const arch_register_t *in_lo  = get_in_reg(node, 0);
-       const arch_register_t *in_hi  = get_in_reg(node, 1);
-       const arch_register_t *out_lo = get_out_reg(node, 0);
-       const arch_register_t *out_hi = get_out_reg(node, 1);
+       const arch_register_t *in_lo  = arch_get_irn_register_in(node, 0);
+       const arch_register_t *in_hi  = arch_get_irn_register_in(node, 1);
+       const arch_register_t *out_lo = arch_get_irn_register_out(node, 0);
+       const arch_register_t *out_hi = arch_get_irn_register_out(node, 1);
 
        if (out_lo == in_lo) {
                if (out_hi != in_hi) {
@@ -3178,13 +2990,13 @@ EMIT_SINGLEOP(stc,   0xF9)
  */
 static void bemit_load(const ir_node *node)
 {
-       const arch_register_t *out = get_out_reg(node, 0);
+       const arch_register_t *out = arch_get_irn_register_out(node, 0);
 
        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);
@@ -3223,13 +3035,13 @@ static void bemit_store(const ir_node *node)
                        bemit_immediate(value, false);
                }
        } else {
-               const arch_register_t *in = get_in_reg(node, n_ia32_Store_val);
+               const arch_register_t *in = arch_get_irn_register_in(node, n_ia32_Store_val);
 
                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);
@@ -3302,7 +3114,7 @@ static void bemit_push(const ir_node *node)
                bemit8(0xFF);
                bemit_mod_am(6, node);
        } else {
-               const arch_register_t *reg = get_in_reg(node, n_ia32_Push_val);
+               const arch_register_t *reg = arch_get_irn_register_in(node, n_ia32_Push_val);
                bemit8(0x50 + reg_gp_map[reg->index]);
        }
 }
@@ -3312,7 +3124,7 @@ static void bemit_push(const ir_node *node)
  */
 static void bemit_pop(const ir_node *node)
 {
-       const arch_register_t *reg = get_out_reg(node, pn_ia32_Pop_res);
+       const arch_register_t *reg = arch_get_irn_register_out(node, pn_ia32_Pop_res);
        bemit8(0x58 + reg_gp_map[reg->index]);
 }
 
@@ -3370,7 +3182,6 @@ static void bemit_ia32_jcc(const ir_node *node)
        const ir_node        *proj_false;
        const ir_node        *dest_true;
        const ir_node        *dest_false;
-       const ir_node        *block;
 
        cc = determine_final_cc(node, 0, cc);
 
@@ -3381,8 +3192,6 @@ 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;
@@ -3423,63 +3232,13 @@ static void bemit_ia32_jcc(const ir_node *node)
 
 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;
+       ir_entity *jump_table = get_ia32_am_sc(node);
+       long       default_pn = get_ia32_default_pn(node);
 
-       /* 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;
-
-       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();
+       bemit8(0xFF); // jmp *tbl.label(,%in,4)
+       bemit_mod_am(0x05, node);
 
-       free(tbl.branches);
+       emit_jump_table(node, default_pn, jump_table, get_cfop_target_block);
 }
 
 /**
@@ -3504,7 +3263,7 @@ static void bemit_subsp(const ir_node *node)
        bemit_sub(node);
        /* mov %esp, %out */
        bemit8(0x8B);
-       out = get_out_reg(node, 1);
+       out = arch_get_irn_register_out(node, 1);
        bemit8(MOD_REG | ENC_REG(reg_gp_map[out->index]) | ENC_RM(0x04));
 }
 
@@ -3529,7 +3288,7 @@ static void bemit_incsp(const ir_node *node)
        size = get_signed_imm_size(offs);
        bemit8(size == 1 ? 0x83 : 0x81);
 
-       reg  = get_out_reg(node, 0);
+       reg  = arch_get_irn_register_out(node, 0);
        bemit_modru(reg, ext);
 
        if (size == 1) {