use confirm_irg_properties in lower_intrinsics

[libfirm] / ir / stat / statev.h

diff --git a/ir/stat/statev.h b/ir/stat/statev.h
index 3f9dc31..8d135df 100644 (file)
--- a/ir/stat/statev.h
+++ b/ir/stat/statev.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.
  *
@@ -22,51 +22,51 @@
  * @brief       Statistic events.
  * @author      Sebastian Hack
  * @date        17.06.2007
- * @version     $Id$
  */
 
 #ifndef FIRM_STATEVENT_H
 #define FIRM_STATEVENT_H
 
-#ifndef FIRM_STATISTICS
+#ifdef DISABLE_STATEV
 
-#define stat_ev_do(expr)
-#define stat_ev_if                  if (0)
-#define stat_ev_dbl(name, val)
-#define stat_ev(name)
+#define stat_ev_enabled                          0
+#define stat_ev_dbl(name, val)                   ((void)0)
+#define stat_ev_int(name, val)                   ((void)0)
+#define stat_ev(name)                            ((void)0)
+#define stat_ev_emit(name, value)                ((void)0)
 
-#define stat_ev_cnt_decl(var)
-#define stat_ev_cnt_inc(var)
-#define stat_ev_cnt_done(name, var)
-#define stat_ev_tim_push()
-#define stat_ev_tim_pop(name)
+#define stat_ev_cnt_decl(var)                    ((void)0)
+#define stat_ev_cnt_inc(var)                     ((void)0)
+#define stat_ev_cnt_done(name, var)              ((void)0)
+#define stat_ev_tim_push()                       ((void)0)
+#define stat_ev_tim_pop(name)                    ((void)0)
 
-#define stat_ev_ctx_push_fobj(key, firm_object)
-#define stat_ev_ctx_push(key, value)
-#define stat_ev_ctx_pop(key)
-#define stat_ev_flush()
+#define stat_ev_ctx_push(key)                    ((void)0)
+#define stat_ev_ctx_push_str(key, str)           ((void)0)
+#define stat_ev_ctx_push_fmt(key, fmt, value)    ((void)0)
+#define stat_ev_ctx_push_fobj(key, firm_object)  ((void)0)
+#define stat_ev_ctx_pop(key)                     ((void)0)
+#define stat_ev_flush()                          ((void)0)
 
 #else
 
 #include <stdio.h>
-#include "timing.h"
+#include "stat_timing.h"
 
-extern void               stat_ev_printf(char ev_type, const char *key, const char *fmt, ...);
+extern void           stat_ev_printf(char ev_type, const char *key, const char *fmt, ...);
 
-extern int                stat_ev_enabled;
-extern int                stat_ev_timer_sp;
-extern timing_ticks_t     stat_ev_timer_elapsed[];
-extern timing_ticks_t     stat_ev_timer_start[];
-extern timing_sched_env_t stat_ev_sched_rt;
-extern timing_sched_env_t stat_ev_sched_normal;
+extern int            stat_ev_enabled;
+extern int            stat_ev_timer_sp;
+extern timing_ticks_t stat_ev_timer_elapsed[];
+extern timing_ticks_t stat_ev_timer_start[];
 
-static INLINE __attribute__((unused)) void stat_ev_tim_push(void) {
+static inline void stat_ev_tim_push(void) {
        timing_ticks_t temp;
        int sp = stat_ev_timer_sp++;
        timing_ticks(temp);
-       if (sp == 0)
-               timing_sched_set(&stat_ev_sched_rt);
-       else {
+       if (sp == 0) {
+               timing_enter_max_prio();
+       } else {
                timing_ticks_sub(temp, stat_ev_timer_start[sp - 1]);
                timing_ticks_add(stat_ev_timer_elapsed[sp - 1], temp);
        }
@@ -74,7 +74,7 @@ static INLINE __attribute__((unused)) void stat_ev_tim_push(void) {
        timing_ticks(stat_ev_timer_start[sp]);
 }
 
-static INLINE __attribute__((unused)) void stat_ev_tim_pop(const char *name) {
+static inline void stat_ev_tim_pop(const char *name) {
        int sp;
        timing_ticks_t temp;
        timing_ticks(temp);
@@ -83,10 +83,11 @@ static INLINE __attribute__((unused)) void stat_ev_tim_pop(const char *name) {
        timing_ticks_add(stat_ev_timer_elapsed[sp], temp);
        if (name != NULL && stat_ev_enabled)
                stat_ev_printf('E', name, "%g", timing_ticks_dbl(stat_ev_timer_elapsed[sp]));
-       if (sp == 0)
-               timing_sched_set(&stat_ev_sched_normal);
-       else
+       if (sp == 0) {
+               timing_leave_max_prio();
+       } else {
                timing_ticks(stat_ev_timer_start[sp - 1]);
+       }
 }
 
 #define stat_ev_ctx_push_fmt(key, fmt, value) \
@@ -121,15 +122,13 @@ static INLINE __attribute__((unused)) void stat_ev_tim_pop(const char *name) {
 #define stat_ev_ctx_push(key)                   stat_ev_ctx_push_fmt((key), "X", NULL)
 
 #define stat_ev_dbl(name, val)      stat_ev_emit((name), (val))
+#define stat_ev_int(name, val)      stat_ev_dbl((name), (double) (val))
 #define stat_ev(name)               stat_ev_emit((name), 0.0)
 
 #define stat_ev_cnt_decl(var)       int stat_ev_cnt_var_ ## var = 0
 #define stat_ev_cnt_inc(var)        do { ++stat_ev_cnt_var_ ## var; } while(0)
 #define stat_ev_cnt_done(var, name) stat_ev_emit((name), stat_ev_cnt_var_ ## var)
 
-#define stat_ev_do(expr)            (stat_ev_enabled ? ((expr), 1) : 0)
-#define stat_ev_if                  if (stat_ev_enabled)
-
 /**
  * Initialize the stat ev machinery.
  * @param filename_prefix  The prefix of the filename (.ev or .ev.gz will be appended).
@@ -146,4 +145,4 @@ void stat_ev_end(void);
 
 #endif
 
-#endif /* FIRM_STATEVENT_H */
+#endif