removed MIN/MAX macros (in irtools.h now)

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index bffc885..aecf320 100644 (file)
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -28,6 +28,7 @@
 #include "irprintf_t.h"
 #include "array.h"
 #include "debug.h"
+#include "irtools.h"
 
 #include "besched_t.h"
 #include "beutil.h"
@@ -37,9 +38,6 @@
 #include "bearch.h"
 #include "bestat.h"
 
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-
 /**
  * All scheduling info needed per node.
  */

diff --git a/ir/be/bestat.c b/ir/be/bestat.c
index cb47c07..c7d181b 100644 (file)
--- a/ir/be/bestat.c
+++ b/ir/be/bestat.c
@@ -15,14 +15,12 @@
 #include "irhooks.h"
 #include "dbginfo_t.h"
 #include "firmstat_t.h"
+#include "irtools.h"
 
 #include "bestat.h"
 #include "belive_t.h"
 #include "besched.h"
 
-#undef MIN
-#define MIN(a, b) (a < b ? a : b)
-
 /**
  * Collect reg pressure statistics per block and per class.
  */
@@ -49,7 +47,7 @@ static void stat_reg_pressure_block(ir_node *block, void *env) {
                        max_live = cnt < max_live ? max_live : cnt;
                }
 
-               stat_be_block_regpressure(birg->irg, block, max_live, cls->name);
+               stat_be_block_regpressure(birg->irg, block, MIN(max_live, 5), cls->name);
        }
 }