Removed mode parameter from Const and Const_type constructors (now derived from tarval)

[libfirm] / ir / opt / opt_osr.c

diff --git a/ir/opt/opt_osr.c b/ir/opt/opt_osr.c
index efa3baf..6a3564a 100644 (file)
--- a/ir/opt/opt_osr.c
+++ b/ir/opt/opt_osr.c
@@ -28,9 +28,7 @@
  *  by Keith D. Cooper, L. Taylor Simpson, Christopher A. Vick.
  *  Extended version.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "adt/pdeq.h"
 #include "iroptimize.h"
@@ -52,7 +50,7 @@
 #include "irloop_t.h"
 #include "array.h"
 #include "firmstat.h"
-#include "xmalloc.h"
+#include "error.h"
 
 /** The debug handle. */
 DEBUG_ONLY(static firm_dbg_module_t *dbg;)
@@ -305,7 +303,7 @@ static ir_node *do_apply(ir_opcode code, dbg_info *db, ir_node *op1, ir_node *op
                result = new_rd_Sub(db, irg, block, op1, op2, mode);
                break;
        default:
-               assert(0);
+               panic("Unsupported opcode");
                result = NULL;
        }
        return result;
@@ -939,7 +937,7 @@ static void dfs(ir_node *irn, iv_env *env)
                for (i = 0; i < n; ++i) {
                        ir_node *pred = get_irn_n(irn, i);
 
-                       if (irn_not_visited(pred))
+                       if (!irn_visited(pred))
                                dfs(pred, env);
                }
        }
@@ -951,7 +949,7 @@ static void dfs(ir_node *irn, iv_env *env)
                push(env, irn);
 
                /* handle the block */
-               if (irn_not_visited(block))
+               if (!irn_visited(block))
                        dfs(block, env);
 
                n = get_irn_arity(irn);
@@ -959,7 +957,7 @@ static void dfs(ir_node *irn, iv_env *env)
                        ir_node *pred = get_irn_n(irn, i);
                        node_entry *o = get_irn_ne(pred, env);
 
-                       if (irn_not_visited(pred)) {
+                       if (!irn_visited(pred)) {
                                dfs(pred, env);
                                node->low = MIN(node->low, o->low);
                        }
@@ -1010,7 +1008,7 @@ static void do_dfs(ir_graph *irg, iv_env *env) {
        for (i = 0; i < n; ++i) {
                ir_node *ka = get_End_keepalive(end, i);
 
-               if (irn_not_visited(ka))
+               if (!irn_visited(ka))
                        dfs(ka, env);
        }
 
@@ -1117,7 +1115,7 @@ static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env
                        DB((dbg, LEVEL_4, " - %+F", tv_r));
                        break;
                default:
-                       assert(0);
+                       panic("Unsupported opcode");
                        tv = tarval_bad;
                }
 
@@ -1134,7 +1132,7 @@ static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env
                        DB((dbg, LEVEL_4, " = OVERFLOW"));
                        return NULL;
                }
-               return new_r_Const(current_ir_graph, get_irn_n(rc, -1), get_tarval_mode(tv), tv);
+               return new_Const(tv);
        }
        return do_apply(e->code, NULL, rc, e->rc, get_irn_mode(rc));
 }
@@ -1189,7 +1187,7 @@ static void do_lftr(ir_node *cmp, void *ctx) {
        ir_node *iv, *rc;
        ir_node *nleft = NULL, *nright = NULL;
 
-       if (get_irn_op(cmp) != op_Cmp)
+       if (!is_Cmp(cmp))
                return;
 
        left  = get_Cmp_left(cmp);