X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespill.c;h=016a2d776de04a402bdb83afe03d0bfea7d3c99a;hb=42cfb577eeec7068df400b4b6b5a65eb02c78e84;hp=23d2a0aca7e40c07ac87ad2ff72598c19accef3d;hpb=011d0c933eda9fb0eaaa48c930bd82df86572d20;p=libfirm

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 23d2a0aca..016a2d776 100644
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -51,15 +51,15 @@ typedef struct _spill_ctx_t {
 } spill_ctx_t;
 
 struct _spill_env_t {
-	firm_dbg_module_t *dbg;
 	const arch_register_class_t *cls;
 	const be_chordal_env_t *chordal_env;
 	struct obstack obst;
 	set *spill_ctxs;
 	set *spills;				/**< all spill_info_t's, which must be placed */
-	pset *mem_phis;				/**< set of all special spilled phis. allocated and freed seperately */
+	pset *mem_phis;				/**< set of all special spilled phis. allocated and freed separately */
 	decide_irn_t is_mem_phi;	/**< callback func to decide if a phi needs special spilling */
 	void *data;					/**< data passed to all callbacks */
+	DEBUG_ONLY(firm_dbg_module_t *dbg;)
 };
 
 static int cmp_spillctx(const void *a, const void *b, size_t n) {
@@ -74,15 +74,17 @@ static int cmp_spillinfo(const void *x, const void *y, size_t size) {
 	return ! (xx->spilled_node == yy->spilled_node);
 }
 
-spill_env_t *be_new_spill_env(firm_dbg_module_t *dbg,
-							  const be_chordal_env_t *chordal_env,
-							  decide_irn_t is_mem_phi, void *data) {
+DEBUG_ONLY(
+void be_set_spill_env_dbg_module(spill_env_t *env, firm_dbg_module_t *dbg) {
+	env->dbg = dbg;
+}
+);
 
+spill_env_t *be_new_spill_env(const be_chordal_env_t *chordal_env, decide_irn_t is_mem_phi, void *data) {
 	spill_env_t *env = xmalloc(sizeof(env[0]));
 	env->spill_ctxs  = new_set(cmp_spillctx, 1024);
 	env->spills      = new_set(cmp_spillinfo, 1024);
 	env->cls         = chordal_env->cls;
-	env->dbg         = dbg;
 	env->is_mem_phi  = is_mem_phi;
 	env->data        = data;
 	env->chordal_env = chordal_env;
@@ -386,14 +388,16 @@ typedef struct _spill_slot_t {
 } spill_slot_t;
 
 typedef struct _ss_env_t {
-	firm_dbg_module_t *dbg;
 	struct obstack ob;
 	be_chordal_env_t *cenv;
 	pmap *slots;		/* maps spill_contexts to spill_slots */
-  pmap *types;    /* maps modes to types */
+	pmap *types;    /* maps modes to types */
+	DEBUG_ONLY(firm_dbg_module_t *dbg;)
 } ss_env_t;
 
-
+/**
+ * Walker: compute the spill slots
+ */
 static void compute_spill_slots_walker(ir_node *spill, void *env) {
 	ss_env_t *ssenv = env;
 	ir_node *ctx;
@@ -408,12 +412,18 @@ static void compute_spill_slots_walker(ir_node *spill, void *env) {
 	entry = pmap_find(ssenv->slots, ctx);
 
 	if (!entry) {
+		struct _arch_env_t *arch_env     = ssenv->cenv->birg->main_env->arch_env;
+		ir_node *spilled                 = get_irn_n(spill, be_pos_Spill_val);
+		const arch_register_t *reg       = arch_get_irn_register(arch_env, spilled);
+		const arch_register_class_t *cls = arch_register_get_class(reg);
+		ir_mode *largest_mode            = arch_register_class_mode(cls);
+
 		/* this is a new spill context */
 		ss = obstack_alloc(&ssenv->ob, sizeof(*ss));
-		ss->members = pset_new_ptr(8);
-		ss->largest_mode = get_irn_mode(get_irn_n(spill, be_pos_Spill_val));
-		ss->size = get_mode_size_bytes(ss->largest_mode);
-		ss->align = ss->size; /* TODO Assumed for now */
+		ss->members      = pset_new_ptr(8);
+		ss->largest_mode = largest_mode;
+		ss->size         = get_mode_size_bytes(ss->largest_mode);
+		ss->align        = arch_isa_get_reg_class_alignment(arch_env->isa, cls);
 		pmap_insert(ssenv->slots, ctx, ss);
 	} else {
 		ir_node *irn;