create register slots in attributes on irg obstack

[libfirm] / ir / be / ia32 / bearch_ia32.c

diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index bd5cfd6..9b7a552 100644 (file)
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -74,6 +74,7 @@ static ir_node *my_skip_proj(const ir_node *n) {
        return (ir_node *)n;
 }
 
+
 /**
  * Return register requirements for an ia32 node.
  * If the node returns a tuple (mode_T) then the proj's
@@ -82,11 +83,16 @@ static ir_node *my_skip_proj(const ir_node *n) {
 static const arch_register_req_t *ia32_get_irn_reg_req(const void *self, arch_register_req_t *req, const ir_node *irn, int pos) {
        const ia32_register_req_t *irn_req;
        long                       node_pos = pos == -1 ? 0 : pos;
-       ir_mode                   *mode     = get_irn_mode(irn);
+       ir_mode                   *mode     = is_Block(irn) ? NULL : get_irn_mode(irn);
        firm_dbg_module_t         *mod      = firm_dbg_register(DEBUG_MODULE);
 
-       if (mode == mode_T || mode == mode_M) {
-               DBG((mod, LEVEL_1, "ignoring mode_T, mode_M node %+F\n", irn));
+       if (is_Block(irn) || mode == mode_M || mode == mode_X) {
+               DBG((mod, LEVEL_1, "ignoring Block, mode_M, mode_X node %+F\n", irn));
+               return NULL;
+       }
+
+       if (mode == mode_T && pos < 0) {
+               DBG((mod, LEVEL_1, "ignoring request OUT requirements for node %+F\n", irn));
                return NULL;
        }
 
@@ -156,6 +162,10 @@ static void ia32_set_irn_reg(const void *self, ir_node *irn, const arch_register
        int                   pos = 0;
        const ia32_irn_ops_t *ops = self;
 
+       if (get_irn_mode(irn) == mode_X) {
+               return;
+       }
+
        DBG((ops->cg->mod, LEVEL_1, "ia32 assigned register %s to node %+F\n", reg->name, irn));
 
        if (is_Proj(irn)) {
@@ -179,6 +189,11 @@ static const arch_register_t *ia32_get_irn_reg(const void *self, const ir_node *
        const arch_register_t *reg = NULL;
 
        if (is_Proj(irn)) {
+
+               if (get_irn_mode(irn) == mode_X) {
+                       return NULL;
+               }
+
                pos = ia32_translate_proj_pos(irn);
                irn = my_skip_proj(irn);
        }
@@ -239,13 +254,13 @@ typedef struct {
        ir_graph *irg;
 } ia32_abi_env_t;
 
-static void *ia32_abi_init(const be_abi_call_t *call, const arch_isa_t *isa, ir_graph *irg)
+static void *ia32_abi_init(const be_abi_call_t *call, const arch_env_t *aenv, ir_graph *irg)
 {
        ia32_abi_env_t *env    = xmalloc(sizeof(env[0]));
        be_abi_call_flags_t fl = be_abi_call_get_flags(call);
        env->flags = fl.bits;
        env->irg   = irg;
-       env->isa   = isa;
+       env->isa   = aenv->isa;
        return env;
 }
 
@@ -404,13 +419,13 @@ static void ia32_prepare_graph(void *self) {
        irg_walk_blkwise_graph(cg->irg, ia32_place_consts_set_modes, ia32_transform_node, cg);
        be_dump(cg->irg, "-transformed", dump_ir_block_graph_sched);
 
-       edges_deactivate(cg->irg);
-       dead_node_elimination(cg->irg);
-       edges_activate(cg->irg);
-
        cg->mod = old_mod;
 
        if (cg->opt.doam) {
+               edges_deactivate(cg->irg);
+               //dead_node_elimination(cg->irg);
+               edges_activate(cg->irg);
+
                irg_walk_blkwise_graph(cg->irg, NULL, ia32_optimize_am, cg);
                be_dump(cg->irg, "-am", dump_ir_block_graph_sched);
        }
@@ -472,6 +487,9 @@ static void ia32_finish_irg_walker(ir_node *irn, void *env) {
 
        /* transform a LEA into an Add if possible */
        ia32_transform_lea_to_add(irn, cg);
+
+       /* check for peephole optimization */
+       ia32_peephole_optimization(irn, cg);
 }
 
 /**
@@ -757,6 +775,7 @@ static void *ia32_init(void) {
 
        ia32_register_init(isa);
        ia32_create_opcodes();
+       ia32_register_copy_attr_func();
 
        isa->regs_16bit = pmap_create();
        isa->regs_8bit  = pmap_create();
@@ -872,7 +891,7 @@ void ia32_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *ab
 
        /* set stack parameters */
        for (i = stack_idx; i < n; i++) {
-               be_abi_call_param_stack(abi, i);
+               be_abi_call_param_stack(abi, i, 1, 0, 0);
        }