X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschednormal.c;h=46aa21b19b00d2352e104f441bbf300b46d6a4a0;hb=6082146d47925a3dbbc78da30ca0a89276457dce;hp=d505350927be698bdd57a3a21e8cdd8236007e84;hpb=d2c1b0191844c3c23731158a153838d570dcd65a;p=libfirm

diff --git a/ir/be/beschednormal.c b/ir/be/beschednormal.c
index d50535092..46aa21b19 100644
--- a/ir/be/beschednormal.c
+++ b/ir/be/beschednormal.c
@@ -33,7 +33,7 @@
 #include "height.h"
 #include "irtools.h"
 #include "irgwalk.h"
-#include "benode_t.h"
+#include "benode.h"
 #include "array_t.h"
 
 // XXX there is no one time init for schedulers
@@ -154,7 +154,7 @@ static int normal_tree_cost(ir_node* irn, instance_t *inst)
 		int            i;
 		ir_node*       block = get_nodes_block(irn);
 
-		fc = obstack_alloc(&inst->obst, sizeof(*fc) + sizeof(*fc->costs) * arity);
+		fc = OALLOCF(&inst->obst, flag_and_cost, costs, arity);
 		fc->no_root = 0;
 		costs = fc->costs;
 
@@ -408,7 +408,7 @@ static void *normal_init_block(void *graph_env, ir_node *block)
 	   The link field is used anyway. */
 	for (i = ARR_LEN(sched) - 1; i >= 0; --i) {
 		ir_node* irn = sched[i];
-		if (!arch_irn_class_is(irn, branch)) {
+		if (!is_cfop(irn)) {
 			set_irn_link(irn, first);
 			first = irn;
 		}