From 7f905405bc326d31fe7c0b51f435f29cd063ae9f Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 11 Jul 2001 20:51:46 +0000 Subject: Makefile.in (c-lex.o): Wrap long lines. * Makefile.in (c-lex.o): Wrap long lines. Depend on debug.h. * c-lex.c (cb_file_change, cb_define, cb_undef): Use debug hooks directly. * dbxout.c (dbx_debug_hooks): Add new hooks. (dbxout_start_new_source_file): Rename dbxout_start_source_file, make static. (dbxout_resume_previous_source_file): Rename dbxout_end_source_file, make static. * dbxout.h (dbxout_start_new_source_file, dbxout_resume_previous_source_file): Delete. * debug.c (do_nothing_debug_hooks): Add new hooks. (debug_nothing_init_finish): Rename debug_nothing_file_charstar. (debug_nothing_int_charstar, debug_nothing_int): New. * debug.h (gcc_debug_hooks): New hooks define, undef, start_source_file and end_source_file. (debug_nothing_init_finish): Rename debug_nothing_file_charstar. (debug_nothing_int_charstar, debug_nothing_int): New. * dwarf2out.c (dwarf2_debug_hooks): Add new hooks. (dwarf2out_start_source_file, dwarf2out_end_source_file, dwarf2out_define, dwarf2out_undef): Make static. * dwarf2out.h (dwarf2out_start_source_file, dwarf2out_end_source_file, dwarf2out_define, dwarf2out_undef): Remove. * dwarfout.c (dwarf_debug_hooks): Add new hooks. (dwarfout_start_source_file, dwarfout_end_source_file, dwarfout_define, dwarfout_undef): Make static. (dwarfout_start_source_file_check, dwarfout_end_source_file_check): New. (dwarfout_define, dwarfout_finish): Update. * dwarfout.h (dwarfout_start_new_source_file, dwarfout_resume_previous_source_file, dwarfout_define, dwarfout_undef): Remove. * sdbout.c (sdb_debug_hooks): Add new hooks. (sdbout_start_new_source_file): Rename sdbout_start_source_file, make static. (sdbout_resume_previous_source_file): Rename sdbout_end_source_file, make static, take an arg. * sdbout.h (sdbout_start_new_source_file, sdbout_resume_previous_source_file): Delete. * toplev.c (debug_start_source_file, debug_end_source_file, debug_define, debug_undef): Delete. * toplev.h (debug_start_source_file, debug_end_source_file, debug_define, debug_undef): Delete. * java/jcf-parse.c: Include debug.h. (parse_class_file): Update to use debug hooks directly. * java/Make-lang.in (jcf-parse.o): Depend on debug.h. From-SVN: r43952 --- gcc/java/Make-lang.in | 3 ++- gcc/java/jcf-parse.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'gcc/java') diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index a7ec8cc..f1c00d7 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -259,7 +259,8 @@ java/expr.o: java/expr.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h real.h \ $(SYSTEM_H) $(GGC_H) java/jcf-depend.o: java/jcf-depend.c $(CONFIG_H) $(SYSTEM_H) java/jcf.h java/jcf-parse.o: java/jcf-parse.c $(CONFIG_H) $(JAVA_TREE_H) flags.h \ - input.h java/java-except.h $(SYSTEM_H) toplev.h java/parse.h $(GGC_H) + input.h java/java-except.h $(SYSTEM_H) toplev.h java/parse.h $(GGC_H) \ + debug.h java/jcf-write.o: java/jcf-write.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ $(RTL_H) java/java-opcodes.h java/parse.h java/buffer.h $(SYSTEM_H) \ toplev.h $(GGC_H) diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index d925205..c73d1dc 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -35,6 +35,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "toplev.h" #include "parse.h" #include "ggc.h" +#include "debug.h" #ifdef HAVE_LOCALE_H #include @@ -774,7 +775,7 @@ parse_class_file () input_filename = DECL_SOURCE_FILE (TYPE_NAME (current_class)); lineno = 0; - debug_start_source_file (lineno, input_filename); + (*debug_hooks->start_source_file) (lineno, input_filename); init_outgoing_cpool (); /* Currently we always have to emit calls to _Jv_InitClass when @@ -860,7 +861,7 @@ parse_class_file () finish_class (); - debug_end_source_file (save_lineno); + (*debug_hooks->end_source_file) (save_lineno); input_filename = save_input_filename; lineno = save_lineno; } -- cgit v1.1