- fixed signed/unsigned warning

[libfirm] / ir / opt / tropt.c

diff --git a/ir/opt/tropt.c b/ir/opt/tropt.c
index e936b7f..5a84156 100644 (file)
--- a/ir/opt/tropt.c
+++ b/ir/opt/tropt.c
@@ -24,9 +24,7 @@
  * @author  Goetz Lindenmaier
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <assert.h>
 
@@ -71,7 +69,7 @@ static ir_type *default_gen_pointer_type_to(ir_type *tp) {
                } else {
                        ir_mode *mode = is_Method_type(tp) ? mode_P_code : mode_P_data;
 
-                       res = new_type_pointer(mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode);
+                       res = new_type_pointer(id_mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode);
                        /* Update trout for pointer types, so we can use it in next call. */
                        add_type_pointertype_to(tp, res);
                }
@@ -79,7 +77,7 @@ static ir_type *default_gen_pointer_type_to(ir_type *tp) {
        else {
                res = find_pointer_type_to_type(tp);
                if (res == firm_unknown_type)
-                       res = new_type_pointer(mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode_P_data);
+                       res = new_type_pointer(id_mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode_P_data);
        }
 
        return res;
@@ -247,7 +245,7 @@ static void cancel_out_casts(ir_node *cast) {
        ir_type *tp_cast, *tp_pred, *tp_orig;
        int ref_depth = 0;
 
-       if (get_irn_op(pred) != op_Cast) return;
+       if (!is_Cast(pred)) return;
        orig = get_Cast_op(pred);
 
        tp_cast = get_Cast_type(cast);
@@ -299,7 +297,7 @@ static void concretize_selected_entity(ir_node *sel) {
        sel_ent = get_Sel_entity(sel);
        cast = get_Sel_ptr(sel);
 
-       while (get_irn_op(cast) == op_Cast) {
+       while (is_Cast(cast)) {
                cast_tp = get_Cast_type(cast);
                ptr = get_Cast_op(cast);
                orig_tp = get_irn_typeinfo_type(ptr);
@@ -331,16 +329,19 @@ static void concretize_selected_entity(ir_node *sel) {
        }
 }
 
-static void concretize_Phi_type(ir_node *phi) {
-       int i, n_preds = get_Phi_n_preds(phi);
-       ir_node **pred = alloca(n_preds * sizeof(ir_node *));
-       ir_node *nn;
-       ir_type *totype, *fromtype;
+static void concretize_Phi_type(ir_node *phi)
+{
+       int       n_preds = get_Phi_n_preds(phi);
+       ir_node **pred    = ALLOCAN(ir_node*, n_preds);
+       ir_node  *nn;
+       ir_type  *totype;
+       ir_type  *fromtype;
+       int       i;
 
        if (n_preds == 0) return;
        pred[0] = get_Phi_pred(phi, 0);
 
-       if (get_irn_op(pred[0]) != op_Cast) return;
+       if (!is_Cast(pred[0])) return;
 
        if (!is_Cast_upcast(pred[0])) return;
 
@@ -350,7 +351,7 @@ static void concretize_Phi_type(ir_node *phi) {
        pred[0] = get_Cast_op(pred[0]);
        for (i = 1; i < n_preds; ++i) {
                pred[i] = get_Phi_pred(phi, i);
-               if (get_irn_op(pred[i]) != op_Cast) return;
+               if (!is_Cast(pred[i])) return;
                if (get_irn_typeinfo_type(get_Cast_op(pred[i])) != fromtype) return;
                pred[i] = get_Cast_op(pred[i]);
        }