The big committ:

[libfirm] / ir / be / beinsn.c

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index 35d1ef4..6f79b00 100644 (file)
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "irgraph_t.h"
@@ -9,6 +9,7 @@
 #include "besched_t.h"
 #include "beinsn_t.h"
 #include "beabi.h"
+#include "raw_bitset.h"
 
 be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 {
@@ -29,12 +30,12 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 
                for(p = sched_next(irn); is_Proj(p); p = sched_next(p)) {
                        if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, p)) {
-                               arch_get_register_req(arch_env, &o.req, p, -1);
+                               o.req             = arch_get_register_req(arch_env, p, -1);
                                o.carrier         = p;
                                o.irn             = irn;
                                o.pos             = -(get_Proj_proj(p) + 1);
                                o.partner         = NULL;
-                               o.has_constraints = arch_register_req_is(&o.req, limited);
+                               o.has_constraints = arch_register_req_is(o.req, limited);
                                obstack_grow(obst, &o, sizeof(o));
                                insn->n_ops++;
                                insn->out_constraints |= o.has_constraints;
@@ -43,58 +44,69 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
                }
 
                insn->next_insn = p;
-       }
-
-       else if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, irn)) {
-               arch_get_register_req(arch_env, &o.req, irn, -1);
+       } else if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, irn)) {
+               o.req     = arch_get_register_req(arch_env, irn, -1);
                o.carrier = irn;
                o.irn     = irn;
                o.pos     = -1;
                o.partner = NULL;
-               o.has_constraints = arch_register_req_is(&o.req, limited);
+               o.has_constraints = arch_register_req_is(o.req, limited);
                obstack_grow(obst, &o, sizeof(o));
                insn->n_ops++;
                insn->out_constraints |= o.has_constraints;
                pre_colored += arch_get_irn_register(arch_env, irn) != NULL;
        }
 
-       insn->pre_colored = pre_colored == insn->n_ops && insn->n_ops > 0;
+       if(pre_colored > 0) {
+               assert(pre_colored == insn->n_ops && "partly pre-colored nodes not supported");
+               insn->pre_colored = 1;
+       }
        insn->use_start   = insn->n_ops;
 
        for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
                ir_node *op = get_irn_n(irn, i);
 
-               if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, op)) {
-                       arch_get_register_req(arch_env, &o.req, irn, i);
-                       o.carrier = op;
-                       o.irn     = irn;
-                       o.pos     = i;
-                       o.partner = NULL;
-                       o.has_constraints = arch_register_req_is(&o.req, limited);
-                       obstack_grow(obst, &o, sizeof(o));
-                       insn->n_ops++;
-                       insn->in_constraints |= o.has_constraints;
-               }
+               if(!arch_irn_consider_in_reg_alloc(arch_env, env->cls, op))
+                       continue;
+
+               o.req     = arch_get_register_req(arch_env, irn, i);
+               o.carrier = op;
+               o.irn     = irn;
+               o.pos     = i;
+               o.partner = NULL;
+               o.has_constraints = arch_register_req_is(o.req, limited);
+               obstack_grow(obst, &o, sizeof(o));
+               insn->n_ops++;
+               insn->in_constraints |= o.has_constraints;
        }
 
        insn->has_constraints = insn->in_constraints | insn->out_constraints;
        insn->ops = obstack_finish(obst);
 
        /* Compute the admissible registers bitsets. */
-       for(i = 0; i < insn->n_ops; ++i) {
+       for (i = 0; i < insn->n_ops; ++i) {
                be_operand_t *op = &insn->ops[i];
+               const arch_register_req_t *req = op->req;
+
+#if 0
+               // Matze: can we do without this?
+               if (req->cls == NULL && req->type == arch_register_req_type_none) {
+                       req->cls  = env->cls;
+                       req->type = arch_register_req_type_normal;
+               }
+#endif
+
+               assert(req->cls == env->cls);
 
-               assert(op->req.cls == env->cls);
                op->regs = bitset_obstack_alloc(obst, env->cls->n_regs);
 
-               if(arch_register_req_is(&op->req, limited))
-                       op->req.limited(op->req.limited_env, op->regs);
-               else {
+               if (arch_register_req_is(req, limited)) {
+                       rbitset_copy_to_bitset(req->limited, op->regs);
+               } else {
                        arch_put_non_ignore_regs(arch_env, env->cls, op->regs);
-                       if(env->ignore_colors)
+                       if (env->ignore_colors)
                                bitset_andnot(op->regs, env->ignore_colors);
                }
-
        }
 
        return insn;
@@ -107,5 +119,6 @@ be_insn_env_t *be_insn_env_init(be_insn_env_t *ie, const be_irg_t *birg, const a
        ie->obst = obst;
        ie->ignore_colors = bitset_obstack_alloc(obst, cls->n_regs);
        be_abi_put_ignore_regs(birg->abi, cls, ie->ignore_colors);
+
        return ie;
 }