X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Firopt_dbg.h;h=7068661a83de3e49721f596765d7c2c6fb57b741;hb=dcff73b2cc34378750e2cc1979a4b120e19767a9;hp=f06b815dc439c71326d9dc615c228e55c61a3b2b;hpb=fa370945a3996a87ce55b758d27013c75b206834;p=libfirm

diff --git a/ir/opt/iropt_dbg.h b/ir/opt/iropt_dbg.h
index f06b815dc..7068661a8 100644
--- a/ir/opt/iropt_dbg.h
+++ b/ir/opt/iropt_dbg.h
@@ -21,7 +21,6 @@
  * @file
  * @brief   Debug macros used in iropt.
  * @author  Goetz Lindenmaier, Michael Beck
- * @version $Id$
  */
 #ifndef FIRM_IR_IROPT_DBG_H
 #define FIRM_IR_IROPT_DBG_H
@@ -112,7 +111,7 @@
  */
 #define DBG_OPT_ALGSIM0(oldn, n, flag)                              \
 	do {                                                            \
-	  hook_merge_nodes(&n, 1, &oldn, 1, flag);                      \
+	  hook_merge_nodes(&n, 1, &oldn, 1, (hook_opt_kind)flag);       \
 	  __dbg_info_merge_pair(n, oldn, dbg_algebraic_simplification); \
 	} while(0)
 
@@ -131,7 +130,7 @@
 	  ons[0] = oldn;                                              \
 	  ons[1] = a;                                                 \
 	  ons[2] = b;                                                 \
-	  hook_merge_nodes(&n, 1, ons, ARRAY_SIZE(ons), flag);        \
+	  hook_merge_nodes(&n, 1, ons, ARRAY_SIZE(ons), (hook_opt_kind)flag); \
 	  __dbg_info_merge_sets(&n, 1, ons, ARRAY_SIZE(ons), dbg_algebraic_simplification); \
 	} while(0)
 
@@ -149,7 +148,7 @@
 	  ons[0] = oldn;                                              \
 	  ons[1] = pred;                                              \
 	  ons[2] = n;                                                 \
-	  hook_merge_nodes(&n, 1, ons, ARRAY_SIZE(ons), flag);        \
+	  hook_merge_nodes(&n, 1, ons, ARRAY_SIZE(ons), (hook_opt_kind)flag); \
 	  __dbg_info_merge_sets(&n, 1, ons, ARRAY_SIZE(ons), dbg_algebraic_simplification); \
 	} while(0)
 
@@ -382,7 +381,7 @@
  */
 #define DBG_EVAL_CONFIRM(n)                                    \
 	do {                                                       \
-	  hook_merge_nodes(NULL, 0, &n, 1, HOOK_OPT_CONFIRM_E);    \
+	  hook_merge_nodes(NULL, 0, (ir_node**)&n, 1, HOOK_OPT_CONFIRM_E);    \
 	} while(0)
 
 /**
@@ -392,10 +391,10 @@
  * @param n     the new node replacing oldn
  * @param flag  firm statistics option
  */
-#define DBG_OPT_GVN_PRE(oldn, n, flag)             \
-	do {                                           \
-	  hook_merge_nodes(&n, 1, &oldn, 1, flag);     \
-	  __dbg_info_merge_pair(n, oldn, dbg_gvn_pre); \
+#define DBG_OPT_GVN_PRE(oldn, n, flag)                        \
+	do {                                                      \
+	  hook_merge_nodes(&n, 1, &oldn, 1, (hook_opt_kind)flag); \
+	  __dbg_info_merge_pair(n, oldn, dbg_gvn_pre);            \
 	} while(0)
 
 /**
@@ -405,10 +404,10 @@
  * @param n     the new node replacing oldn
  * @param flag  firm statistics option
  */
-#define DBG_OPT_COMBO(oldn, n, flag)             \
-	do {                                         \
-	  hook_merge_nodes(&n, 1, &oldn, 1, flag);   \
-	  __dbg_info_merge_pair(n, oldn, dbg_combo); \
+#define DBG_OPT_COMBO(oldn, n, flag)                          \
+	do {                                                      \
+	  hook_merge_nodes(&n, 1, &oldn, 1, (hook_opt_kind)flag); \
+	  __dbg_info_merge_pair(n, oldn, dbg_combo);              \
 	} while(0)
 
 /**
@@ -419,7 +418,7 @@
  */
 #define DBG_OPT_JUMPTHREADING(oldn, n)                         \
 	do {                                                   \
-	  hook_merge_nodes(&n, 1, &oldn, 1, FS_OPT_JUMPTHREADING); \
+	  hook_merge_nodes(&n, 1, &oldn, 1, (hook_opt_kind)FS_OPT_JUMPTHREADING); \
 	  __dbg_info_merge_pair(n, oldn, dbg_jumpthreading);       \
 	} while(0)