if a node input has none as requirement, it is given the class of the argument node

[libfirm] / ir / be / beinsn.c

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index 4f93c5e..c750335 100644 (file)
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "irgraph_t.h"
 #include "irmode_t.h"
@@ -5,6 +8,7 @@
 
 #include "besched_t.h"
 #include "beinsn_t.h"
+#include "beabi.h"
 
 be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 {
@@ -40,7 +44,6 @@ 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);
                o.carrier = irn;
@@ -77,21 +80,35 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
        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];
 
+               if (op->req.cls == NULL && op->req.type == arch_register_req_type_none) {
+                       op->req.cls  = env->cls;
+                       op->req.type = arch_register_req_type_normal;
+               }
+
                assert(op->req.cls == env->cls);
                op->regs = bitset_obstack_alloc(obst, env->cls->n_regs);
 
-               if(arch_register_req_is(&op->req, limited))
+               if (arch_register_req_is(&op->req, limited))
                        op->req.limited(op->req.limited_env, 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;
 }
+
+be_insn_env_t *be_insn_env_init(be_insn_env_t *ie, const be_irg_t *birg, const arch_register_class_t *cls, struct obstack *obst)
+{
+       ie->aenv = birg->main_env->arch_env;
+       ie->cls  = cls;
+       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;
+}