sparc: Clean up introduce_epilog().

[libfirm] / ir / be / beinsn.c

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index f82b417..947b882 100644 (file)
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -35,14 +35,16 @@
 #include "beabi.h"
 #include "raw_bitset.h"
 
-be_insn_t *be_scan_insn(be_chordal_env_t const *const env, ir_node *const irn)
+be_insn_t *be_scan_insn(be_chordal_env_t *const env, ir_node *const irn)
 {
-       struct obstack *obst = env->obst;
+       struct obstack *const obst = &env->obst;
        be_operand_t o;
        int i, n;
 
        be_insn_t *insn = OALLOCZ(obst, be_insn_t);
 
+       bool has_constraints = false;
+
        insn->irn = irn;
        if (get_irn_mode(irn) == mode_T) {
                ir_node *p;
@@ -58,26 +60,34 @@ be_insn_t *be_scan_insn(be_chordal_env_t const *const env, ir_node *const irn)
 
                        if (arch_irn_consider_in_reg_alloc(env->cls, p)) {
                                /* found a def: create a new operand */
-                               o.req             = arch_get_irn_register_req(p);
+                               arch_register_req_t const *const req = arch_get_irn_register_req(p);
+                               if (arch_register_req_is(req, limited)) {
+                                       o.regs          = req->limited;
+                                       has_constraints = true;
+                               } else {
+                                       o.regs           = env->allocatable_regs->data;
+                                       has_constraints |= req->width > 1;
+                               }
                                o.carrier         = p;
-                               o.irn             = irn;
-                               o.pos             = -(get_Proj_proj(p) + 1);
                                o.partner         = NULL;
                                obstack_grow(obst, &o, sizeof(o));
                                insn->n_ops++;
-                               insn->has_constraints |= arch_register_req_is(o.req, limited) | (o.req->width > 1);
                        }
                }
        } else if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
                /* only one def, create one operand */
-               o.req     = arch_get_irn_register_req(irn);
+               arch_register_req_t const *const req = arch_get_irn_register_req(irn);
+               if (arch_register_req_is(req, limited)) {
+                       o.regs          = req->limited;
+                       has_constraints = true;
+               } else {
+                       o.regs           = env->allocatable_regs->data;
+                       has_constraints |= req->width > 1;
+               }
                o.carrier = irn;
-               o.irn     = irn;
-               o.pos     = -1;
                o.partner = NULL;
                obstack_grow(obst, &o, sizeof(o));
                insn->n_ops++;
-               insn->has_constraints |= arch_register_req_is(o.req, limited) | (o.req->width > 1);
        }
 
        insn->use_start = insn->n_ops;
@@ -88,33 +98,23 @@ be_insn_t *be_scan_insn(be_chordal_env_t const *const env, ir_node *const irn)
 
                if (arch_irn_consider_in_reg_alloc(env->cls, op)) {
                        /* found a register use, create an operand */
-                       o.req     = arch_get_irn_register_req_in(irn, i);
+                       arch_register_req_t const *const req = arch_get_irn_register_req_in(irn, i);
+                       if (arch_register_req_is(req, limited)) {
+                               o.regs          = req->limited;
+                               has_constraints = true;
+                       } else {
+                               o.regs = env->allocatable_regs->data;
+                       }
                        o.carrier = op;
-                       o.irn     = irn;
-                       o.pos     = i;
                        o.partner = NULL;
                        obstack_grow(obst, &o, sizeof(o));
                        insn->n_ops++;
-                       insn->has_constraints |= arch_register_req_is(o.req, limited);
                }
        }
 
-       insn->ops = (be_operand_t*)obstack_finish(obst);
-
-       /* Compute the admissible registers bitsets. */
-       for (i = 0; i < insn->n_ops; ++i) {
-               be_operand_t              *const op  = &insn->ops[i];
-               arch_register_req_t const *const req = op->req;
-               assert(req->cls == env->cls);
-
-               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;
-               } else {
-                       op->regs = env->allocatable_regs;
-               }
-       }
+       if (!has_constraints)
+               return NULL;
 
+       insn->ops = (be_operand_t*)obstack_finish(obst);
        return insn;
 }