fix bug where compound_graph_pathe were consider null

[libfirm] / ir / be / bepressurestat.c

diff --git a/ir/be/bepressurestat.c b/ir/be/bepressurestat.c
index 0351896..59b05a4 100644 (file)
--- a/ir/be/bepressurestat.c
+++ b/ir/be/bepressurestat.c
@@ -24,9 +24,7 @@
  * @date        06.04.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <math.h>
 
@@ -43,44 +41,41 @@
 #include "irnode_t.h"
 #include "ircons_t.h"
 #include "irloop_t.h"
-#include "phiclass.h"
 #include "iredges.h"
 #include "execfreq.h"
 #include "irtools.h"
 
 #include "be_t.h"
 #include "belive_t.h"
-#include "besched_t.h"
+#include "besched.h"
 #include "beirgmod.h"
-#include "bearch_t.h"
-#include "benode_t.h"
+#include "bearch.h"
+#include "benode.h"
 #include "beutil.h"
-#include "bespillremat.h"
 #include "bespill.h"
-#include "beirg_t.h"
+#include "beirg.h"
 
 #define MAXPRESSURE 128
 
 typedef struct _regpressure_ana_t {
-       arch_env_t                   *arch_env;
        const arch_register_class_t  *cls;
        const be_lv_t                *lv;
        unsigned int                 *stat;
        DEBUG_ONLY(firm_dbg_module_t *dbg);
 } regpressure_ana_t;
 
-static INLINE int has_reg_class(const regpressure_ana_t *ra, const ir_node *irn)
+static inline int has_reg_class(const regpressure_ana_t *ra, const ir_node *irn)
 {
-       return arch_irn_consider_in_reg_alloc(ra->arch_env, ra->cls, irn);
+       return arch_irn_consider_in_reg_alloc(ra->cls, irn);
 }
 
-static INLINE int regpressure(pset *live) {
+static inline int regpressure(pset *live)
+{
        int pressure = pset_count(live);
        return MIN(pressure, MAXPRESSURE);
 }
 
-static void
-regpressureanawalker(ir_node *bb, void *data)
+static void regpressureanawalker(ir_node *bb, void *data)
 {
        regpressure_ana_t  *ra   = data;
        pset               *live = pset_new_ptr_default();
@@ -135,10 +130,9 @@ void be_analyze_regpressure(be_irg_t *birg, const arch_register_class_t *cls, co
 
        FIRM_DBG_REGISTER(ra.dbg, "firm.be.regpressureana");
 
-       ra.arch_env = &birg->main_env->arch_env;
-       ra.lv       = be_get_birg_liveness(birg);
-       ra.cls      = cls;
-       ra.stat     = stat;
+       ra.lv   = be_get_birg_liveness(birg);
+       ra.cls  = cls;
+       ra.stat = stat;
 
        memset(stat, 0, sizeof(stat));