X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschedrss.c;h=1e00876f85441d7b2498a7a6cfc1a760bb6172a6;hb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;hp=8791e6594bbc7dc1d2d0e81ad8321d70e8cb2032;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/be/beschedrss.c b/ir/be/beschedrss.c
index 8791e6594..1e00876f8 100644
--- a/ir/be/beschedrss.c
+++ b/ir/be/beschedrss.c
@@ -50,6 +50,7 @@
 #include "bipartite.h"
 #include "hungarian.h"
 #include "plist.h"
+#include "array_t.h"
 
 #include "height.h"
 
@@ -59,8 +60,8 @@
 #include "besched_t.h"
 #include "beirg_t.h"
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 
 #define ARR_LEN_SAFE(arr) ((arr) != NULL ? ARR_LEN((arr)) : 0)
@@ -1567,7 +1568,7 @@ static ir_nodeset_t *compute_maximal_antichain(rss_t *rss, dvg_t *dvg, int itera
 		DBG((rss->dbg, LEVEL_3, "\t\t\t%3d -> %3d         %3d -> %3d\n", i, assignment[i], i, assignment_rev[i]));
 	}
 
-	values    = xmalloc(sizeof(values[0]));
+	values    = XMALLOC(ir_nodeset_t);
 	ir_nodeset_init_size(values, 10);
 	cur_chain = 0;
 	/* Construction of the minimal chain partition */
@@ -1645,7 +1646,7 @@ static ir_nodeset_t *compute_maximal_antichain(rss_t *rss, dvg_t *dvg, int itera
 			free(temp);
 		}
 
-		temp = xmalloc(sizeof(temp[0]));
+		temp = XMALLOC(ir_nodeset_t);
 		ir_nodeset_init_size(temp, 10);
 
 		/* Select all nodes from current value set, having another node in the set as descendant. */
@@ -2064,8 +2065,8 @@ static void process_block(ir_node *block, void *env) {
 	rss->max_height = heights_recompute_block(rss->h, block);
 
 	/* loop over all register classes */
-	for (i = arch_isa_get_n_reg_class(rss->arch_env->isa) - 1; i >= 0; --i) {
-		const arch_register_class_t *cls = arch_isa_get_reg_class(rss->arch_env->isa, i);
+	for (i = arch_env_get_n_reg_class(rss->arch_env) - 1; i >= 0; --i) {
+		const arch_register_class_t *cls = arch_env_get_reg_class(rss->arch_env, i);
 
 		rss->cls = cls;
 		DBG((rss->dbg, LEVEL_1, "register class %s\n", arch_register_class_name(cls)));