fix for c++ commit

[libfirm] / ir / be / beschednormal.c

diff --git a/ir/be/beschednormal.c b/ir/be/beschednormal.c
index 46aa21b..5e8bafd 100644 (file)
--- a/ir/be/beschednormal.c
+++ b/ir/be/beschednormal.c
@@ -30,7 +30,7 @@
 #include "belistsched.h"
 #include "belive_t.h"
 #include "beutil.h"
-#include "height.h"
+#include "heights.h"
 #include "irtools.h"
 #include "irgwalk.h"
 #include "benode.h"
@@ -56,7 +56,7 @@ static int must_be_scheduled(const ir_node* const irn)
 static ir_node *normal_select(void *block_env, ir_nodeset_t *ready_set,
                               ir_nodeset_t *live_set)
 {
-       instance_t* inst = block_env;
+       instance_t* inst = (instance_t*)block_env;
        ir_node*    irn;
        ir_node*    next;
        ir_node*    last = NULL;
@@ -65,7 +65,7 @@ static ir_node *normal_select(void *block_env, ir_nodeset_t *ready_set,
        (void)live_set;
 
        for (irn = inst->curr_list; irn != NULL; last = irn, irn = next) {
-               next = get_irn_link(irn);
+               next = (ir_node*)get_irn_link(irn);
                if (ir_nodeset_contains(ready_set, irn)) {
 #if defined NORMAL_DBG
                        ir_fprintf(stderr, "scheduling %+F\n", irn);
@@ -91,8 +91,8 @@ typedef struct irn_cost_pair {
 
 static int cost_cmp(const void* a, const void* b)
 {
-       const irn_cost_pair* const a1 = a;
-       const irn_cost_pair* const b1 = b;
+       const irn_cost_pair* const a1 = (const irn_cost_pair*)a;
+       const irn_cost_pair* const b1 = (const irn_cost_pair*)b;
        int ret = b1->cost - a1->cost;
        if (ret == 0)
                ret = (int)get_irn_idx(a1->irn) - (int)get_irn_idx(b1->irn);
@@ -119,6 +119,9 @@ static int count_result(const ir_node* irn)
        if (mode == mode_M || mode == mode_X)
                return 0;
 
+       if (mode == mode_T)
+               return 1;
+
        if (arch_get_register_req_out(irn)->type & arch_register_req_type_ignore)
                return 0;
 
@@ -194,9 +197,14 @@ static int normal_tree_cost(ir_node* irn, instance_t *inst)
        last = 0;
        for (i = 0; i < arity; ++i) {
                ir_node* op = fc->costs[i].irn;
-               if (op == last)                 continue;
-               if (get_irn_mode(op) == mode_M) continue;
-               if (arch_irn_is_ignore(op))     continue;
+               ir_mode* mode;
+               if (op == last)
+                       continue;
+               mode = get_irn_mode(op);
+               if (mode == mode_M)
+                       continue;
+               if (mode != mode_T && arch_irn_is_ignore(op))
+                       continue;
                cost = MAX(fc->costs[i].cost + n_op_res, cost);
                last = op;
                ++n_op_res;
@@ -214,7 +222,7 @@ static int normal_tree_cost(ir_node* irn, instance_t *inst)
 
 static void normal_cost_walker(ir_node* irn, void* env)
 {
-       instance_t *inst = env;
+       instance_t *inst = (instance_t*)env;
 
 #if defined NORMAL_DBG
        ir_fprintf(stderr, "cost walking node %+F\n", irn);
@@ -242,7 +250,7 @@ static void collect_roots(ir_node* irn, void* env)
 
        if (is_root) {
                ir_node* block = get_nodes_block(irn);
-               ir_node** roots = get_irn_link(block);
+               ir_node** roots = (ir_node**)get_irn_link(block);
                if (roots == NULL) {
                        roots = NEW_ARR_F(ir_node*, 0);
                }
@@ -280,8 +288,8 @@ static ir_node** sched_node(ir_node** sched, ir_node* irn)
 
 static int root_cmp(const void* a, const void* b)
 {
-       const irn_cost_pair* const a1 = a;
-       const irn_cost_pair* const b1 = b;
+       const irn_cost_pair* const a1 = (const irn_cost_pair*)a;
+       const irn_cost_pair* const b1 = (const irn_cost_pair*)b;
        int ret;
        if (is_irn_forking(a1->irn)) {
                ret = 1;
@@ -303,8 +311,8 @@ static int root_cmp(const void* a, const void* b)
 
 static void normal_sched_block(ir_node* block, void* env)
 {
-       ir_node**      roots = get_irn_link(block);
-       heights_t*     heights = env;
+       ir_node**      roots = (ir_node**)get_irn_link(block);
+       ir_heights_t*  heights = (ir_heights_t*)env;
        int            root_count;
        irn_cost_pair* root_costs;
        int i;
@@ -369,11 +377,10 @@ static void normal_sched_block(ir_node* block, void* env)
 
 
 static void *normal_init_graph(const list_sched_selector_t *vtab,
-                               const be_irg_t *birg)
+                               ir_graph *irg)
 {
-       instance_t* inst = XMALLOC(instance_t);
-       ir_graph*   irg = be_get_birg_irg(birg);
-       heights_t*  heights;
+       instance_t   *inst = XMALLOC(instance_t);
+       ir_heights_t *heights;
 
        (void)vtab;
 
@@ -399,8 +406,8 @@ static void *normal_init_graph(const list_sched_selector_t *vtab,
 
 static void *normal_init_block(void *graph_env, ir_node *block)
 {
-       instance_t* inst  = graph_env;
-       ir_node**   sched = get_irn_link(block);
+       instance_t* inst  = (instance_t*)graph_env;
+       ir_node**   sched = (ir_node**)get_irn_link(block);
        ir_node*    first = NULL;
        int         i;
 
@@ -421,9 +428,9 @@ static void *normal_init_block(void *graph_env, ir_node *block)
        return inst;
 }
 
-void normal_finish_graph(void *env)
+static void normal_finish_graph(void *env)
 {
-       instance_t *inst = env;
+       instance_t *inst = (instance_t*)env;
 
        /* block uses the link field to store the schedule */
        ir_free_resources(inst->irg, IR_RESOURCE_IRN_LINK);
@@ -435,7 +442,6 @@ const list_sched_selector_t normal_selector = {
        normal_init_graph,
        normal_init_block,
        normal_select,
-       NULL,              /* to_appear_in_schedule */
        NULL,              /* node_ready */
        NULL,              /* node_selected */
        NULL,              /* exectime */