X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschedrss.c;h=7f9348f56d17beacfd86c68316cf15e5c889ff14;hb=b3e096e705a221fb596f6a324904e67518ea05c0;hp=c76ebc1699a330b5c7b85aeeb9c2ff0e49a4f544;hpb=a824d376c1c37f80c7e1ebd6304665380d28fc5f;p=libfirm

diff --git a/ir/be/beschedrss.c b/ir/be/beschedrss.c
index c76ebc169..7f9348f56 100644
--- a/ir/be/beschedrss.c
+++ b/ir/be/beschedrss.c
@@ -45,6 +45,7 @@
 #include "irtools.h"
 #include "irbitset.h"
 #include "irprintf.h"
+#include "irnodeset.h"
 #include "bipartite.h"
 #include "hungarian.h"
 #include "plist.h"
@@ -55,8 +56,9 @@
 #include "beabi.h"
 #include "bemodule.h"
 #include "benode_t.h"
-#include "besched_t.h"
-#include "beirg_t.h"
+#include "besched.h"
+#include "beirg.h"
+#include "belive.h"
 
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
@@ -879,7 +881,7 @@ static void build_kill_edges(rss_t *rss, pset *epk) {
 
 		foreach_plist(rirn->pkiller_list, k_el) {
 			ir_node    *pkiller = plist_element_get_value(k_el);
-			rss_edge_t *ke      = obstack_alloc(phase_obst(&rss->ph), sizeof(*ke));
+			rss_edge_t *ke      = OALLOC(phase_obst(&rss->ph), rss_edge_t);
 
 			ke->src  = irn;
 			ke->tgt  = pkiller;
@@ -948,7 +950,7 @@ static void compute_bipartite_decomposition(rss_t *rss) {
 
 		DBG((rss->dbg, LEVEL_2, "\t\t%+F choosen:\n", u_irn));
 
-		cbc     = obstack_alloc(phase_obst(&rss->ph), sizeof(*cbc));
+		cbc     = OALLOC(phase_obst(&rss->ph), cbc_t);
 		cbc->nr = cur_num++;
 
 		/* initialize S_cb */
@@ -1182,8 +1184,7 @@ static void compute_killing_function(rss_t *rss) {
 
 		/* while X not empty */
 		while (ir_nodeset_size(&x) > 0) {
-			child_t *t = obstack_alloc(&obst, sizeof(*t));
-			memset(t, 0, sizeof(*t));
+			child_t *t = OALLOCZ(&obst, child_t);
 
 			t = select_child_max_cost(rss, &x, &y, t, cbc);
 
@@ -1263,7 +1264,7 @@ static inline void add_dvg_edge(rss_t *rss, dvg_t *dvg, const ir_node *src, cons
 	key.tgt = (ir_node *) tgt;
 	if (NULL != pset_find(dvg->edges, &key, HASH_RSS_EDGE(&key))) {
 		/* add the edge to the DVG */
-		dvg_edge = obstack_alloc(phase_obst(&rss->ph), sizeof(*dvg_edge));
+		dvg_edge = OALLOC(phase_obst(&rss->ph), rss_edge_t);
 
 		dvg_edge->src  = (ir_node *) src;
 		dvg_edge->tgt  = (ir_node *) tgt;
@@ -1312,7 +1313,7 @@ static void compute_dvg(rss_t *rss, dvg_t *dvg) {
 				There is an edge (u, v) in the DVG iff v is a descendant of the killer(u).
 			*/
 			if (BSEARCH_IRN_ARR(v_irn, u_kill->descendants)) {
-				rss_edge_t *dvg_edge = obstack_alloc(phase_obst(&rss->ph), sizeof(*dvg_edge));
+				rss_edge_t *dvg_edge = OALLOC(phase_obst(&rss->ph), rss_edge_t);
 				rss_edge_t key;
 
 				/* insert the user into the DVG and append it to the user list of u */
@@ -1469,7 +1470,7 @@ static ir_nodeset_t *compute_maximal_antichain(rss_t *rss, dvg_t *dvg, int itera
 	if (pset_count(dvg->edges) == 0)
 		return NULL;
 
-	bp = hungarian_new(n, n, 1, HUNGARIAN_MATCH_NORMAL);
+	bp = hungarian_new(n, n, HUNGARIAN_MATCH_NORMAL);
 
 	/*
 		At first, we build an index map for the nodes in the DVG,
@@ -1577,7 +1578,7 @@ static ir_nodeset_t *compute_maximal_antichain(rss_t *rss, dvg_t *dvg, int itera
 			int       xj      = idx_map[j];
 			ir_node   *xj_irn = get_idx_irn(rss->irg, xj);
 			rss_irn_t *xj_rss = get_rss_irn(rss, xj_irn);
-			chain_t   *c      = obstack_alloc(phase_obst(&rss->ph), sizeof(*c));
+			chain_t   *c      = OALLOC(phase_obst(&rss->ph), chain_t);
 			int       source;
 
 			/* there was no source for j -> we have a source of a new chain */
@@ -1989,7 +1990,7 @@ static void perform_value_serialization_heuristic(rss_t *rss) {
 	sat_vals  = compute_maximal_antichain(rss, &dvg, iteration++);
 	while (sat_vals && (ir_nodeset_size(sat_vals) > available_regs)) {
 		serialization_t *ser, best_ser;
-		rss_edge_t      *edge = obstack_alloc(phase_obst(&rss->ph), sizeof(*edge));
+		rss_edge_t      *edge = OALLOC(phase_obst(&rss->ph), rss_edge_t);
 		ir_node         *dep_src, *dep_tgt;
 
 		best_ser.edge = edge;
@@ -2168,7 +2169,7 @@ void rss_schedule_preparation(be_irg_t *birg) {
 	rss.h        = heights_new(irg);
 	rss.nodes    = plist_new();
 	rss.opts     = &rss_options;
-	rss.liveness = be_liveness(birg);
+	rss.liveness = be_liveness(irg);
 	be_liveness_assure_sets(rss.liveness);
 	irg_block_walk_graph(irg, NULL, process_block, &rss);
 	heights_free(rss.h);