#undef DBXOUT_DECR_NESTING
#define DBXOUT_DECR_NESTING \
if (--debug_nesting == 0 && symbol_queue_index > 0) \
- debug_flush_symbol_queue ()
+ { emit_pending_bincls_if_required (); debug_flush_symbol_queue (); }
#undef DBXOUT_DECR_NESTING_AND_RETURN
#define DBXOUT_DECR_NESTING_AND_RETURN(x) \
static GTY(()) int next_type_number;
+enum binclstatus {BINCL_NOT_REQUIRED, BINCL_PENDING, BINCL_PROCESSED};
+
/* When using N_BINCL in dbx output, each type number is actually a
pair of the file number and the type number within the file.
This is a stack of input files. */
struct dbx_file *next;
int file_number;
int next_type_number;
+ enum binclstatus bincl_status; /* Keep track of lazy bincl. */
+ const char *pending_bincl_name; /* Name of bincl. */
+ struct dbx_file *prev; /* Chain to traverse all pending bincls. */
};
/* This is the top of the stack. */
#if defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO)
+#ifdef DBX_USE_BINCL
+/* If zero then there is no pending BINCL. */
+static int pending_bincls = 0;
+#endif
+
/* The original input file name. */
static const char *base_input_file;
#define CONTIN do { } while (0)
#endif
+#ifdef DBX_USE_BINCL
+static void emit_bincl_stab (const char *c);
+static void emit_pending_bincls (void);
+#endif
+static inline void emit_pending_bincls_if_required (void);
+
static void dbxout_init (const char *);
static void dbxout_finish (const char *);
static void dbxout_start_source_file (unsigned, const char *);
current_file->file_number = 0;
current_file->next_type_number = 1;
next_file_number = 1;
+ current_file->prev = NULL;
+ current_file->bincl_status = BINCL_NOT_REQUIRED;
+ current_file->pending_bincl_name = NULL;
#endif
/* Make sure that types `int' and `char' have numbers 1 and 2.
}
}
+#ifdef DBX_USE_BINCL
+/* Emit BINCL stab using given name. */
+static void
+emit_bincl_stab (const char *name)
+{
+ fprintf (asmfile, "%s", ASM_STABS_OP);
+ output_quoted_string (asmfile, name);
+ fprintf (asmfile, ",%d,0,0,0\n", N_BINCL);
+}
+
+/* If there are pending bincls then it is time to emit all of them. */
+
+static inline void
+emit_pending_bincls_if_required (void)
+{
+ if (pending_bincls)
+ emit_pending_bincls ();
+}
+
+/* Emit all pending bincls. */
+
+static void
+emit_pending_bincls (void)
+{
+ struct dbx_file *f = current_file;
+
+ /* Find first pending bincl. */
+ while (f->bincl_status == BINCL_PENDING)
+ f = f->next;
+
+ /* Now emit all bincls. */
+ f = f->prev;
+
+ while (f)
+ {
+ if (f->bincl_status == BINCL_PENDING)
+ {
+ emit_bincl_stab (f->pending_bincl_name);
+
+ /* Update file number and status. */
+ f->file_number = next_file_number++;
+ f->bincl_status = BINCL_PROCESSED;
+ }
+ if (f == current_file)
+ break;
+ f = f->prev;
+ }
+
+ /* All pending bincls have been emitted. */
+ pending_bincls = 0;
+}
+
+#else
+
+static inline void
+emit_pending_bincls_if_required (void) {}
+#endif
+
/* Change to reading from a new source file. Generate a N_BINCL stab. */
static void
struct dbx_file *n = (struct dbx_file *) ggc_alloc (sizeof *n);
n->next = current_file;
- n->file_number = next_file_number++;
n->next_type_number = 1;
+ /* Do not assign file number now.
+ Delay it until we actually emit BINCL. */
+ n->file_number = 0;
+ n->prev = NULL;
+ current_file->prev = n;
+ n->bincl_status = BINCL_PENDING;
+ n->pending_bincl_name = filename;
+ pending_bincls = 1;
current_file = n;
- fprintf (asmfile, "%s", ASM_STABS_OP);
- output_quoted_string (asmfile, filename);
- fprintf (asmfile, ",%d,0,0,0\n", N_BINCL);
#endif
}
dbxout_end_source_file (unsigned int line ATTRIBUTE_UNUSED)
{
#ifdef DBX_USE_BINCL
- fprintf (asmfile, "%s%d,0,0,0\n", ASM_STABN_OP, N_EINCL);
+ /* Emit EINCL stab only if BINCL is not pending. */
+ if (current_file->bincl_status == BINCL_PROCESSED)
+ fprintf (asmfile, "%s%d,0,0,0\n", ASM_STABN_OP, N_EINCL);
+ current_file->bincl_status = BINCL_NOT_REQUIRED;
current_file = current_file->next;
#endif
}
static void
dbxout_begin_block (unsigned int line ATTRIBUTE_UNUSED, unsigned int n)
{
+ emit_pending_bincls_if_required ();
(*targetm.asm_out.internal_label) (asmfile, "LBB", n);
}
static void
dbxout_end_block (unsigned int line ATTRIBUTE_UNUSED, unsigned int n)
{
+ emit_pending_bincls_if_required ();
(*targetm.asm_out.internal_label) (asmfile, "LBE", n);
}
static void
dbxout_function_decl (tree decl)
{
+ emit_pending_bincls_if_required ();
#ifndef DBX_FUNCTION_FIRST
dbxout_begin_function (decl);
#endif
static void
dbxout_continue (void)
{
+ emit_pending_bincls_if_required ();
#ifdef DBX_CONTIN_CHAR
fprintf (asmfile, "%c", DBX_CONTIN_CHAR);
#else
}
#ifdef DBX_USE_BINCL
+ emit_pending_bincls_if_required ();
typevec[TYPE_SYMTAB_ADDRESS (type)].file_number
= current_file->file_number;
typevec[TYPE_SYMTAB_ADDRESS (type)].type_number
* BITS_PER_UNIT);
putc (',', asmfile);
CHARS (1);
- print_wide_int (tree_low_cst (DECL_SIZE
- (TYPE_NAME
- (BINFO_TYPE (child))),
+ print_wide_int (tree_low_cst (TYPE_SIZE (BINFO_TYPE (child)),
0)
* BITS_PER_UNIT);
putc (';', asmfile);
{
tree name = TYPE_NAME (context);
+ emit_pending_bincls_if_required ();
+
if (TREE_CODE (name) == TYPE_DECL)
{
dbxout_class_name_qualifiers (name);
|| DECL_IGNORED_P (decl))
DBXOUT_DECR_NESTING_AND_RETURN (0);
- /* If we are to generate only the symbols actualy used then such
+ /* If we are to generate only the symbols actually used then such
symbol nodees are flagged with TREE_USED. Ignore any that
aren't flaged as TREE_USED. */
debug_queue_symbol (TYPE_NAME (t));
}
+ emit_pending_bincls_if_required ();
+
dbxout_prepare_symbol (decl);
/* The output will always start with the symbol name,
int letter = 0;
int regno = -1;
+ emit_pending_bincls_if_required ();
+
/* Don't mention a variable at all
if it was completely optimized into nothingness.
{
++debug_nesting;
+ emit_pending_bincls_if_required ();
+
for (; parms; parms = TREE_CHAIN (parms))
if (DECL_NAME (parms) && TREE_TYPE (parms) != error_mark_node)
{