fix ra_timers

ir/be/bechordal_main.c

@@ -10,7 +10,7 @@
  * Driver for the chordal register allocator.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <time.h>
@@ -346,6 +346,8 @@ static void be_init_timer(be_options_t *main_opts)
 		LC_STOP_AND_RESET_TIMER(ra_timer.t_ssa);
 		LC_STOP_AND_RESET_TIMER(ra_timer.t_verify);
 		LC_STOP_AND_RESET_TIMER(ra_timer.t_other);
+
+		global_ra_timer = &ra_timer;
 	}
 }
 

ir/be/bemain.c

@@ -375,8 +375,6 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 	unsigned num_birgs;
 	ir_graph **irg_list, **backend_irg_list;
 
-	be_ra_timer_t *ra_timer;
-
 #ifdef WITH_LIBCORE
 	lc_timer_t *t_abi      = NULL;
 	lc_timer_t *t_codegen  = NULL;
@@ -720,17 +718,19 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 			LC_EMIT(t_sched);
 			LC_EMIT(t_constr);
 			LC_EMIT(t_regalloc);
-			LC_EMIT_RA(ra_timer->t_prolog);
-			LC_EMIT_RA(ra_timer->t_live);
-			LC_EMIT_RA(ra_timer->t_spill);
-			LC_EMIT_RA(ra_timer->t_spillslots);
-			LC_EMIT_RA(ra_timer->t_color);
-			LC_EMIT_RA(ra_timer->t_ifg);
-			LC_EMIT_RA(ra_timer->t_copymin);
-			LC_EMIT_RA(ra_timer->t_ssa);
-			LC_EMIT_RA(ra_timer->t_epilog);
-			LC_EMIT_RA(ra_timer->t_verify);
-			LC_EMIT_RA(ra_timer->t_other);
+			if(global_ra_timer != NULL) {
+				LC_EMIT_RA(global_ra_timer->t_prolog);
+				LC_EMIT_RA(global_ra_timer->t_live);
+				LC_EMIT_RA(global_ra_timer->t_spill);
+				LC_EMIT_RA(global_ra_timer->t_spillslots);
+				LC_EMIT_RA(global_ra_timer->t_color);
+				LC_EMIT_RA(global_ra_timer->t_ifg);
+				LC_EMIT_RA(global_ra_timer->t_copymin);
+				LC_EMIT_RA(global_ra_timer->t_ssa);
+				LC_EMIT_RA(global_ra_timer->t_epilog);
+				LC_EMIT_RA(global_ra_timer->t_verify);
+				LC_EMIT_RA(global_ra_timer->t_other);
+			}
 			LC_EMIT(t_finish);
 			LC_EMIT(t_emit);
 			LC_EMIT(t_verify);

ir/be/ia32/ia32_emitter.c

@@ -2038,7 +2038,7 @@ static void ia32_gen_block(ia32_emit_env_t *env, ir_node *block, ir_node *last_b
 		ia32_emit_cstring(env, BLOCK_PREFIX);
 		ia32_emit_irprintf(env, "%d:", get_irn_node_nr(block));
 		ia32_pad_comment(env);
-		ia32_emit_cstring(env, "\t/* preds:");
+		ia32_emit_cstring(env, "   /* preds:");
 
 		/* emit list of pred blocks in comment */
 		arity = get_irn_arity(block);