bearch: Dump the output requirement and the assigned register in the same line for...

[libfirm] / ir / be / be_t.h

diff --git a/ir/be/be_t.h b/ir/be/be_t.h
index 42f52dc..3369501 100644 (file)
--- a/ir/be/be_t.h
+++ b/ir/be/be_t.h
@@ -25,15 +25,12 @@
 #ifndef FIRM_BE_BE_T_H
 #define FIRM_BE_BE_T_H
 
-#include "firm_types.h"
-#include "obst.h"
-#include "debug.h"
-#include "bitset.h"
-#include "timing.h"
-#include "pmap.h"
-
 #include "be.h"
 #include "be_types.h"
+#include "bitset.h"
+#include "firm_types.h"
+#include "pmap.h"
+#include "timing.h"
 
 enum {
        DUMP_NONE     = 0,
@@ -70,12 +67,13 @@ struct be_options_t {
        char ilp_solver[128];      /**< the ilp solver name */
        int  statev;               /**< enable stat event dumping */
        char filtev[128];          /**< filter mask for stat events */
+       int  verbose_asm;          /**< dump verbose assembler */
 };
+extern be_options_t be_options;
 
 struct be_main_env_t {
        arch_env_t   *arch_env;
        FILE         *file_handle;
-       be_options_t *options;              /**< backend options */
        const char   *cup_name;             /**< name of the compilation unit */
        pmap         *ent_trampoline_map;   /**< A map containing PIC trampolines for methods. */
        ir_type      *pic_trampolines_type; /**< Class type containing all trampolines */
@@ -120,7 +118,6 @@ typedef enum {
        T_LIVE,
        T_EXECFREQ,
        T_SSA_CONSTR,
-       T_RA_PROLOG,
        T_RA_EPILOG,
        T_RA_CONSTR,
        T_RA_SPILL,
@@ -137,26 +134,18 @@ extern ir_timer_t *be_timers[T_LAST+1];
 
 static inline void be_timer_push(be_timer_id_t id)
 {
-       int res;
+       assert(id <= T_LAST);
        if (!be_timing)
                return;
-
-       assert(id <= T_LAST);
-       res = ir_timer_push(be_timers[id]);
-       (void) res;
-       assert(res && "Timer already on stack, cannot be pushed twice.");
+       ir_timer_push(be_timers[id]);
 }
 
 static inline void be_timer_pop(be_timer_id_t id)
 {
-       ir_timer_t *tmp;
+       assert(id <= T_LAST);
        if (!be_timing)
                return;
-
-       tmp = ir_timer_pop();
-       (void) tmp;
-       (void) id;
-       assert(tmp == be_timers[id] && "Attempt to pop wrong timer.");
+       ir_timer_pop(be_timers[id]);
 }
 
 #endif