fix a bug in constraint enforcement; improve phi handling and phi0 construction ...

[libfirm] / ir / be / beinsn.c

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index 1756564..b8bc71c 100644 (file)
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -23,18 +23,16 @@
  * @author      Sebastian Hack
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "irgraph_t.h"
 #include "irmode_t.h"
 #include "irnode_t.h"
 #include "iredges.h"
 
-#include "besched_t.h"
+#include "besched.h"
 #include "beinsn_t.h"
-#include "beirg_t.h"
+#include "beirg.h"
 #include "beabi.h"
 #include "raw_bitset.h"
 
@@ -107,7 +105,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 
                        if (arch_irn_consider_in_reg_alloc(env->cls, p)) {
                                /* found a def: create a new operand */
-                               o.req             = arch_get_register_req(p, -1);
+                               o.req             = arch_get_register_req_out(p);
                                o.carrier         = p;
                                o.irn             = irn;
                                o.pos             = -(get_Proj_proj(p) + 1);
@@ -121,7 +119,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
                }
        } else if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
                /* only one def, create one operand */
-               o.req     = arch_get_register_req(irn, -1);
+               o.req     = arch_get_register_req_out(irn);
                o.carrier = irn;
                o.irn     = irn;
                o.pos     = -1;
@@ -195,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);