From 3a9033bd742aa9ef8e3bb84052b23186021a9618 Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Wed, 21 Feb 2007 10:48:19 +0000 Subject: [PATCH] fix ra_timers --- ir/be/bechordal_main.c | 4 +++- ir/be/bemain.c | 26 +++++++++++++------------- ir/be/ia32/ia32_emitter.c | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c index eeb28d0d2..df3957ef8 100644 --- a/ir/be/bechordal_main.c +++ b/ir/be/bechordal_main.c @@ -10,7 +10,7 @@ * Driver for the chordal register allocator. */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include @@ -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; } } diff --git a/ir/be/bemain.c b/ir/be/bemain.c index 005223936..a411afeb0 100644 --- a/ir/be/bemain.c +++ b/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); diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c index 7acb26a78..377fe6b8b 100644 --- a/ir/be/ia32/ia32_emitter.c +++ b/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); -- 2.20.1