X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillslots.c;h=815119fdb4e4364fbbc7a4a11e68a9b679c408fb;hb=dfc341ac6f54b4b0922d605e28333be76f487c68;hp=629dfd858ecdb87e81b6cae7e7c56ac3eb8a7c70;hpb=4d5c3365a58cba59993045a9e08e686d8ae079a7;p=libfirm

diff --git a/ir/be/bespillslots.c b/ir/be/bespillslots.c
index 629dfd858..815119fdb 100644
--- a/ir/be/bespillslots.c
+++ b/ir/be/bespillslots.c
@@ -17,11 +17,12 @@
  * PURPOSE.
  */
 
-/*
- * Author:      Matthias Braun
- * Date:		26.7.06
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+/**
+ * @file
+ * @brief       Spillslot coalescer.
+ * @author      Matthias Braun
+ * @date        26.07.2006
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,7 +31,7 @@
 #include <stdlib.h>
 
 #include "set.h"
-
+#include "array.h"
 #include "irgwalk.h"
 #include "ircons.h"
 #include "irprintf.h"
@@ -48,6 +49,9 @@
 #include "bestatevent.h"
 #include "bespilloptions.h"
 #include "bemodule.h"
+#include "bera.h"
+#include "beirg_t.h"
+#include "bearch_t.h"
 
 #define DBG_COALESCING		1
 #define DBG_INTERFERENCES	2
@@ -298,40 +302,41 @@ static void do_greedy_coalescing(be_fec_env_t *env)
 		interferences[i] = bitset_alloca(spillcount);
 	}
 
-	// construct interferences
-	for(i = 0; i < spillcount; ++i) {
+	/* construct interferences */
+	for (i = 0; i < spillcount; ++i) {
 		ir_node *spill1 = spilllist[i]->spill;
-		if(is_NoMem(spill1))
+
+		if (is_NoMem(spill1))
 			continue;
 
 		for(i2 = i+1; i2 < spillcount; ++i2) {
 			ir_node *spill2 = spilllist[i2]->spill;
-			if(is_NoMem(spill2))
+
+			if (is_NoMem(spill2))
 				continue;
 
-			if(values_interfere(lv, spill1, spill2)) {
-				DBG((dbg, DBG_INTERFERENCES, "Slot %d and %d interfere\n",
-				     i, i2));
+			if (values_interfere(lv, spill1, spill2)) {
+				DBG((dbg, DBG_INTERFERENCES, "Slot %d and %d interfere\n", i, i2));
 				bitset_set(interferences[i], i2);
 				bitset_set(interferences[i2], i);
 			}
 		}
 	}
 
-	// sort affinity edges
+	/* sort affinity edges */
 	affinity_edge_count = ARR_LEN(env->affinity_edges);
 	qsort(env->affinity_edges, affinity_edge_count, sizeof(env->affinity_edges[0]), cmp_affinity);
 
 	//dump_interference_graph(env, interferences, "before");
 
-	// try to merge affine nodes
+	/* try to merge affine nodes */
 	for(i = 0; i < affinity_edge_count; ++i) {
 		const affinity_edge_t *edge = env->affinity_edges[i];
 		int s1 = uf_find(spillslot_unionfind, edge->slot1);
 		int s2 = uf_find(spillslot_unionfind, edge->slot2);
 
 		/* test if values interfere */
-		if(bitset_is_set(interferences[s1], s2)) {
+		if (bitset_is_set(interferences[s1], s2)) {
 			assert(bitset_is_set(interferences[s2], s1));
 			continue;
 		}
@@ -442,7 +447,7 @@ static ir_entity* create_stack_entity(be_fec_env_t *env, spill_slot_t *slot)
 	ir_type *frame = get_irg_frame_type(irg);
 	ir_entity *res = frame_alloc_area(frame, slot->size, slot->align, 0);
 
-	// adjust size of the entity type...
+	/* adjust size of the entity type... */
 	ir_type *enttype = get_entity_type(res);
 	set_type_size_bytes(enttype, slot->size);
 
@@ -658,18 +663,17 @@ static int count_spillslots(const be_fec_env_t *env)
 be_fec_env_t *be_new_frame_entity_coalescer(be_irg_t *birg)
 {
 	const arch_env_t *arch_env = birg->main_env->arch_env;
-
-	be_fec_env_t *env = xmalloc(sizeof(env[0]));
+	be_fec_env_t     *env      = xmalloc(sizeof(env[0]));
 
 	be_assure_liveness(birg);
 
 	obstack_init(&env->obst);
-	env->arch_env = arch_env;
-	env->birg = birg;
-	env->spills = new_set(cmp_spill, 10);
-	env->reloads = NEW_ARR_F(ir_node*, 0);
+	env->arch_env       = arch_env;
+	env->birg           = birg;
+	env->spills         = new_set(cmp_spill, 10);
+	env->reloads        = NEW_ARR_F(ir_node*, 0);
 	env->affinity_edges = NEW_ARR_F(affinity_edge_t*, 0);
-	env->memperms = new_set(cmp_memperm, 10);
+	env->memperms       = new_set(cmp_memperm, 10);
 
 	return env;
 }
@@ -725,8 +729,8 @@ static void collect_spills_walker(ir_node *node, void *data)
 	if (!arch_irn_class_is(arch_env, node, reload))
 		return;
 
-	mode = get_irn_mode(node);
-	cls = arch_get_irn_reg_class(arch_env, node, -1);
+	mode  = get_irn_mode(node);
+	cls   = arch_get_irn_reg_class(arch_env, node, -1);
 	align = arch_isa_get_reg_class_alignment(arch_env_get_isa(arch_env), cls);
 
 	be_node_needs_frame_entity(env, node, mode, align);