Changed to the new infrastructure
[libfirm] / ir / be / bearch_firm.c
index 7ee7165..e024f88 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "irreflect.h"
 
-#define N_REGS 512
+#define N_REGS 4
 
 static arch_register_t datab_regs[N_REGS];
 
@@ -29,10 +29,8 @@ static arch_register_class_t reg_classes[] = {
   { "datab", N_REGS, datab_regs },
 };
 
-static ir_op *op_push_end;
 static ir_op *op_push;
 static ir_op *op_imm;
-static type *push_type;
 
 typedef struct {
        enum { imm_Const, imm_SymConst } tp;
@@ -83,24 +81,36 @@ static void firm_init(void)
         * Create some opcodes and types to let firm look a little
         * bit more like real machines.
         */
-       if(!op_push_end) {
-               op_push_end = new_ir_op(get_next_ir_opcode(), "PushEnd",
-                               op_pin_state_pinned, 0, oparity_unary, 0, 0);
-       }
-
        if(!op_push) {
-               op_push = new_ir_op(get_next_ir_opcode(), "Push",
+               rflct_sig_t *sig;
+               int push_opc = get_next_ir_opcode();
+
+               op_push = new_ir_op(push_opc, "Push",
                                op_pin_state_pinned, 0, oparity_binary, 0, 0);
+
+               sig = rflct_signature_allocate(1, 3);
+               rflct_signature_set_arg(sig, 0, 0, "Store", RFLCT_MC(Mem), 0, 0);
+               rflct_signature_set_arg(sig, 1, 0, "Block", RFLCT_MC(BB), 0, 0);
+               rflct_signature_set_arg(sig, 1, 1, "Store", RFLCT_MC(Mem), 0, 0);
+               rflct_signature_set_arg(sig, 1, 2, "Arg", RFLCT_MC(Datab), 0, 0);
+
+               rflct_new_opcode(push_opc, "Push", false);
+               rflct_opcode_add_signature(push_opc, sig);
        }
 
        if(!op_imm) {
-               op_imm = new_ir_op(get_next_ir_opcode(), "Imm",
-                               op_pin_state_pinned, 0, oparity_zero, 0, sizeof(imm_attr_t));
-       }
+               rflct_sig_t *sig;
+               int imm_opc = get_next_ir_opcode();
 
-       if(!push_type)
-               push_type = new_type_pointer(new_id_from_str("push_ptr"), get_glob_type());
+               op_imm = new_ir_op(imm_opc, "Imm",
+                               op_pin_state_pinned, 0, oparity_zero, 0, sizeof(imm_attr_t));
 
+               sig = rflct_signature_allocate(1, 1);
+               rflct_signature_set_arg(sig, 0, 0, "Imm", RFLCT_MC(Data), 0, 0);
+               rflct_signature_set_arg(sig, 1, 0, "Block", RFLCT_MC(BB), 0, 0);
+               rflct_new_opcode(imm_opc, "Imm", false);
+               rflct_opcode_add_signature(imm_opc, sig);
+       }
 }
 
 static int firm_get_n_reg_class(void)
@@ -142,7 +152,12 @@ firm_get_irn_reg_req(const arch_irn_ops_t *self,
 
 static int firm_get_n_operands(const arch_irn_ops_t *self, const ir_node *irn, int in_out)
 {
-  int sig = rflct_get_signature(irn);
+  int sig;
+
+       while(is_Proj(irn))
+               irn = get_Proj_pred(irn);
+
+       sig = rflct_get_signature(irn);
   return rflct_get_args_count(get_irn_opcode(irn), sig, in_out >= 0);
 }
 
@@ -207,12 +222,38 @@ static arch_irn_class_t firm_classify(const arch_irn_ops_t *self, const ir_node
        return res;
 }
 
+static arch_irn_flags_t firm_get_flags(const arch_irn_ops_t *self, const ir_node *irn)
+{
+       arch_irn_flags_t res = arch_irn_flags_spillable;
+
+       if(get_irn_op(irn) == op_imm)
+               res |= arch_irn_flags_rematerializable;
+
+       switch(get_irn_opcode(irn)) {
+               case iro_Add:
+               case iro_Sub:
+               case iro_Shl:
+               case iro_Shr:
+               case iro_Shrs:
+               case iro_And:
+               case iro_Or:
+               case iro_Eor:
+               case iro_Not:
+                       res |= arch_irn_flags_rematerializable;
+               default:
+                       res = res;
+       }
+
+       return res;
+}
+
 static const arch_irn_ops_t irn_ops = {
   firm_get_irn_reg_req,
   firm_get_n_operands,
   firm_set_irn_reg,
   firm_get_irn_reg,
-  firm_classify
+  firm_classify,
+       firm_get_flags
 };
 
 static const arch_irn_ops_t *firm_get_irn_ops(const arch_irn_handler_t *self,
@@ -225,19 +266,12 @@ const arch_irn_handler_t firm_irn_handler = {
   firm_get_irn_ops,
 };
 
-static ir_node *new_PushEnd(ir_graph *irg, ir_node *bl, ir_node *arg)
-{
-       ir_node *ins[1];
-       ins[0] = arg;
-       return new_ir_node(NULL, irg, bl, op_push_end, mode_P, 1, ins);
-}
-
 static ir_node *new_Push(ir_graph *irg, ir_node *bl, ir_node *push, ir_node *arg)
 {
        ir_node *ins[2];
        ins[0] = push;
        ins[1] = arg;
-       return new_ir_node(NULL, irg, bl, op_push, mode_P, 2, ins);
+       return new_ir_node(NULL, irg, bl, op_push, mode_M, 2, ins);
 }
 
 static ir_node *new_Imm(ir_graph *irg, ir_node *bl, ir_node *cnst)
@@ -274,52 +308,59 @@ static void prepare_walker(ir_node *irn, void *data)
                ir_node *bl   = get_nodes_block(irn);
                ir_graph *irg = get_irn_irg(bl);
 
-               ir_node *ins[1];
                ir_node *store   = get_Call_mem(irn);
                ir_node *ptr     = get_Call_ptr(irn);
                type *ct         = get_Call_type(irn);
                int np           = get_Call_n_params(irn) > 0 ? 1 : 0;
 
                if(np > 0) {
+                       ir_node *ins[1];
                        char buf[128];
                        ir_node *nc;
                        ir_node *push;
                        int i, n;
                        type *nt;
 
-                       push = new_PushEnd(irg, bl, get_Call_param(irn, 0));
+                       store = new_Push(irg, bl, store, get_Call_param(irn, 0));
 
                        for(i = 1, n = get_Call_n_params(irn); i < n; ++i) {
-                               push = new_Push(irg, bl, push, get_Call_param(irn, i));
+                               store = new_Push(irg, bl, store, get_Call_param(irn, i));
                        }
 
                        snprintf(buf, sizeof(buf), "push_%s", get_type_name(ct));
 
                        n = get_method_n_ress(ct);
-                       nt = new_type_method(new_id_from_str(buf), 1, n);
+                       nt = new_type_method(new_id_from_str(buf), 0, n);
                        for(i = 0; i < n; ++i)
                                set_method_res_type(nt, i, get_method_res_type(ct, i));
 
-                       set_method_param_type(nt, 0, push_type);
-
-                       ins[0] = push;
-                       nc = new_r_Call(irg, bl, store, ptr, 1, ins, nt);
+                       nc = new_r_Call(irg, bl, store, ptr, 0, ins, nt);
                        exchange(irn, nc);
                        set_irn_link(nc, nc);
                }
        }
+}
 
-#if 0
-       else if(opc == iro_Const || opc == iro_SymConst) {
-               ir_node *bl   = get_nodes_block(irn);
-               ir_graph *irg = get_irn_irg(bl);
+static void localize_const_walker(ir_node *irn, void *data)
+{
+       if(!is_Block(irn)) {
+               int i, n;
+               ir_node *bl = get_nodes_block(irn);
 
-               ir_node *imm = new_Imm(irg, bl, irn);
-               exchange(irn, imm);
-               set_irn_link(imm, imm);
-       }
-#endif
+               for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
+                       ir_node *op    = get_irn_n(irn, i);
+                       opcode opc     = get_irn_opcode(op);
 
+                       if(opc == iro_Const
+                       || (opc == iro_SymConst && get_SymConst_kind(op) == symconst_addr_ent)) {
+                               ir_graph *irg   = get_irn_irg(bl);
+                               ir_node *imm_bl = is_Phi(irn) ? get_Block_cfgpred_block(bl, i) : bl;
+
+                               ir_node *imm = new_Imm(irg, imm_bl, op);
+                               set_irn_n(irn, i, imm);
+                       }
+               }
+       }
 }
 
 static void clear_link(ir_node *irn, void *data)
@@ -329,7 +370,7 @@ static void clear_link(ir_node *irn, void *data)
 
 static void firm_prepare_graph(ir_graph *irg)
 {
-       irg_walk_graph(irg, clear_link, NULL, NULL);
+       irg_walk_graph(irg, clear_link, localize_const_walker, NULL);
        irg_walk_graph(irg, NULL, prepare_walker, NULL);
 }