projects / libfirm / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
change backends to produce 1 big array with all registers
[libfirm] / ir / be / ia32 / ia32_emitter.c
diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index 3d861da..a944b3c 100644 (file)
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -84,7 +84,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;
@@ -155,7 +154,7 @@ 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);
 
        return reg;
@@ -1834,9 +1833,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();
@@ -1972,7 +1971,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   = be_get_irg_exec_freq(cg->irg);
+       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 */
@@ -2019,7 +2019,7 @@ static void ia32_emit_block_header(ir_node *block)
        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(cg->irg);
+       ir_exec_freq *exec_freq = be_get_irg_exec_freq(irg);
 
        if (block == get_irg_end_block(irg))
                return;
@@ -2147,15 +2147,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   = be_get_irg_options(cg->irg)->pic;
+       isa      = (ia32_isa_t*) arch_env;
+       do_pic   = be_get_irg_options(irg)->pic;
 
        be_gas_elf_type_char = '@';
 
@@ -2171,16 +2173,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);
        }
@@ -2225,14 +2227,14 @@ 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;
+       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;
 
        pnc_map_signed[pn_Cmp_Eq]    = 0x04;
        pnc_map_signed[pn_Cmp_Lt]    = 0x0C;
@@ -2556,7 +2558,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);
@@ -2661,9 +2663,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);
@@ -3020,7 +3022,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);
@@ -3053,7 +3055,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);
@@ -3082,7 +3084,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);
@@ -3152,7 +3154,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
@@ -3203,9 +3205,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
@@ -3313,7 +3315,7 @@ 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);
@@ -3358,7 +3360,7 @@ 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);
@@ -4217,13 +4219,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);
+       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;
        int i, n;
 
-       cg  = ia32_cg;
-       isa = cg->isa;
+       isa = (ia32_isa_t*) arch_env;
 
        ia32_register_binary_emitters();
 
@@ -4234,16 +4238,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);
        }
 
@@ -4256,8 +4260,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;
libfirm