X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbeverify.c;h=e5a41aaf0f360f42312b67cfee8dc3ee5f354210;hb=70481aa342e22f5f285dc863b366a56393d888af;hp=caf508ac9b14cfe8ccc0022396c8c20f628f604c;hpb=d4bbab11371a9c68aa2a716eaa7589b82a28691e;p=libfirm

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index caf508ac9..e5a41aaf0 100644
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -24,9 +24,7 @@
  * @date        05.05.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
@@ -53,7 +51,6 @@ static int my_values_interfere(const ir_node *a, const ir_node *b);
 typedef struct be_verify_register_pressure_env_t_ {
 	ir_graph                    *irg;                 /**< the irg to verify */
 	 be_lv_t                    *lv;                  /**< Liveness information. */
-	const arch_env_t            *arch_env;            /**< an architecture environment */
 	const arch_register_class_t *cls;                 /**< the register class to check for */
 	int                         registers_available;  /**< number of available registers */
 	int                         problem_found;        /**< flag indicating if a problem was found */
@@ -85,7 +82,7 @@ static void verify_liveness_walker(ir_node *block, void *data) {
 	/* collect register pressure info, start with end of a block */
 	// ir_fprintf(stderr, "liveness check %+F\n", block);
 	ir_nodeset_init(&live_nodes);
-	be_liveness_end_of_block(env->lv, env->arch_env, env->cls, block,
+	be_liveness_end_of_block(env->lv, env->cls, block,
 	                         &live_nodes);
 
 	// print_living_values(stderr, &live_nodes);
@@ -102,7 +99,7 @@ static void verify_liveness_walker(ir_node *block, void *data) {
 			break;
 
 		// print_living_values(stderr, &live_nodes);
-		be_liveness_transfer(env->arch_env, env->cls, irn, &live_nodes);
+		be_liveness_transfer(env->cls, irn, &live_nodes);
 
 		pressure = ir_nodeset_size(&live_nodes);
 
@@ -127,7 +124,6 @@ int be_verify_register_pressure(const be_irg_t *birg,
 
 	env.lv                  = be_liveness(birg);
 	env.irg                 = irg;
-	env.arch_env            = birg->main_env->arch_env;
 	env.cls                 = cls;
 	env.registers_available = env.cls->n_regs - be_put_ignore_regs(birg, env.cls, NULL);
 	env.problem_found       = 0;
@@ -149,7 +145,6 @@ typedef struct be_verify_schedule_env_t_ {
 	int      problem_found;     /**< flags indicating if there was a problem */
 	bitset_t *scheduled;        /**< bitset of scheduled nodes */
 	ir_graph *irg;              /**< the irg to check */
-	const arch_env_t *arch_env; /**< the arch_env */
 } be_verify_schedule_env_t;
 
 /**
@@ -287,7 +282,8 @@ static void verify_schedule_walker(ir_node *block, void *data) {
 	}
 }
 
-static int should_be_scheduled(be_verify_schedule_env_t *env, ir_node *node) {
+static int should_be_scheduled(ir_node *node)
+{
 	if(is_Block(node))
 		return -1;
 
@@ -311,7 +307,7 @@ static int should_be_scheduled(be_verify_schedule_env_t *env, ir_node *node) {
 		break;
 	}
 
-	if(arch_irn_get_flags(env->arch_env, node) & arch_irn_flags_ignore)
+	if (arch_irn_get_flags(node) & arch_irn_flags_ignore)
 		return -1;
 
 	return 1;
@@ -322,7 +318,7 @@ static void check_schedule(ir_node *node, void *data) {
 	int should_be;
 	int scheduled;
 
-	should_be = should_be_scheduled(env, node);
+	should_be = should_be_scheduled(node);
 	if(should_be == -1)
 		return;
 
@@ -345,7 +341,6 @@ int be_verify_schedule(const be_irg_t *birg)
 	env.problem_found = 0;
 	env.irg           = be_get_birg_irg(birg);
 	env.scheduled     = bitset_alloca(get_irg_last_idx(env.irg));
-	env.arch_env      = birg->main_env->arch_env;
 
 	irg_block_walk_graph(env.irg, verify_schedule_walker, NULL, &env);
 	/* check if all nodes are scheduled */
@@ -366,11 +361,10 @@ typedef struct _spill_t {
 } spill_t;
 
 typedef struct {
-	const arch_env_t *arch_env;
-	ir_graph *irg;
-	set *spills;
-	ir_node **reloads;
-	int problem_found;
+	ir_graph  *irg;
+	set       *spills;
+	ir_node  **reloads;
+	int        problem_found;
 } be_verify_spillslots_env_t;
 
 static int cmp_spill(const void* d1, const void* d2, size_t size) {
@@ -527,13 +521,12 @@ static void collect(be_verify_spillslots_env_t *env, ir_node *node, ir_node *rel
  */
 static void collect_spills_walker(ir_node *node, void *data) {
 	be_verify_spillslots_env_t *env = data;
-	const arch_env_t *arch_env = env->arch_env;
 
 	/* @@@ ia32_classify returns classification of Proj_pred :-/ */
 	if(is_Proj(node))
 		return;
 
-	if(arch_irn_class_is(arch_env, node, reload)) {
+	if (arch_irn_class_is(node, reload)) {
 		ir_node *spill = get_memory_edge(node);
 		ir_entity *ent;
 
@@ -599,11 +592,10 @@ static void check_lonely_spills(ir_node *node, void *data) {
 	}
 }
 
-int be_verify_spillslots(const arch_env_t *arch_env, ir_graph *irg)
+int be_verify_spillslots(ir_graph *irg)
 {
 	be_verify_spillslots_env_t env;
 
-	env.arch_env = arch_env;
 	env.irg = irg;
 	env.spills = new_set(cmp_spill, 10);
 	env.reloads = NEW_ARR_F(ir_node*, 0);