* dbxout.c (dbxout_source_line): Make static, update prototype.

	(dbx_debug_hooks, xcoff_debug_hooks): Add new hooks.
	(dbxout_init, dbxout_finish, dbxout_source_line,
	dbxout_begin_block, dbxout_end_block): Update for new prototypes.
	* dbxout.h (dbxout_source_line): Delete.
	* debug.c (debug_nothing_file, debug_nothing_file_int,
	debug_nothing_file_charstar_rtx): New.
	(do_nothing_debug_hooks): Update.
	(debug_nothing_void, debug_nothing_charstar_rtx,
	dwarf2out_end_epilogue): New.
	(debug_nothing_file_charstar, debug_nothing_file_int_int): Rename.
	* debug.h (struct rtx_def): Declare.
	(gcc_debug_hooks): New hooks source_line, end_epilogue
	and end_function.
	(debug_nothing_void, debug_nothing_charstar_rtx,
	dwarf2out_end_epilogue): New.
	(debug_nothing_file_charstar, debug_nothing_file_int_int): Rename.
	* dwarf2out.c (dwarf2out_source_line): Make static, update prototype.
	(dwarf2_debug_hooks): Update.
	(dwarf2out_init, dwarf2out_finish, dwarf2out_source_line,
	dwarf2out_begin_block, dwarf2out_end_block): Update for new prototypes.
	* dwarf2out.h (dwarf2out_source_line): Remove.
	* dwarfout.c (dwarfout_end_epilogue, dwarfout_end_function):
	Make static, update prototype.
	(dwarfout_init, dwarfout_finish, dwarfout_source_line,
	dwarfout_begin_block, dwarfout_end_block): Update for new prototypes.
	(dwarf_debug_hooks): Update.
	* dwarfout.h (dwarfout_end_epilogue, dwarfout_source_line,
	dwarfout_end_function): Remove.
	* final.c (profile_function): Use debug hooks for ending functions
	and epilogues.
	(output_source_line, final_end_function): Update prototype,
	use debug hooks.
	(final_start_function, final_scan_insn): Update.
	* output.h (sdb_begin_function_line): Remove.
	(final_end_function): Update prototype.
	* sdbout.c (sdb_begin_function_line): Make static.
	(PUT_SDB_EPILOGUE_END): Move to sdbout_end_epilogue.
	(sdbout_source_line): New.
	(sdbout_end_epilogue, sdbout_end_function): Make static, update
	prototypes.
	(sdb_debug_hooks): Update.
	(sdbout_init, sdbout_source_line,
	sdbout_begin_block, sdbout_end_block): Update for new prototypes.
	* sdbout.h (sdbout_end_epilogue, sdbout_end_function): Remove.
	* toplev.c (compile_file, rest_of_compilation): Update.
	* tree.h (dwarf2out_end_epilogue): Move to debug.h.
	* xcoffout.c (xcoffout_source_line, xcoffout_begin_block,
	xcoffout_end_block, xcoffout_end_epilogue, xcoffout_end_function):
	Update for prototype changes.
	* xcoffout.h (xcoffout_source_line, xcoffout_begin_block,
	xcoffout_end_block, xcoffout_end_epilogue): Update prototypes.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44017 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 33 insertions, 12 deletions

diff --git a/gcc/debug.h b/gcc/debug.h
index 755ac0ae9ee..c2e31a84c9e 100644
--- a/gcc/debug.h
+++ b/gcc/debug.h
@@ -18,17 +18,19 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifndef GCC_DEBUG_H
 #define GCC_DEBUG_H
 
+struct rtx_def;
+
 /* This structure contains hooks for the debug information output
    functions, accessed through the global instance debug_hooks set in
    toplev.c according to command line options.  */
 struct gcc_debug_hooks
 {
-  /* Initialise debug output to FILE.  MAIN_FILENAME is the name of
-     the main input file.  */
-  void (* init) PARAMS ((FILE * file, const char *main_filename));
+  /* Initialise debug output.  MAIN_FILENAME is the name of the main
+     input file.  */
+  void (* init) PARAMS ((const char *main_filename));
 
-  /* Output debug symbols to FILE.  */
-  void (* finish) PARAMS ((FILE * file, const char *main_filename));
+  /* Output debug symbols.  */
+  void (* finish) PARAMS ((const char *main_filename));
 
   /* Macro defined on line LINE with name and expansion TEXT.  */
   void (* define) PARAMS ((unsigned int line, const char *text));
@@ -45,24 +47,38 @@ struct gcc_debug_hooks
   void (* end_source_file) PARAMS ((unsigned int line));
 
   /* Record the beginning of block N, counting from 1 and not
-     including the function-scope block, at LINE.  Output to FILE.  */
-  void (* begin_block) PARAMS ((FILE *, unsigned int line, unsigned int n));
+     including the function-scope block, at LINE.  */
+  void (* begin_block) PARAMS ((unsigned int line, unsigned int n));
 
   /* Record the end of a block.  Arguments as for begin_block.  */
-  void (* end_block) PARAMS ((FILE *, unsigned int line, unsigned int n));
+  void (* end_block) PARAMS ((unsigned int line, unsigned int n));
+
+  /* Record a line based on NOTE.  Obtain the line number with
+     NOTE_LINE_NUMBER (note).  */
+  void (* source_line) PARAMS ((const char *filename, struct rtx_def *note));
+
+  /* Record end of epilogue code.  */
+  void (* end_epilogue) PARAMS ((void));
+
+  /* Record end of function.  LINE is highest line number in function.  */
+  void (* end_function) PARAMS ((unsigned int line));
 };
 
 extern struct gcc_debug_hooks *debug_hooks;
 
 /* The do-nothing hooks.  */
-extern void debug_nothing_file_charstar
-  PARAMS ((FILE *, const char *));
+extern void debug_nothing_void
+  PARAMS ((void));
+extern void debug_nothing_charstar
+  PARAMS ((const char *));
 extern void debug_nothing_int_charstar
   PARAMS ((unsigned int, const char *));
 extern void debug_nothing_int
   PARAMS ((unsigned int));
-extern void debug_nothing_file_int_int
-  PARAMS ((FILE *, unsigned int, unsigned int));
+extern void debug_nothing_int_int
+  PARAMS ((unsigned int, unsigned int));
+extern void debug_nothing_charstar_rtx
+  PARAMS ((const char *, struct rtx_def *));
 
 /* Hooks for various debug formats.  */
 extern struct gcc_debug_hooks do_nothing_debug_hooks;
@@ -72,4 +88,9 @@ extern struct gcc_debug_hooks xcoff_debug_hooks;
 extern struct gcc_debug_hooks dwarf_debug_hooks;
 extern struct gcc_debug_hooks dwarf2_debug_hooks;
 
+/* Dwarf2 frame information.  */
+
+extern void dwarf2out_end_epilogue
+  PARAMS ((void));
+
 #endif /* !GCC_DEBUG_H  */