projects / libfirm / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
tv: Remove mul_table[][][] and simply use * and <<.
[libfirm] / ir / be / ia32 / ia32_dbg_stat.h
diff --git a/ir/be/ia32/ia32_dbg_stat.h b/ir/be/ia32/ia32_dbg_stat.h
index b51b5fd..0508bba 100644 (file)
--- a/ir/be/ia32/ia32_dbg_stat.h
+++ b/ir/be/ia32/ia32_dbg_stat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,7 +21,6 @@
  * @file
  * @brief       This file contains macros to update ia32 firm statistics.
  * @author      Christian Wuerdig
- * @version     $Id$
  */
 #ifndef FIRM_BE_IA32_IA32_DBG_STAT_H
 #define FIRM_BE_IA32_IA32_DBG_STAT_H
@@ -29,8 +28,7 @@
 #include "irhooks.h"
 #include "dbginfo_t.h"
 #include "firmstat.h"
-
-#define SIZ(x)    sizeof(x)/sizeof((x)[0])
+#include "util.h"
 
 /**
  * Merge the debug info due to a LEA creation.
@@ -63,13 +61,13 @@
  * @param oldn2  an additional old node
  * @param n      the new lea
  */
-#define DBG_OPT_LEA2(oldn1, oldn2, n)                              \
-       do {                                                           \
-               ir_node *ons[2];                                           \
-               ons[0] = oldn1;                                            \
-               ons[1] = oldn2;                                            \
-               hook_merge_nodes(&n, 1, ons, SIZ(ons), FS_BE_IA32_LEA);    \
-               __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_backend);  \
+#define DBG_OPT_LEA2(oldn1, oldn2, n)                                    \
+       do {                                                                 \
+               ir_node *ons[2];                                                 \
+               ons[0] = oldn1;                                                  \
+               ons[1] = oldn2;                                                  \
+               hook_merge_nodes(&n, 1, ons, ARRAY_SIZE(ons), FS_BE_IA32_LEA);   \
+               __dbg_info_merge_sets(&n, 1, ons, ARRAY_SIZE(ons), dbg_backend); \
        } while(0)
 
 /**
@@ -80,14 +78,14 @@
  * @param oldn3  an additional old node
  * @param n      the new lea
  */
-#define DBG_OPT_LEA3(oldn1, oldn2, oldn3, n)                       \
-       do {                                                           \
-               ir_node *ons[3];                                           \
-               ons[0] = oldn1;                                            \
-               ons[1] = oldn2;                                            \
-               ons[2] = oldn3;                                            \
-               hook_merge_nodes(&n, 1, ons, SIZ(ons), FS_BE_IA32_LEA);    \
-               __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_backend);  \
+#define DBG_OPT_LEA3(oldn1, oldn2, oldn3, n)                             \
+       do {                                                                 \
+               ir_node *ons[3];                                                 \
+               ons[0] = oldn1;                                                  \
+               ons[1] = oldn2;                                                  \
+               ons[2] = oldn3;                                                  \
+               hook_merge_nodes(&n, 1, ons, ARRAY_SIZE(ons), FS_BE_IA32_LEA);   \
+               __dbg_info_merge_sets(&n, 1, ons, ARRAY_SIZE(ons), dbg_backend); \
        } while(0)
 
 /**
@@ -99,15 +97,15 @@
  * @param oldn4  an additional old node
  * @param n      the new lea
  */
-#define DBG_OPT_LEA4(oldn1, oldn2, oldn3, oldn4, n)                \
-       do {                                                           \
-               ir_node *ons[4];                                           \
-               ons[0] = oldn1;                                            \
-               ons[1] = oldn2;                                            \
-               ons[2] = oldn3;                                            \
-               ons[3] = oldn4;                                            \
-               hook_merge_nodes(&n, 1, ons, SIZ(ons), FS_BE_IA32_LEA);    \
-               __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_backend);  \
+#define DBG_OPT_LEA4(oldn1, oldn2, oldn3, oldn4, n)                      \
+       do {                                                                 \
+               ir_node *ons[4];                                                 \
+               ons[0] = oldn1;                                                  \
+               ons[1] = oldn2;                                                  \
+               ons[2] = oldn3;                                                  \
+               ons[3] = oldn4;                                                  \
+               hook_merge_nodes(&n, 1, ons, ARRAY_SIZE(ons), FS_BE_IA32_LEA);   \
+               __dbg_info_merge_sets(&n, 1, ons, ARRAY_SIZE(ons), dbg_backend); \
        } while(0)
 
 /**
@@ -118,7 +116,7 @@
  */
 #define DBG_OPT_LOAD_LEA(oldn, n)                                \
        do {                                                         \
-               hook_merge_nodes(&n, 1, &oldn, 1, FS_BE_IA32_LOAD_LEA);  \
+               hook_merge_nodes(&n, 1, &oldn, 1, (hook_opt_kind)FS_BE_IA32_LOAD_LEA);  \
                __dbg_info_merge_pair(n, oldn, dbg_backend);             \
        } while(0)
 
@@ -130,7 +128,7 @@
  */
 #define DBG_OPT_STORE_LEA(oldn, n)                                \
        do {                                                          \
-               hook_merge_nodes(&n, 1, &oldn, 1, FS_BE_IA32_STORE_LEA);  \
+               hook_merge_nodes(&n, 1, &oldn, 1, (hook_opt_kind)FS_BE_IA32_STORE_LEA);  \
                __dbg_info_merge_pair(n, oldn, dbg_backend);              \
        } while(0)
 
@@ -142,7 +140,7 @@
  */
 #define DBG_OPT_AM_S(oldn, n)                                \
        do {                                                     \
-               hook_merge_nodes(&n, 1, &oldn, 1, FS_BE_IA32_AM_S);  \
+               hook_merge_nodes(&n, 1, &oldn, 1, (hook_opt_kind)FS_BE_IA32_AM_S);  \
                __dbg_info_merge_pair(n, oldn, dbg_backend);         \
        } while(0)
 
@@ -153,13 +151,13 @@
  * @param store  the old store
  * @param n      the new op
  */
-#define DBG_OPT_AM_D(load, store, n)                               \
-       do {                                                           \
-               ir_node *ons[2];                                           \
-               ons[0] = load;                                             \
-               ons[1] = store;                                            \
-               hook_merge_nodes(&n, 1, ons, SIZ(ons), FS_BE_IA32_AM_D);   \
-               __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_backend);  \
+#define DBG_OPT_AM_D(load, store, n)                                     \
+       do {                                                                 \
+               ir_node *ons[2];                                                 \
+               ons[0] = load;                                                   \
+               ons[1] = store;                                                  \
+               hook_merge_nodes(&n, 1, ons, ARRAY_SIZE(ons), FS_BE_IA32_AM_D);  \
+               __dbg_info_merge_sets(&n, 1, ons, ARRAY_SIZE(ons), dbg_backend); \
        } while(0)
 
 /**
@@ -179,7 +177,7 @@
  */
 #define DBG_OPT_2ADDRCPY(cpy)                                    \
        do {                                                         \
-               hook_merge_nodes(NULL, 0, &cpy, 1, FS_BE_IA32_2ADDRCPY); \
+               hook_merge_nodes(NULL, 0, &cpy, 1, (hook_opt_kind)FS_BE_IA32_2ADDRCPY); \
        } while(0)
 
 /**
@@ -190,7 +188,7 @@
  */
 #define DBG_OPT_SPILL2ST(spill, store)                               \
        do {                                                             \
-               hook_merge_nodes(&store, 1, &spill, 1, FS_BE_IA32_SPILL2ST); \
+               hook_merge_nodes(&store, 1, &spill, 1, (hook_opt_kind)FS_BE_IA32_SPILL2ST); \
                __dbg_info_merge_pair(store, spill, dbg_backend);            \
        } while(0)
 
@@ -202,7 +200,7 @@
  */
 #define DBG_OPT_RELOAD2LD(rload, load)                               \
        do {                                                             \
-               hook_merge_nodes(&load, 1, &rload, 1, FS_BE_IA32_RELOAD2LD); \
+               hook_merge_nodes(&load, 1, &rload, 1, (hook_opt_kind)FS_BE_IA32_RELOAD2LD); \
                __dbg_info_merge_pair(load, rload, dbg_backend);             \
        } while(0)
 
@@ -214,7 +212,7 @@
  */
 #define DBG_OPT_SUB2NEGADD(sub, nadd)                               \
        do {                                                            \
-               hook_merge_nodes(&nadd, 1, &sub, 1, FS_BE_IA32_SUB2NEGADD); \
+               hook_merge_nodes(&nadd, 1, &sub, 1, (hook_opt_kind)FS_BE_IA32_SUB2NEGADD); \
                __dbg_info_merge_pair(nadd, sub, dbg_backend);              \
        } while(0)
 
@@ -226,7 +224,7 @@
  */
 #define DBG_OPT_LEA2ADD(lea, nadd)                               \
        do {                                                         \
-               hook_merge_nodes(&nadd, 1, &lea, 1, FS_BE_IA32_LEA2ADD); \
+               hook_merge_nodes(&nadd, 1, &lea, 1, (hook_opt_kind)FS_BE_IA32_LEA2ADD); \
                __dbg_info_merge_pair(nadd, lea, dbg_backend);           \
        } while(0)
 
libfirm