bearch: remove arch_register_type_joker.

[libfirm] / ir / be / beinsn.c

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index 1d489b6..e72fd89 100644 (file)
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -29,21 +29,14 @@
 #include "irnode_t.h"
 #include "iredges.h"
 
+#include "bechordal_t.h"
 #include "besched.h"
 #include "beinsn_t.h"
 #include "beirg.h"
 #include "beabi.h"
 #include "raw_bitset.h"
 
-/**
- * Create a be_insn_t for an IR node.
- *
- * @param env      the insn construction environment
- * @param irn      the irn for which the be_insn should be build
- *
- * @return the be_insn for the IR node
- */
-be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
+be_insn_t *be_scan_insn(be_chordal_env_t const *const env, ir_node *const irn)
 {
        struct obstack *obst = env->obst;
        be_operand_t o;
@@ -52,8 +45,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 
        be_insn_t *insn = OALLOCZ(obst, be_insn_t);
 
-       insn->irn       = irn;
-       insn->next_insn = sched_next(irn);
+       insn->irn = irn;
        if (get_irn_mode(irn) == mode_T) {
                ir_node *p;
 
@@ -76,7 +68,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
                                o.has_constraints = arch_register_req_is(o.req, limited) | (o.req->width > 1);
                                obstack_grow(obst, &o, sizeof(o));
                                insn->n_ops++;
-                               insn->out_constraints |= o.has_constraints;
+                               insn->has_constraints |= o.has_constraints;
                                pre_colored += arch_get_irn_register(p) != NULL;
                        }
                }
@@ -90,7 +82,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
                o.has_constraints = arch_register_req_is(o.req, limited) | (o.req->width > 1);
                obstack_grow(obst, &o, sizeof(o));
                insn->n_ops++;
-               insn->out_constraints |= o.has_constraints;
+               insn->has_constraints |= o.has_constraints;
                pre_colored += arch_get_irn_register(irn) != NULL;
        }
 
@@ -114,29 +106,19 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
                        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 |= o.has_constraints;
                }
        }
 
-       insn->has_constraints = insn->in_constraints | insn->out_constraints;
        insn->ops = (be_operand_t*)obstack_finish(obst);
 
        /* Compute the admissible registers bitsets. */
        for (i = 0; i < insn->n_ops; ++i) {
-               be_operand_t *op = &insn->ops[i];
-               const arch_register_req_t   *req = op->req;
-               const arch_register_class_t *cls = req->cls;
-               arch_register_req_type_t    type = req->type;
-
-               /* If there is no special requirement, we allow current class here */
-               if (cls == NULL && req->type == arch_register_req_type_none) {
-                       cls  = env->cls;
-                       type = arch_register_req_type_normal;
-               }
-
-               assert(cls == env->cls);
+               be_operand_t              *const op  = &insn->ops[i];
+               arch_register_req_t const *const req = op->req;
+               assert(req->cls == env->cls);
 
-               if (type & arch_register_req_type_limited) {
+               if (req->type & arch_register_req_type_limited) {
                        bitset_t *regs = bitset_obstack_alloc(obst, env->cls->n_regs);
                        rbitset_copy_to_bitset(req->limited, regs);
                        op->regs = regs;