X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeutil.c;h=56b4d935cef4b35efbf39cade4305468d43e6af7;hb=0318dc1a48ce72b311592c28affc31fabc95f026;hp=afec85b1c15520f4daecdb924e4551af86ba41ce;hpb=d293b8b097aeae699c77b20367b1d0014571ba48;p=libfirm

diff --git a/ir/be/beutil.c b/ir/be/beutil.c
index afec85b1c..56b4d935c 100644
--- a/ir/be/beutil.c
+++ b/ir/be/beutil.c
@@ -38,124 +38,22 @@
 #include "irgopt.h"
 #include "irtools.h"
 #include "irprintf.h"
-#include "iredges.h"
+#include "iredges_t.h"
 
 #include "beutil.h"
-#include "besched_t.h"
-#include "bearch_t.h"
-
-/* Get an always empty set. */
-pset *be_empty_set(void)
-{
-	static pset *empty_set = NULL;
-
-	if(!empty_set)
-		empty_set = pset_new_ptr(1);
-
-	assert(pset_count(empty_set) == 0);
-	return empty_set;
-}
-
-/**
- * Edge hook to dump the schedule edges.
- */
-static int sched_edge_hook(FILE *F, ir_node *irn)
-{
-	if (is_Proj(irn))
-		return 1;
-	if (sched_is_scheduled(irn) && sched_has_prev(irn)) {
-		ir_node *prev = sched_prev(irn);
-		fprintf(F, "edge:{sourcename:\"");
-		PRINT_NODEID(irn);
-		fprintf(F, "\" targetname:\"");
-		PRINT_NODEID(prev);
-		fprintf(F, "\" color:magenta}\n");
-	}
-	return 1;
-}
-
-void dump_ir_block_graph_sched(ir_graph *irg, const char *suffix) {
-	DUMP_NODE_EDGE_FUNC old = get_dump_node_edge_hook();
-
-	dump_consts_local(0);
-	if (have_sched_info(irg))
-		set_dump_node_edge_hook(sched_edge_hook);
-	dump_ir_block_graph(irg, suffix);
-	set_dump_node_edge_hook(old);
-}
-
-void dump_ir_extblock_graph_sched(ir_graph *irg, const char *suffix) {
-	DUMP_NODE_EDGE_FUNC old = get_dump_node_edge_hook();
-
-	dump_consts_local(0);
-	if (have_sched_info(irg))
-		set_dump_node_edge_hook(sched_edge_hook);
-	dump_ir_extblock_graph(irg, suffix);
-	set_dump_node_edge_hook(old);
-}
-
-/**
- * Dumps a graph and numbers all dumps.
- * @param irg    The graph
- * @param suffix A suffix to its file name.
- * @param dumper The dump function
- */
-void be_dump(ir_graph *irg, const char *suffix, void (*dumper)(ir_graph *, const char *)) {
-	static ir_graph *last_irg = NULL;
-	static int       nr       = 0;
-	char             buf[128];
-
-	if (irg != last_irg) {
-		last_irg = irg;
-		nr       = strcmp(suffix, "-abi") ? 0 : 1;
-	}
-
-	snprintf(buf, sizeof(buf), "-%02d%s", nr++, suffix);
-	buf[sizeof(buf) - 1] = '\0';
-	dumper(irg, buf);
-}
-
-
-
-static void collect_phis(ir_node *irn, void *data)
-{
-	(void) data;
-	if(is_Phi(irn)) {
-		ir_node *bl = get_nodes_block(irn);
-		set_irn_link(irn, get_irn_link(bl));
-		set_irn_link(bl, irn);
-	}
-}
+#include "besched.h"
+#include "bearch.h"
 
 void be_clear_links(ir_graph *irg)
 {
-	ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
 	irg_walk_graph(irg, firm_clear_link, NULL, NULL);
-	ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
-}
-
-void be_collect_phis(ir_graph *irg)
-{
-	irg_walk_graph(irg, collect_phis, NULL, NULL);
-}
-
-static void count_num_reachable_nodes(ir_node *irn, void *env)
-{
-	int *num = env;
-	(*num)++;
-	(void) irn;
-}
-
-unsigned get_num_reachable_nodes(ir_graph *irg) {
-	int num = 0;
-	irg_walk_graph(irg, count_num_reachable_nodes, NULL, &num);
-	return num;
 }
 
 /**
  * Gets the Proj with number pn from irn.
  */
-ir_node *be_get_Proj_for_pn(const ir_node *irn, long pn) {
+ir_node *be_get_Proj_for_pn(const ir_node *irn, long pn)
+{
 	const ir_edge_t *edge;
 	ir_node         *proj;
 	assert(get_irn_mode(irn) == mode_T && "need mode_T");
@@ -170,15 +68,31 @@ ir_node *be_get_Proj_for_pn(const ir_node *irn, long pn) {
 	return NULL;
 }
 
-FILE *be_ffopen(const char *base, const char *ext, const char *mode) {
-	FILE *out;
-	char buf[1024];
+static void add_to_postorder(ir_node *block, void *data)
+{
+	ir_node ***list = (ir_node***) data;
+	ARR_APP1(ir_node*, *list, block);
+}
 
-	snprintf(buf, sizeof(buf), "%s.%s", base, ext);
-	buf[sizeof(buf) - 1] = '\0';
-	if (! (out = fopen(buf, mode))) {
-		fprintf(stderr, "Cannot open file %s in mode %s\n", buf, mode);
-		return NULL;
-	}
-	return out;
+ir_node **be_get_cfgpostorder(ir_graph *irg)
+{
+	ir_node **list      = NEW_ARR_F(ir_node*, 0);
+	ir_node  *end_block = get_irg_end_block(irg);
+
+	/* end block may be unreachable in case of endless loops */
+	if (get_Block_n_cfgpreds(end_block) == 0)
+		ARR_APP1(ir_node*, list, end_block);
+
+	/* walk blocks */
+	irg_block_edges_walk(get_irg_start_block(irg), NULL, add_to_postorder,
+	                     &list);
+
+	return list;
+}
+
+ir_node *get_first_block_succ(const ir_node *block)
+{
+	const ir_edge_t *edge = get_irn_out_edge_first_kind(block, EDGE_KIND_BLOCK);
+	assert(edge != NULL);
+	return get_edge_src_irn(edge);
 }