Prevent SSA construction from running into endless loops.

[libfirm] / ir / lower / lower_copyb.c

diff --git a/ir/lower/lower_copyb.c b/ir/lower/lower_copyb.c
index 610f535..b8591ca 100644 (file)
--- a/ir/lower/lower_copyb.c
+++ b/ir/lower/lower_copyb.c
@@ -51,7 +51,7 @@ typedef struct walk_env {
 static ir_mode *get_ir_mode(unsigned bytes)
 {
        switch (bytes) {
-       case 1:  return mode_Bu;
+       case 1:  return mode_Bu;
        case 2:  return mode_Hu;
        case 4:  return mode_Iu;
        case 8:  return mode_Lu;
@@ -102,14 +102,14 @@ static void lower_copyb_nodes(ir_node *irn, unsigned mode_bytes)
                        addr_const = new_r_Const_long(irg, mode_Iu, offset);
                        add        = new_r_Add(block, addr_src, addr_const, addr_mode);
 
-                       load     = new_r_Load(block, mem, add, mode, 0);
+                       load     = new_r_Load(block, mem, add, mode, cons_none);
                        load_res = new_r_Proj(load, mode, pn_Load_res);
                        load_mem = new_r_Proj(load, mode_M, pn_Load_M);
 
                        addr_const = new_r_Const_long(irg, mode_Iu, offset);
                        add        = new_r_Add(block, addr_dst, addr_const, addr_mode);
 
-                       store     = new_r_Store(block, load_mem, add, load_res, 0);
+                       store     = new_r_Store(block, load_mem, add, load_res, cons_none);
                        store_mem = new_r_Proj(store, mode_M, pn_Store_M);
 
                        mem = store_mem;
@@ -129,7 +129,7 @@ static void lower_copyb_nodes(ir_node *irn, unsigned mode_bytes)
  */
 static void find_copyb_nodes(ir_node *irn, void *ctx)
 {
-       walk_env_t *env = ctx;
+       walk_env_t *env = (walk_env_t*)ctx;
        ir_type    *tp;
        unsigned   size;
        entry_t    *entry;
@@ -137,9 +137,9 @@ static void find_copyb_nodes(ir_node *irn, void *ctx)
        if (is_Proj(irn)) {
                ir_node *pred = get_Proj_pred(irn);
 
-               if (is_CopyB(pred) && get_Proj_proj(irn) != pn_CopyB_M_regular) {
+               if (is_CopyB(pred) && get_Proj_proj(irn) != pn_CopyB_M) {
                        /* found an exception Proj: remove it from the list again */
-                       entry = get_irn_link(pred);
+                       entry = (entry_t*)get_irn_link(pred);
                        list_del(&entry->list);
                }
                return;