X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbespillslots.c;h=760b656f1062873865ac41af7fccb5a6199655d7;hb=69b99cb1537b9ef18b3767da0d362f82a52fdb76;hp=30b997b337bac4b2d88761aa053add444053b7d5;hpb=bb5c6d5ce2e35c4074900017f8c8e1a4935054d0;p=libfirm

diff --git a/ir/be/bespillslots.c b/ir/be/bespillslots.c
index 30b997b33..760b656f1 100644
--- a/ir/be/bespillslots.c
+++ b/ir/be/bespillslots.c
@@ -43,7 +43,6 @@
 #include "besched.h"
 #include "bespillslots.h"
 #include "bechordal_t.h"
-#include "bejavacoal.h"
 #include "bestatevent.h"
 #include "bespilloptions.h"
 #include "bemodule.h"
@@ -555,8 +554,7 @@ static void enlarge_spillslot(spill_slot_t *slot, int otheralign, int othersize)
 }
 
 
-static void assign_spill_entity(const arch_env_t *arch_env, ir_node *node,
-                                ir_entity *entity)
+static void assign_spill_entity(ir_node *node, ir_entity *entity)
 {
 	if(is_NoMem(node))
 		return;
@@ -568,15 +566,15 @@ static void assign_spill_entity(const arch_env_t *arch_env, ir_node *node,
 			ir_node *in = get_irn_n(node, i);
 			assert(!is_Phi(in));
 
-			assign_spill_entity(arch_env, in, entity);
+			assign_spill_entity(in, entity);
 		}
 		return;
 	}
 
 	/* beware: we might have Stores with Memory Proj's, ia32 fisttp for instance */
 	node = skip_Proj(node);
-	assert(arch_get_frame_entity(arch_env, node) == NULL);
-	arch_set_frame_entity(arch_env, node, entity);
+	assert(arch_get_frame_entity(node) == NULL);
+	arch_set_frame_entity(node, entity);
 }
 
 /**
@@ -585,7 +583,6 @@ static void assign_spill_entity(const arch_env_t *arch_env, ir_node *node,
  */
 static void assign_spillslots(be_fec_env_t *env)
 {
-	const arch_env_t *arch_env = env->arch_env;
 	int i;
 	int spillcount;
 	spill_t *spill;
@@ -664,7 +661,7 @@ static void assign_spillslots(be_fec_env_t *env)
 				}
 			}
 		} else {
-			assign_spill_entity(arch_env, node, slot->entity);
+			assign_spill_entity(node, slot->entity);
 		}
 	}
 
@@ -676,7 +673,7 @@ static void assign_spillslots(be_fec_env_t *env)
 
 		assert(slot->entity != NULL);
 
-		arch_set_frame_entity(arch_env, reload, slot->entity);
+		arch_set_frame_entity(reload, slot->entity);
 	}
 }
 
@@ -817,7 +814,6 @@ void be_assign_entities(be_fec_env_t *env)
 static void collect_spills_walker(ir_node *node, void *data)
 {
 	be_fec_env_t *env = data;
-	const arch_env_t *arch_env = env->arch_env;
 	const ir_mode *mode;
 	const arch_register_class_t *cls;
 	int align;
@@ -826,12 +822,12 @@ static void collect_spills_walker(ir_node *node, void *data)
 	if (is_Proj(node))
 		return;
 
-	if (!arch_irn_class_is(arch_env, node, reload))
+	if (!arch_irn_class_is(node, reload))
 		return;
 
 	mode  = get_irn_mode(node);
-	cls   = arch_get_irn_reg_class(arch_env, node, -1);
-	align = arch_env_get_reg_class_alignment(arch_env, cls);
+	cls   = arch_get_irn_reg_class(node, -1);
+	align = arch_env_get_reg_class_alignment(env->arch_env, cls);
 
 	be_node_needs_frame_entity(env, node, mode, align);
 }