set dbg_retrieve in ast2firm where it is defined

[r26906]

diff --git a/ast2firm.c b/ast2firm.c
index d8a71db..bf4e5d4 100644 (file)
--- a/ast2firm.c
+++ b/ast2firm.c
@@ -141,7 +141,7 @@ ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos)
        return new_r_Unknown(irg, mode);
 }
 
-const char *dbg_retrieve(const dbg_info *dbg, unsigned *line)
+static const char *dbg_retrieve(const dbg_info *dbg, unsigned *line)
 {
        const source_position_t *pos = (const source_position_t*) dbg;
        if (pos == NULL)
@@ -5899,6 +5899,8 @@ void init_ast2firm(void)
        obstack_init(&asm_obst);
        init_atomic_modes();
 
+       ir_set_dbg_retrieve(dbg_retrieve);
+
        /* OS option must be set to the backend */
        switch (firm_opt.os_support) {
        case OS_SUPPORT_MINGW:

diff --git a/driver/firm_codegen.c b/driver/firm_codegen.c
index a06affb..300a56c 100644 (file)
--- a/driver/firm_codegen.c
+++ b/driver/firm_codegen.c
@@ -72,7 +72,6 @@ void do_codegen(FILE *out, const char *file_name) {
        ir_timer_t *timer = ir_timer_new();
        timer_register(timer, "Firm: C-generating backend");
        timer_start(timer);
-    cbackend_set_debug_retrieve(dbg_retrieve);
     generate_code_file(out);
     timer_stop(timer);
     break;
@@ -83,7 +82,6 @@ void do_codegen(FILE *out, const char *file_name) {
     ir_timer_t *timer = ir_timer_new();
     timer_register(timer, "Firm: backend");
     timer_start(timer);
-    ir_set_debug_retrieve(dbg_retrieve);
     be_main(out, file_name);
     timer_stop(timer);
     break;

diff --git a/driver/firm_opt.c b/driver/firm_opt.c
index 5dcf29e..3f4d694 100644 (file)
--- a/driver/firm_opt.c
+++ b/driver/firm_opt.c
@@ -897,7 +897,6 @@ void gen_firm_init(void)
        }
 
        edges_init_dbg(firm_opt.vrfy_edges);
-       ir_set_debug_retrieve(dbg_retrieve);
 
        /* Sel node cannot produce NULL pointers */
        set_opt_sel_based_null_check_elim(1);

diff --git a/driver/firm_opt.h b/driver/firm_opt.h
index 673a76e..28dca28 100644 (file)
--- a/driver/firm_opt.h
+++ b/driver/firm_opt.h
@@ -101,9 +101,6 @@ extern ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos);
 /** Debug printf implementation. */
 extern void dbg_printf(const char *fmt, ...);
 
-/** Convert the debug info back. */
-extern const char *dbg_retrieve(const dbg_info *dbg, unsigned *line);
-
 /** Do the necessary lowering for compound parameters. */
 extern void lower_compound_params(void);