Rework Block labels: They are entities now so we don't need a special symconst type...

[libfirm] / ir / lower / lower_switch.c

diff --git a/ir/lower/lower_switch.c b/ir/lower/lower_switch.c
index 413385e..a75854c 100644 (file)
--- a/ir/lower/lower_switch.c
+++ b/ir/lower/lower_switch.c
@@ -73,7 +73,7 @@ static int should_do_table_switch(ir_node *cond, unsigned spare_size)
        if (get_irn_n_outs(cond) <= 4)
                return 0;
 
-       default_pn = get_Cond_defaultProj(cond);
+       default_pn = get_Cond_default_proj(cond);
 
        foreach_out_irn(cond, i, proj) {
                long pn = get_Proj_proj(proj);
@@ -99,7 +99,7 @@ static int casecmp(const void *a, const void *b)
 {
        const case_data_t *cda = a;
        const case_data_t *cdb = b;
-       return cda->value - cdb->value;
+       return (cda->value > cdb->value) - (cda->value < cdb->value);
 }
 
 /**
@@ -135,6 +135,7 @@ static void create_if_cascade(ifcas_env_t *env, ir_node *curblock,
                set_Block_cfgpred(curcases[0].target, 0, new_Proj(cond, mode_X, pn_Cond_true));
                in[0] = new_Proj(cond, mode_X, pn_Cond_false);
                neblock = new_Block(1, in);
+               set_cur_block(neblock);
 
                /* second part: "else if(sel == val[1]) goto target[1] else goto default;" */
                val  = new_Const_long(get_irn_mode(env->sel), curcases[1].value);
@@ -160,6 +161,7 @@ static void create_if_cascade(ifcas_env_t *env, ir_node *curblock,
                set_cur_block(curblock);
                in[0] = new_Proj(cond, mode_X, pn_Cond_false);
                geblock = new_Block(1, in);
+               set_cur_block(geblock);
 
                create_if_cascade(env, ltblock, curcases, midcase);
                create_if_cascade(env, geblock, curcases + midcase, numcases - midcase);
@@ -214,7 +216,7 @@ static void find_cond_nodes(ir_node *block, void *ctx)
        numcases = get_irn_n_outs(cond) - 1;      // does not contain default case
        NEW_ARR_A(case_data_t, cases, numcases);
 
-       default_pn = get_Cond_defaultProj(cond);
+       default_pn = get_Cond_default_proj(cond);
        ifcas_env.sel = sel;
        ifcas_env.defindex = 0;
        NEW_ARR_A(ir_node*, ifcas_env.defusers, numcases);