Add arch_get_register_req_out().

[libfirm] / ir / be / beinsn.c

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index 5a705d9..6ae5612 100644 (file)
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -23,9 +23,7 @@
  * @author      Sebastian Hack
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "irgraph_t.h"
 #include "irmode_t.h"
@@ -46,8 +44,7 @@
  * @param mach_op  the machine operand for which uses are added
  */
 static void add_machine_operands(const be_insn_env_t *env, be_insn_t *insn, ir_node *mach_op) {
-       const arch_env_t *arch_env = env->aenv;
-       struct obstack *obst       = env->obst;
+       struct obstack *obst = env->obst;
        int i, n;
 
        for (i = 0, n = get_irn_arity(mach_op); i < n; ++i) {
@@ -55,11 +52,11 @@ static void add_machine_operands(const be_insn_env_t *env, be_insn_t *insn, ir_n
 
                if (is_irn_machine_operand(op)) {
                        add_machine_operands(env, insn, op);
-               } else if (arch_irn_consider_in_reg_alloc(arch_env, env->cls, op)) {
+               } else if (arch_irn_consider_in_reg_alloc(env->cls, op)) {
                        be_operand_t o;
 
                        /* found a register use, create an operand */
-                       o.req     = arch_get_register_req(arch_env, mach_op, i);
+                       o.req     = arch_get_register_req(mach_op, i);
                        o.carrier = op;
                        o.irn     = insn->irn;
                        o.pos     = i;
@@ -82,8 +79,7 @@ static void add_machine_operands(const be_insn_env_t *env, be_insn_t *insn, ir_n
  */
 be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 {
-       const arch_env_t *arch_env = env->aenv;
-       struct obstack *obst       = env->obst;
+       struct obstack *obst = env->obst;
        be_operand_t o;
        be_insn_t *insn;
        int i, n;
@@ -107,9 +103,9 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
                           in the backend, but check it for now. */
                        assert(get_irn_mode(p) != mode_T);
 
-                       if (arch_irn_consider_in_reg_alloc(arch_env, env->cls, p)) {
+                       if (arch_irn_consider_in_reg_alloc(env->cls, p)) {
                                /* found a def: create a new operand */
-                               o.req             = arch_get_register_req(arch_env, p, -1);
+                               o.req             = arch_get_register_req_out(p);
                                o.carrier         = p;
                                o.irn             = irn;
                                o.pos             = -(get_Proj_proj(p) + 1);
@@ -118,12 +114,12 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
                                obstack_grow(obst, &o, sizeof(o));
                                insn->n_ops++;
                                insn->out_constraints |= o.has_constraints;
-                               pre_colored += arch_get_irn_register(arch_env, p) != NULL;
+                               pre_colored += arch_get_irn_register(p) != NULL;
                        }
                }
-       } else if (arch_irn_consider_in_reg_alloc(arch_env, env->cls, irn)) {
+       } else if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
                /* only one def, create one operand */
-               o.req     = arch_get_register_req(arch_env, irn, -1);
+               o.req     = arch_get_register_req_out(irn);
                o.carrier = irn;
                o.irn     = irn;
                o.pos     = -1;
@@ -132,7 +128,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
                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;
+               pre_colored += arch_get_irn_register(irn) != NULL;
        }
 
        if (pre_colored > 0) {
@@ -147,9 +143,9 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 
                if (is_irn_machine_operand(op)) {
                        add_machine_operands(env, insn, op);
-               } else if (arch_irn_consider_in_reg_alloc(arch_env, env->cls, op)) {
+               } else if (arch_irn_consider_in_reg_alloc(env->cls, op)) {
                        /* found a register use, create an operand */
-                       o.req     = arch_get_register_req(arch_env, irn, i);
+                       o.req     = arch_get_register_req(irn, i);
                        o.carrier = op;
                        o.irn     = irn;
                        o.pos     = i;
@@ -197,7 +193,6 @@ 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 = be_get_birg_arch_env(birg);
        ie->cls  = cls;
        ie->obst = obst;
        ie->ignore_colors = bitset_obstack_alloc(obst, cls->n_regs);