#ifndef DWARF2_LINE_MIN_INSN_LENGTH
/* Define the architecture-dependent minimum instruction length (in
bytes). This value should be rather too small than too big. */
-# define DWARF2_LINE_MIN_INSN_LENGTH 4
+# define DWARF2_LINE_MIN_INSN_LENGTH 1
#endif
/* Flag that indicates the initial value of the is_stmt_start flag.
0, /* basic_block */ \
1 /* empty_sequence */
-static struct
- {
+static struct {
/* state machine state as per DWARF2 manual: */
- struct dwarf2_sm
- {
+ struct dwarf2_sm {
addressT addr;
unsigned int filenum;
unsigned int line;
is_stmt : 1,
basic_block : 1,
empty_sequence : 1; /* current code sequence has no DWARF2 directives? */
- }
- sm;
+ } sm;
unsigned int
any_dwarf2_directives : 1; /* did we emit any DWARF2 line debug directives? */
int last_filename; /* index of last filename that was used */
int num_filenames; /* index of last filename in use */
int filename_len; /* length of the filename array */
- struct
- {
+ struct {
int dir; /* valid after gen_dir_list() only */
char *name; /* full path before gen_dir_list(), filename afterwards */
- }
- *file;
+ } *file;
- struct dwarf2_line_info current; /* current source info: */
+ struct dwarf2_line_info current; /* current source info */
- /* counters for statistical purposes: */
+ /* counters for statistical purposes */
unsigned int num_line_entries;
unsigned int opcode_hist[256]; /* histogram of opcode frequencies */
- }
-ls =
- {
+} ls = {
{
INITIAL_STATE
},
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}
- };
-
+};
-/* Function prototypes: */
+/* Function prototypes. */
static void out_uleb128 PARAMS ((addressT));
static void out_sleb128 PARAMS ((offsetT));
static void gen_addr_line PARAMS ((int, addressT));
static void gen_dir_list PARAMS ((void));
static void gen_file_list PARAMS ((void));
static void print_stats PARAMS ((unsigned long));
-
+static addressT now_subseg_size PARAMS ((void));
#define out_byte(byte) FRAG_APPEND_1_CHAR(byte)
#define out_opcode(opc) (out_byte ((opc)), ++ls.opcode_hist[(opc) & 0xff])
/* Output an unsigned "little-endian base 128" number. */
+
static void
out_uleb128 (value)
addressT value;
}
/* Output a signed "little-endian base 128" number. */
+
static void
out_sleb128 (value)
offsetT value;
/* Encode a pair of line and address skips as efficiently as possible.
Note that the line skip is signed, whereas the address skip is
unsigned. */
+
static void
gen_addr_line (line_delta, addr_delta)
int line_delta;
tmp += DWARF2_LINE_OPCODE_BASE;
- /* try using a special opcode: */
- opcode = tmp + addr_delta*DWARF2_LINE_RANGE;
+ /* Try using a special opcode. */
+ opcode = tmp + addr_delta * DWARF2_LINE_RANGE;
if (opcode <= 255)
{
out_opcode (opcode);
return;
}
- /* try using DW_LNS_const_add_pc followed by special op: */
- opcode = tmp + (addr_delta - MAX_SPECIAL_ADDR_DELTA)*DWARF2_LINE_RANGE;
+ /* Try using DW_LNS_const_add_pc followed by special op. */
+ opcode = tmp + (addr_delta - MAX_SPECIAL_ADDR_DELTA) * DWARF2_LINE_RANGE;
if (opcode <= 255)
{
out_opcode (DW_LNS_const_add_pc);
out_uleb128 (addr_delta);
if (line_delta)
- out_opcode (tmp); /* output line-delta */
+ /* Output line-delta. */
+ out_opcode (tmp);
else
- out_opcode (DW_LNS_copy); /* append new row with current info */
+ /* Append new row with current info. */
+ out_opcode (DW_LNS_copy);
}
static void
ls.sm = initial_state;
}
-/* Set an absolute address (may results in a relocation entry): */
+/* Set an absolute address (may results in a relocation entry). */
+
static void
out_set_addr (addr)
addressT addr;
/* Emit DW_LNS_end_sequence and reset state machine. Does not
preserve the current segment/sub-segment! */
+
static void
out_end_sequence ()
{
{
/* Advance address without updating the line-debug
matrix---the end_sequence entry is used only to tell
- the debugger the end of the sequence.*/
+ the debugger the end of the sequence. */
out_opcode (DW_LNS_advance_pc);
out_uleb128 (delta);
}
a filenumber and a filename are specified, lookup by filename takes
precedence. If the filename cannot be found, it is added to the
filetable and the filenumber for the new entry is returned. */
+
static int
get_filenum (filenum, file)
int filenum;
&& strcmp (ls.file[last].name + 1, file + 1) == 0)
return last + 1;
- /* no match, fall back to simple linear scan: */
+ /* No match, fall back to simple linear scan. */
for (i = 0; i < ls.num_filenames; ++i)
{
if (ls.file[i].name[0] == char0
}
}
- /* no match: enter new filename */
+ /* No match, enter new filename. */
if (ls.num_filenames >= ls.filename_len)
{
ls.filename_len += 13;
else if (l->filename)
filenum = get_filenum (filenum, l->filename);
else
- return; /* no filename, no filnum => no play */
+ /* No filename, no filnum => no play. */
+ return;
+
+ /* Early out for as-yet incomplete location information. */
+ if (l->line == 0)
+ return;
/* Must save these before the subseg_new call, as that call will change
them. */
/* We're going to need this symbol. */
secsym = symbol_find (".debug_line");
if (secsym != NULL)
- symbol_set_bfdsym (secsym, ls.line_seg->symbol);
+ symbol_set_bfdsym (secsym, ls.line_seg->symbol);
else
- symbol_table_insert (section_symbol (ls.line_seg));
+ symbol_table_insert (section_symbol (ls.line_seg));
#endif
}
{
if (!ls.sm.empty_sequence)
{
- out_end_sequence (); /* terminate previous sequence */
+ /* Terminate previous sequence. */
+ out_end_sequence ();
ls.sm.empty_sequence = 1;
}
any_output = 1;
}
if (j >= num_dirs)
{
- /* didn't find this directory: append it to the list */
+ /* Didn't find this directory: append it to the list. */
size_t size = strlen (str) + 1;
cp = frag_more (size);
memcpy (cp, str, size);
ls.file[i].name = slash + 1;
}
}
- out_byte ('\0'); /* terminate directory list */
+
+ /* Terminate directory list. */
+ out_byte ('\0');
}
static void
out_uleb128 (0); /* last modification timestamp */
out_uleb128 (0); /* filesize */
}
- out_byte (0); /* terminate filename list */
+
+ /* Terminate filename list. */
+ out_byte (0);
}
static void
print_stats (total_size)
unsigned long total_size;
{
- static const char *opc_name[] =
- {
- "extended", "copy", "advance_pc", "advance_line", "set_file",
- "set_column", "negate_stmt", "set_basic_block", "const_add_pc",
- "fixed_advance_pc"
- };
+ static const char *opc_name[] = {
+ "extended", "copy", "advance_pc", "advance_line", "set_file",
+ "set_column", "negate_stmt", "set_basic_block", "const_add_pc",
+ "fixed_advance_pc"
+ };
size_t i;
int j;
fprintf (stderr, "\nStandard opcode histogram:\n");
- for (i = 0; i < sizeof (opc_name)/sizeof (opc_name[0]); ++i)
+ for (i = 0; i < sizeof (opc_name) / sizeof (opc_name[0]); ++i)
{
fprintf (stderr, "%s", opc_name[i]);
for (j = strlen (opc_name[i]); j < 16; ++j)
j = SPECIAL_LINE (i);
if (j == DWARF2_LINE_BASE)
fprintf (stderr, "\n%4u: ",
- ((unsigned int)
- DWARF2_LINE_MIN_INSN_LENGTH * SPECIAL_ADDR (i)));
+ (unsigned int) (DWARF2_LINE_MIN_INSN_LENGTH
+ * SPECIAL_ADDR (i)));
fprintf (stderr, " %2u", ls.opcode_hist[i]);
}
fprintf (stderr, "\n");
}
+/* Compute the size of the current subsegment, taking all fragments
+ into account. Note that we don't generate variant frags, so the
+ fixed portion is all we need to consider. */
+
+static addressT
+now_subseg_size ()
+{
+ struct frag *f;
+ addressT size = 0;
+
+ for (f = frchain_now->frch_root; f ; f = f->fr_next)
+ size += f->fr_fix;
+
+ return size + frag_now_fix_octets ();
+}
+
void
dwarf2_finish ()
{
char *cp;
if (!ls.line_seg)
- /* no .debug_line segment, no work to do... */
+ /* No .debug_line segment, no work to do. */
return;
saved_seg = now_seg;
if (!ls.sm.empty_sequence)
out_end_sequence ();
- total_size = body_size = frag_now_fix ();
+ subseg_set (ls.line_seg, DL_BODY);
+ total_size = body_size = now_subseg_size ();
- /* now generate the directory and file lists: */
+ /* Now generate the directory and file lists. */
subseg_set (ls.line_seg, DL_FILES);
gen_dir_list ();
gen_file_list ();
- total_size += frag_now_fix ();
+ total_size += now_subseg_size ();
- /* and now the header ("statement program prolog", in DWARF2 lingo...) */
+ /* And now the header ("statement program prolog", in DWARF2 lingo...). */
subseg_set (ls.line_seg, DL_PROLOG);
cp = frag_more (15 + DWARF2_LINE_OPCODE_BASE - 1);
- total_size += frag_now_fix ();
+ total_size += now_subseg_size ();
prolog_size = total_size - body_size - 10;
-# define STUFF(val,size) md_number_to_chars (cp, val, size); cp += size;
+#define STUFF(val,size) \
+ do { \
+ md_number_to_chars (cp, val, size); \
+ cp += size; \
+ } while (0)
+
STUFF (total_size - 4, 4); /* length */
STUFF (2, 2); /* version */
STUFF (prolog_size, 4); /* prologue_length */
STUFF (0, 1); /* DW_LNS_const_add_pc */
STUFF (1, 1); /* DW_LNS_fixed_advance_pc */
+#undef STUFF
+
+ /* If this is assembler generated line info, add a .debug_info
+ section as well. */
+ if (debug_type == DEBUG_DWARF2)
+ {
+ segT info_seg = subseg_new (".debug_info", 0);
+ segT abbrev_seg = subseg_new (".debug_abbrev", 0);
+ char *len;
+
+#ifdef BFD_ASSEMBLER
+ bfd_set_section_flags (stdoutput, info_seg, SEC_READONLY);
+ bfd_set_section_flags (stdoutput, abbrev_seg, SEC_READONLY);
+#endif
+
+ subseg_set (info_seg, 0);
+ len = frag_more (4);
+
+#define STUFF(val, size) \
+ do { \
+ cp = frag_more (size); \
+ md_number_to_chars (cp, (val), (size)); \
+ } while(0)
+
+ STUFF (2, 2); /* Dwarf version */
+ STUFF (0, 4); /* Offset into (final!) .debug_abbrev. */
+
+ /* Pointer size. */
+#ifdef BFD_ASSEMBLER
+ STUFF (bfd_arch_bits_per_address (stdoutput) / 8, 1);
+#else
+ STUFF (4, 1);
+#endif
+
+ /* FIXME: Add a DW_TAG_compile_unit DIE. The line info cannot
+ even be seen without it. */
+
+ /* Set size of debug_info. */
+ md_number_to_chars (len, now_subseg_size () - 4, 4);
+ }
+
subseg_set (saved_seg, saved_subseg);
if (flag_debug)
ls.any_dwarf2_directives = 1;
- if (debug_type == DEBUG_NONE)
- /* Automatically turn on DWARF2 debug info unless something else
- has been selected. */
- debug_type = DEBUG_DWARF2;
-
ls.current.filenum = get_absolute_expression ();
ls.current.filename = demand_copy_C_string (&len);
dwarf2_where (line)
struct dwarf2_line_info *line;
{
- if (ls.any_dwarf2_directives)
- *line = ls.current;
- else
+ if (debug_type == DEBUG_DWARF2)
{
as_where (&line->filename, &line->line);
line->filenum = 0;
line->column = 0;
line->flags = DWARF2_FLAG_BEGIN_STMT;
}
+ else
+ *line = ls.current;
+}
+
+/* Called for each machine instruction, or relatively atomic group of
+ machine instructions (ie built-in macro). The instruction or group
+ is SIZE bytes in length. If dwarf2 line number generation is called
+ for, emit a line statement appropriately. */
+
+void
+dwarf2_emit_insn (size)
+ int size;
+{
+ addressT addr;
+ struct dwarf2_line_info debug_line;
+
+ if (debug_type != DEBUG_DWARF2 && ! ls.any_dwarf2_directives)
+ return;
+
+ /* Reset any_dwarf2_directives so that we won't waste time
+ determining that no information has changed between insns. */
+ ls.any_dwarf2_directives = 0;
+
+ /* First update the notion of the current source line. */
+ dwarf2_where (&debug_line);
+
+ /* We want the offset of the start of this
+ instruction within the the current frag. */
+ addr = frag_now_fix () - size;
+
+ /* And record the information. */
+ dwarf2_gen_line_info (addr, &debug_line);
}