Remove ia32_code_gen_config_t::use_ftst.
[libfirm] / ir / be / ia32 / ia32_emitter.c
index 95838a6..b265442 100644 (file)
@@ -21,7 +21,6 @@
  * @file
  * @brief       This file implements the ia32 node emitter.
  * @author      Christian Wuerdig, Matthias Braun
- * @version     $Id$
  *
  * Summary table for x86 floatingpoint compares:
  * (remember effect of unordered on x86: ZF=1, PF=1, CF=1)
 #include "raw_bitset.h"
 #include "dbginfo.h"
 #include "lc_opts.h"
+#include "ircons.h"
 
-#include "../besched.h"
-#include "../benode.h"
-#include "../beabi.h"
-#include "../be_dbgout.h"
-#include "../beemitter.h"
-#include "../begnuas.h"
-#include "../beirg.h"
-#include "../be_dbgout.h"
+#include "besched.h"
+#include "benode.h"
+#include "beabi.h"
+#include "be_dbgout.h"
+#include "beemitter.h"
+#include "begnuas.h"
+#include "beirg.h"
+#include "be_dbgout.h"
 
 #include "ia32_emitter.h"
 #include "ia32_common_transform.h"
@@ -119,7 +119,7 @@ static int block_needs_label(const ir_node *block)
        int need_label = 1;
        int  n_cfgpreds = get_Block_n_cfgpreds(block);
 
-       if (has_Block_entity(block))
+       if (get_Block_entity(block) != NULL)
                return 1;
 
        if (n_cfgpreds == 0) {
@@ -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);
        }
 }
@@ -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) {
@@ -714,33 +654,27 @@ emit_AM:
                                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);
@@ -748,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) {
@@ -758,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': {
@@ -879,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");
@@ -912,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);
@@ -1070,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);
@@ -1092,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;
@@ -1138,12 +1066,11 @@ static void emit_ia32_CMovcc(const ir_node *node)
  */
 static void emit_ia32_SwitchJmp(const ir_node *node)
 {
-       ir_entity *jump_table = get_ia32_am_sc(node);
-       long       default_pn = get_ia32_default_pn(node);
-
-       ia32_emitf(node, "\tjmp *%AM\n", node);
+       ir_entity             *jump_table = get_ia32_am_sc(node);
+       const ir_switch_table *table      = get_ia32_switch_table(node);
 
-       emit_jump_table(node, default_pn, jump_table, get_cfop_target_block);
+       ia32_emitf(node, "\tjmp %*AM\n");
+       be_emit_jump_table(node, table, jump_table, get_cfop_target_block);
 }
 
 /**
@@ -1237,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);
 
@@ -1246,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,
@@ -1275,7 +1202,7 @@ static const char* emit_asm_operand(const ir_node *node, const char *s)
                        panic("Invalid asm op modifier");
                }
        } else {
-               emit_register(reg, asm_reg->mode);
+               emit_register(reg, asm_reg->memory ? mode_Iu : asm_reg->mode);
        }
 
        if (asm_reg->memory) {
@@ -1437,11 +1364,7 @@ static void Copy_emitter(const ir_node *node, const ir_node *op)
        if (arch_register_get_class(in) == &ia32_reg_classes[CLASS_ia32_vfp])
                return;
 
-       if (get_irn_mode(node) == mode_E) {
-               ia32_emitf(node, "\tmovsd %R, %R\n", in, out);
-       } else {
-               ia32_emitf(node, "\tmovl %R, %R\n", in, out);
-       }
+       ia32_emitf(node, "\tmovl %R, %R\n", in, out);
 }
 
 static void emit_be_Copy(const ir_node *node)
@@ -1531,10 +1454,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) {
@@ -1637,7 +1560,7 @@ static void ia32_register_emitters(void)
 #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();
+       ir_clear_opcodes_generic_func();
 
        /* register all emitter functions defined in spec */
        ia32_register_spec_emitters();
@@ -1963,7 +1886,6 @@ void ia32_gen_routine(ir_graph *irg)
 
        get_unique_label(pic_base_label, sizeof(pic_base_label), "PIC_BASE");
 
-       be_dbg_method_begin(entity);
        be_gas_emit_function_prolog(entity, ia32_cg_config.function_alignment);
 
        /* we use links to point to target blocks */
@@ -1986,9 +1908,6 @@ void ia32_gen_routine(ir_graph *irg)
        }
 
        be_gas_emit_function_epilog(entity);
-       be_dbg_method_end();
-       be_emit_char('\n');
-       be_emit_write_line();
 
        ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 
@@ -2318,7 +2237,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);
@@ -2330,7 +2249,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 {
@@ -2349,10 +2268,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);
@@ -2379,7 +2298,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);
@@ -2388,7 +2307,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);
 }
 
@@ -2409,8 +2328,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;
@@ -2418,13 +2337,9 @@ static void bemit_copy(const ir_node *copy)
        if (arch_register_get_class(in) == &ia32_reg_classes[CLASS_ia32_vfp])
                return;
 
-       if (get_irn_mode(copy) == mode_E) {
-               panic("NIY");
-       } else {
-               assert(arch_register_get_class(in) == &ia32_reg_classes[CLASS_ia32_gp]);
-               bemit8(0x8B);
-               bemit_modrr(in, out);
-       }
+       assert(arch_register_get_class(in) == &ia32_reg_classes[CLASS_ia32_gp]);
+       bemit8(0x8B);
+       bemit_modrr(in, out);
 }
 
 static void bemit_perm(const ir_node *node)
@@ -2460,14 +2375,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);
 }
@@ -2517,7 +2432,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); \
        } \
 } \
  \
@@ -2530,7 +2445,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); \
        } \
 }
 
@@ -2562,7 +2477,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; \
@@ -2611,8 +2526,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)) {
@@ -2627,8 +2542,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)) {
@@ -2646,7 +2561,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);
@@ -2692,7 +2607,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;
@@ -2759,7 +2674,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);
@@ -2771,7 +2686,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 {
@@ -2788,10 +2703,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);
@@ -2804,7 +2719,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 {
@@ -2817,10 +2732,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);
@@ -2833,7 +2748,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 {
@@ -2846,10 +2761,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);
@@ -2878,13 +2793,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]);
 }
 
@@ -2901,7 +2816,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) {
@@ -2918,7 +2833,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);
 }
@@ -2974,10 +2889,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) {
@@ -3063,7 +2978,7 @@ 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);
@@ -3108,7 +3023,7 @@ 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);
@@ -3187,7 +3102,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]);
        }
 }
@@ -3197,7 +3112,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]);
 }
 
@@ -3305,13 +3220,13 @@ static void bemit_ia32_jcc(const ir_node *node)
 
 static void bemit_switchjmp(const ir_node *node)
 {
-       ir_entity *jump_table = get_ia32_am_sc(node);
-       long       default_pn = get_ia32_default_pn(node);
+       ir_entity             *jump_table = get_ia32_am_sc(node);
+       const ir_switch_table *table      = get_ia32_switch_table(node);
 
        bemit8(0xFF); // jmp *tbl.label(,%in,4)
        bemit_mod_am(0x05, node);
 
-       emit_jump_table(node, default_pn, jump_table, get_cfop_target_block);
+       be_emit_jump_table(node, table, jump_table, get_cfop_target_block);
 }
 
 /**
@@ -3336,7 +3251,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));
 }
 
@@ -3361,7 +3276,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) {
@@ -3753,7 +3668,7 @@ static void register_emitter(ir_op *op, emit_func func)
 static void ia32_register_binary_emitters(void)
 {
        /* first clear the generic function pointer for all ops */
-       clear_irp_opcodes_generic_func();
+       ir_clear_opcodes_generic_func();
 
        /* benode emitter */
        register_emitter(op_be_Copy,            bemit_copy);
@@ -3926,9 +3841,6 @@ void ia32_gen_binary_routine(ir_graph *irg)
        }
 
        be_gas_emit_function_epilog(entity);
-       be_dbg_method_end();
-       be_emit_char('\n');
-       be_emit_write_line();
 
        ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 }