#include "dwarf2.h"
#include "dwarf.h"
#include "gdb/gdb-index.h"
+#include <assert.h>
+
+#undef MAX
+#undef MIN
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
static const char *regname (unsigned int regno, int row);
static int have_frame_base;
static int need_base_address;
-static unsigned int last_pointer_size = 0;
-static int warned_about_missing_comp_units = FALSE;
-
static unsigned int num_debug_info_entries = 0;
static unsigned int alloc_num_debug_info_entries = 0;
static debug_info *debug_information = NULL;
int dwarf_check = 0;
+/* Convenient constant, to avoid having to cast -1 to dwarf_vma when
+ testing whether e.g. a locview list is present. */
+static const dwarf_vma vm1 = -1;
+
/* Collection of CU/TU section sets from .debug_cu_index and .debug_tu_index
sections. For version 1 package files, each set is stored in SHNDX_POOL
as a zero-terminated list of section indexes comprising one set of debug
{
char fmt[32];
- sprintf (fmt, "%%%s%s", DWARF_VMA_FMT, fmtch);
+ if (fmtch)
+ sprintf (fmt, "%%%s%s", DWARF_VMA_FMT, fmtch);
+ else
+ sprintf (fmt, "%%%s", DWARF_VMA_FMT);
snprintf (ret, sizeof (buf[0].place), fmt, value);
return ret;
}
printf ("%s ", dwarf_vmatoa_1 (NULL, value, num_bytes));
}
+/* Print a view number in hexadecimal value, with the same width
+ print_dwarf_vma would have printed it with the same num_bytes.
+ Print blanks for zero view, unless force is nonzero. */
+
+static void
+print_dwarf_view (dwarf_vma value, unsigned num_bytes, int force)
+{
+ int len;
+ if (!num_bytes)
+ len = 4;
+ else
+ len = num_bytes * 2;
+
+ assert (value == (unsigned long) value);
+ if (value || force)
+ printf ("v%0*lx ", len - 1, (unsigned long) value);
+ else
+ printf ("%*s", len + 1, "");
+}
+
/* Format a 64-bit value, given as two 32-bit values, in hex.
For reentrancy, this uses a buffer provided by the caller. */
return read_leb128 (data, length_return, FALSE, end);
}
+#define SKIP_ULEB() read_uleb128 (start, & length_return, end); start += length_return
+#define SKIP_SLEB() read_sleb128 (start, & length_return, end); start += length_return
+
+#define READ_ULEB(var) \
+ do \
+ { \
+ dwarf_vma _val; \
+ \
+ (var) = _val = read_uleb128 (start, &length_return, end); \
+ if ((var) != _val) \
+ error (_("Internal error: %s:%d: LEB value (%s) " \
+ "too large for containing variable\n"), \
+ __FILE__, __LINE__, dwarf_vmatoa ("u", _val)); \
+ start += length_return; \
+ } \
+ while (0)
+
+#define READ_SLEB(var) \
+ do \
+ { \
+ dwarf_signed_vma _val; \
+ \
+ (var) = _val = read_sleb128 (start, &length_return, end); \
+ if ((var) != _val) \
+ error (_("Internal error: %s:%d: LEB value (%s) " \
+ "too large for containing variable\n"), \
+ __FILE__, __LINE__, dwarf_vmatoa ("d", _val)); \
+ start += length_return; \
+ } \
+ while (0)
+
#define SAFE_BYTE_GET(VAL, PTR, AMOUNT, END) \
do \
{ \
typedef struct State_Machine_Registers
{
dwarf_vma address;
+ unsigned int view;
unsigned int file;
unsigned int line;
unsigned int column;
int basic_block;
unsigned char op_index;
unsigned char end_sequence;
-/* This variable hold the number of the last entry seen
- in the File Table. */
+ /* This variable hold the number of the last entry seen
+ in the File Table. */
unsigned int last_file_entry;
} SMR;
reset_state_machine (int is_stmt)
{
state_machine_regs.address = 0;
+ state_machine_regs.view = 0;
state_machine_regs.op_index = 0;
state_machine_regs.file = 1;
state_machine_regs.line = 1;
SAFE_BYTE_GET (adr, data, len - bytes_read - 1, end);
printf (_("set Address to 0x%s\n"), dwarf_vmatoa ("x", adr));
state_machine_regs.address = adr;
+ state_machine_regs.view = 0;
state_machine_regs.op_index = 0;
break;
printf (_(" Entry\tDir\tTime\tSize\tName\n"));
printf (" %d\t", ++state_machine_regs.last_file_entry);
- name = data;
- data += strnlen ((char *) data, end - data) + 1;
- printf ("%s\t", dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
- data += bytes_read;
- printf ("%s\t", dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
- data += bytes_read;
- printf ("%s\t", dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
- data += bytes_read;
- printf ("%s\n\n", name);
+ {
+ size_t l;
+
+ name = data;
+ l = strnlen ((char *) data, end - data);
+ data += len + 1;
+ printf ("%s\t", dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
+ data += bytes_read;
+ printf ("%s\t", dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
+ data += bytes_read;
+ printf ("%s\t", dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
+ data += bytes_read;
+ printf ("%.*s\n\n", (int) l, name);
+ }
if (((unsigned int) (data - orig_data) != len) || data == end)
warn (_("DW_LNE_define_file: Bad opcode length\n"));
fetch_indirect_string (dwarf_vma offset)
{
struct dwarf_section *section = &debug_displays [str].section;
+ const unsigned char * ret;
if (section->start == NULL)
return (const unsigned char *) _("<no .debug_str section>");
- if (offset > section->size)
+ if (offset >= section->size)
{
warn (_("DW_FORM_strp offset too big: %s\n"),
dwarf_vmatoa ("x", offset));
return (const unsigned char *) _("<offset is too big>");
}
- return (const unsigned char *) section->start + offset;
+ ret = section->start + offset;
+ /* Unfortunately we cannot rely upon the .debug_str section ending with a
+ NUL byte. Since our caller is expecting to receive a well formed C
+ string we test for the lack of a terminating byte here. */
+ if (strnlen ((const char *) ret, section->size - offset)
+ == section->size - offset)
+ ret = (const unsigned char *)
+ _("<no NUL byte at end of .debug_str section>");
+
+ return ret;
}
static const unsigned char *
fetch_indirect_line_string (dwarf_vma offset)
{
struct dwarf_section *section = &debug_displays [line_str].section;
+ const unsigned char * ret;
if (section->start == NULL)
return (const unsigned char *) _("<no .debug_line_str section>");
- if (offset > section->size)
+ if (offset >= section->size)
{
warn (_("DW_FORM_line_strp offset too big: %s\n"),
dwarf_vmatoa ("x", offset));
return (const unsigned char *) _("<offset is too big>");
}
- return (const unsigned char *) section->start + offset;
+ ret = section->start + offset;
+ /* Unfortunately we cannot rely upon the .debug_line_str section ending
+ with a NUL byte. Since our caller is expecting to receive a well formed
+ C string we test for the lack of a terminating byte here. */
+ if (strnlen ((const char *) ret, section->size - offset)
+ == section->size - offset)
+ ret = (const unsigned char *)
+ _("<no NUL byte at end of .debug_line_str section>");
+
+ return ret;
}
static const char *
struct dwarf_section *str_section = &debug_displays [str_sec_idx].section;
dwarf_vma index_offset = idx * offset_size;
dwarf_vma str_offset;
+ const char * ret;
if (index_section->start == NULL)
return (dwo ? _("<no .debug_str_offsets.dwo section>")
if (this_set != NULL)
index_offset += this_set->section_offsets [DW_SECT_STR_OFFSETS];
- if (index_offset > index_section->size)
+ if (index_offset >= index_section->size)
{
warn (_("DW_FORM_GNU_str_index offset too big: %s\n"),
dwarf_vmatoa ("x", index_offset));
str_offset = byte_get (index_section->start + index_offset, offset_size);
str_offset -= str_section->address;
- if (str_offset > str_section->size)
+ if (str_offset >= str_section->size)
{
warn (_("DW_FORM_GNU_str_index indirect offset too big: %s\n"),
dwarf_vmatoa ("x", str_offset));
return _("<indirect index offset is too big>");
}
- return (const char *) str_section->start + str_offset;
+ ret = (const char *) str_section->start + str_offset;
+ /* Unfortunately we cannot rely upon str_section ending with a NUL byte.
+ Since our caller is expecting to receive a well formed C string we test
+ for the lack of a terminating byte here. */
+ if (strnlen (ret, str_section->size - str_offset)
+ == str_section->size - str_offset)
+ ret = (const char *) _("<no NUL byte at end of section>");
+
+ return ret;
}
static const char *
return name;
}
+static const char *
+get_IDX_name (unsigned long idx)
+{
+ const char *name = get_DW_IDX_name ((unsigned int) idx);
+
+ if (name == NULL)
+ {
+ static char buffer[100];
+
+ snprintf (buffer, sizeof (buffer), _("Unknown IDX value: %lx"), idx);
+ return buffer;
+ }
+
+ return name;
+}
+
static unsigned char *
display_block (unsigned char *data,
dwarf_vma length,
have_frame_base = 1;
/* Fall through. */
case DW_AT_location:
+ case DW_AT_GNU_locviews:
case DW_AT_string_length:
case DW_AT_return_addr:
case DW_AT_data_member_location:
debug_info_p->loc_offsets = (dwarf_vma *)
xcrealloc (debug_info_p->loc_offsets,
lmax, sizeof (*debug_info_p->loc_offsets));
+ debug_info_p->loc_views = (dwarf_vma *)
+ xcrealloc (debug_info_p->loc_views,
+ lmax, sizeof (*debug_info_p->loc_views));
debug_info_p->have_frame_base = (int *)
xcrealloc (debug_info_p->have_frame_base,
lmax, sizeof (*debug_info_p->have_frame_base));
}
if (this_set != NULL)
uvalue += this_set->section_offsets [DW_SECT_LOC];
- debug_info_p->loc_offsets [num] = uvalue;
debug_info_p->have_frame_base [num] = have_frame_base;
- debug_info_p->num_loc_offsets++;
+ if (attribute != DW_AT_GNU_locviews)
+ {
+ debug_info_p->loc_offsets [num] = uvalue;
+ debug_info_p->num_loc_offsets++;
+ assert (debug_info_p->num_loc_offsets
+ - debug_info_p->num_loc_views <= 1);
+ }
+ else
+ {
+ assert (debug_info_p->num_loc_views <= num);
+ num = debug_info_p->num_loc_views;
+ debug_info_p->loc_views [num] = uvalue;
+ debug_info_p->num_loc_views++;
+ assert (debug_info_p->num_loc_views
+ - debug_info_p->num_loc_offsets <= 1);
+ }
}
break;
break;
}
+ debug_info *debug_info_p =
+ (debug_information && unit < alloc_num_debug_info_entries)
+ ? debug_information + unit : NULL;
+
+ assert (!debug_info_p
+ || (debug_info_p->num_loc_offsets
+ == debug_info_p->num_loc_views));
+
for (attr = entry->first_attr;
attr && attr->attribute;
attr = attr->next)
{
- debug_info *arg;
-
if (! do_loc && do_printing)
/* Show the offset from where the tag was extracted. */
printf (" <%lx>", (unsigned long)(tags - section_begin));
- if (debug_information && unit < alloc_num_debug_info_entries)
- arg = debug_information + unit;
- else
- arg = NULL;
-
tags = read_and_display_attr (attr->attribute,
attr->form,
attr->implicit_const,
compunit.cu_pointer_size,
offset_size,
compunit.cu_version,
- arg,
+ debug_info_p,
do_loc || ! do_printing,
section,
this_set);
}
+ /* If a locview attribute appears before a location one,
+ make sure we don't associate it with an earlier
+ loclist. */
+ if (debug_info_p)
+ switch (debug_info_p->num_loc_offsets - debug_info_p->num_loc_views)
+ {
+ case 1:
+ debug_info_p->loc_views [debug_info_p->num_loc_views] = vm1;
+ debug_info_p->num_loc_views++;
+ assert (debug_info_p->num_loc_views
+ == debug_info_p->num_loc_offsets);
+ break;
+
+ case 0:
+ break;
+
+ case -1:
+ warn(_("DIE has locviews without loclist\n"));
+ debug_info_p->num_loc_views--;
+ break;
+
+ default:
+ assert (0);
+ }
+
if (entry->children)
++level;
}
static unsigned int
load_debug_info (void * file)
{
- /* Reset the last pointer size so that we can issue correct error
- messages if we are displaying the contents of more than one section. */
- last_pointer_size = 0;
- warned_about_missing_comp_units = FALSE;
-
/* If we have already tried and failed to load the .debug_info
section then do not bother to repeat the task. */
if (num_debug_info_entries == DEBUG_INFO_UNAVAILABLE)
data += bytes_read;
if (data == end)
{
- warn (_("Corrupt %s entry format table entry\n"), what);
+ warn (_("Corrupt %s format table entry\n"), what);
return data;
}
}
unsigned char *end, void *file)
{
unsigned char *start = section->start;
+ int verbose_view = 0;
printf (_("Raw dump of debug contents of section %s:\n\n"),
section->name);
{
uladv *= linfo.li_min_insn_length;
state_machine_regs.address += uladv;
+ if (uladv)
+ state_machine_regs.view = 0;
printf (_(" Special opcode %d: "
- "advance Address by %s to 0x%s"),
+ "advance Address by %s to 0x%s%s"),
op_code, dwarf_vmatoa ("u", uladv),
- dwarf_vmatoa ("x", state_machine_regs.address));
+ dwarf_vmatoa ("x", state_machine_regs.address),
+ verbose_view && uladv
+ ? _(" (reset view)") : "");
}
else
{
- state_machine_regs.address
- += ((state_machine_regs.op_index + uladv)
+ unsigned addrdelta
+ = ((state_machine_regs.op_index + uladv)
/ linfo.li_max_ops_per_insn)
* linfo.li_min_insn_length;
+
+ state_machine_regs.address += addrdelta;
state_machine_regs.op_index
= (state_machine_regs.op_index + uladv)
% linfo.li_max_ops_per_insn;
+ if (addrdelta)
+ state_machine_regs.view = 0;
printf (_(" Special opcode %d: "
- "advance Address by %s to 0x%s[%d]"),
+ "advance Address by %s to 0x%s[%d]%s"),
op_code, dwarf_vmatoa ("u", uladv),
dwarf_vmatoa ("x", state_machine_regs.address),
- state_machine_regs.op_index);
+ state_machine_regs.op_index,
+ verbose_view && addrdelta
+ ? _(" (reset view)") : "");
}
adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
state_machine_regs.line += adv;
- printf (_(" and Line by %s to %d\n"),
+ printf (_(" and Line by %s to %d"),
dwarf_vmatoa ("d", adv), state_machine_regs.line);
+ if (verbose_view || state_machine_regs.view)
+ printf (_(" (view %u)\n"), state_machine_regs.view);
+ else
+ putchar ('\n');
+ state_machine_regs.view++;
}
else switch (op_code)
{
break;
case DW_LNS_copy:
- printf (_(" Copy\n"));
+ printf (_(" Copy"));
+ if (verbose_view || state_machine_regs.view)
+ printf (_(" (view %u)\n"), state_machine_regs.view);
+ else
+ putchar ('\n');
+ state_machine_regs.view++;
break;
case DW_LNS_advance_pc:
{
uladv *= linfo.li_min_insn_length;
state_machine_regs.address += uladv;
- printf (_(" Advance PC by %s to 0x%s\n"),
+ if (uladv)
+ state_machine_regs.view = 0;
+ printf (_(" Advance PC by %s to 0x%s%s\n"),
dwarf_vmatoa ("u", uladv),
- dwarf_vmatoa ("x", state_machine_regs.address));
+ dwarf_vmatoa ("x", state_machine_regs.address),
+ verbose_view && uladv
+ ? _(" (reset view)") : "");
}
else
{
- state_machine_regs.address
- += ((state_machine_regs.op_index + uladv)
- / linfo.li_max_ops_per_insn)
+ unsigned addrdelta
+ = ((state_machine_regs.op_index + uladv)
+ / linfo.li_max_ops_per_insn)
* linfo.li_min_insn_length;
+ state_machine_regs.address
+ += addrdelta;
state_machine_regs.op_index
= (state_machine_regs.op_index + uladv)
% linfo.li_max_ops_per_insn;
- printf (_(" Advance PC by %s to 0x%s[%d]\n"),
+ if (addrdelta)
+ state_machine_regs.view = 0;
+ printf (_(" Advance PC by %s to 0x%s[%d]%s\n"),
dwarf_vmatoa ("u", uladv),
dwarf_vmatoa ("x", state_machine_regs.address),
- state_machine_regs.op_index);
+ state_machine_regs.op_index,
+ verbose_view && addrdelta
+ ? _(" (reset view)") : "");
}
break;
{
uladv *= linfo.li_min_insn_length;
state_machine_regs.address += uladv;
- printf (_(" Advance PC by constant %s to 0x%s\n"),
+ if (uladv)
+ state_machine_regs.view = 0;
+ printf (_(" Advance PC by constant %s to 0x%s%s\n"),
dwarf_vmatoa ("u", uladv),
- dwarf_vmatoa ("x", state_machine_regs.address));
+ dwarf_vmatoa ("x", state_machine_regs.address),
+ verbose_view && uladv
+ ? _(" (reset view)") : "");
}
else
{
- state_machine_regs.address
- += ((state_machine_regs.op_index + uladv)
- / linfo.li_max_ops_per_insn)
+ unsigned addrdelta
+ = ((state_machine_regs.op_index + uladv)
+ / linfo.li_max_ops_per_insn)
* linfo.li_min_insn_length;
+ state_machine_regs.address
+ += addrdelta;
state_machine_regs.op_index
= (state_machine_regs.op_index + uladv)
% linfo.li_max_ops_per_insn;
- printf (_(" Advance PC by constant %s to 0x%s[%d]\n"),
+ if (addrdelta)
+ state_machine_regs.view = 0;
+ printf (_(" Advance PC by constant %s to 0x%s[%d]%s\n"),
dwarf_vmatoa ("u", uladv),
dwarf_vmatoa ("x", state_machine_regs.address),
- state_machine_regs.op_index);
+ state_machine_regs.op_index,
+ verbose_view && addrdelta
+ ? _(" (reset view)") : "");
}
break;
printf (_(" Advance PC by fixed size amount %s to 0x%s\n"),
dwarf_vmatoa ("u", uladv),
dwarf_vmatoa ("x", state_machine_regs.address));
+ /* Do NOT reset view. */
break;
case DW_LNS_set_prologue_end:
}
/* Print the Compilation Unit's name and a header. */
- if (directory_table == NULL)
- {
- printf (_("CU: %s:\n"), file_table[0].name);
- printf (_("File name Line number Starting address\n"));
- }
+ if (file_table == NULL)
+ ;
+ else if (directory_table == NULL)
+ printf (_("CU: %s:\n"), file_table[0].name);
else
{
unsigned int ix = file_table[0].directory_index;
printf (_("CU: %s/%s:\n"), directory, file_table[0].name);
else
printf ("%s:\n", file_table[0].name);
-
- printf (_("File name Line number Starting address\n"));
}
+ printf (_("File name Line number Starting address View\n"));
saved_linfo = linfo;
}
while (data < end_of_sequence)
{
unsigned char op_code;
+ int xop;
int adv;
unsigned long int uladv;
unsigned int bytes_read;
int is_special_opcode = 0;
op_code = *data++;
+ xop = op_code;
if (op_code >= linfo.li_opcode_base)
{
{
uladv *= linfo.li_min_insn_length;
state_machine_regs.address += uladv;
+ if (uladv)
+ state_machine_regs.view = 0;
}
else
{
- state_machine_regs.address
- += ((state_machine_regs.op_index + uladv)
- / linfo.li_max_ops_per_insn)
+ unsigned addrdelta
+ = ((state_machine_regs.op_index + uladv)
+ / linfo.li_max_ops_per_insn)
* linfo.li_min_insn_length;
+ state_machine_regs.address
+ += addrdelta;
state_machine_regs.op_index
= (state_machine_regs.op_index + uladv)
% linfo.li_max_ops_per_insn;
+ if (addrdelta)
+ state_machine_regs.view = 0;
}
adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
state_machine_regs.line += adv;
is_special_opcode = 1;
+ /* Increment view after printing this row. */
}
else switch (op_code)
{
}
ext_op_code_len += bytes_read;
ext_op_code = *op_code_data++;
+ xop = ext_op_code;
+ xop = -xop;
switch (ext_op_code)
{
case DW_LNE_end_sequence:
- reset_state_machine (linfo.li_default_is_stmt);
+ /* Reset stuff after printing this row. */
break;
case DW_LNE_set_address:
SAFE_BYTE_GET_AND_INC (state_machine_regs.address,
ext_op_code_len - bytes_read - 1,
end);
state_machine_regs.op_index = 0;
+ state_machine_regs.view = 0;
break;
case DW_LNE_define_file:
{
break;
}
case DW_LNS_copy:
+ /* Increment view after printing this row. */
break;
case DW_LNS_advance_pc:
{
uladv *= linfo.li_min_insn_length;
state_machine_regs.address += uladv;
+ if (uladv)
+ state_machine_regs.view = 0;
}
else
{
- state_machine_regs.address
- += ((state_machine_regs.op_index + uladv)
- / linfo.li_max_ops_per_insn)
+ unsigned addrdelta
+ = ((state_machine_regs.op_index + uladv)
+ / linfo.li_max_ops_per_insn)
* linfo.li_min_insn_length;
+ state_machine_regs.address
+ += addrdelta;
state_machine_regs.op_index
= (state_machine_regs.op_index + uladv)
% linfo.li_max_ops_per_insn;
+ if (addrdelta)
+ state_machine_regs.view = 0;
}
break;
{
uladv *= linfo.li_min_insn_length;
state_machine_regs.address += uladv;
+ if (uladv)
+ state_machine_regs.view = 0;
}
else
{
- state_machine_regs.address
- += ((state_machine_regs.op_index + uladv)
- / linfo.li_max_ops_per_insn)
+ unsigned addrdelta
+ = ((state_machine_regs.op_index + uladv)
+ / linfo.li_max_ops_per_insn)
* linfo.li_min_insn_length;
+ state_machine_regs.address
+ += addrdelta;
state_machine_regs.op_index
= (state_machine_regs.op_index + uladv)
% linfo.li_max_ops_per_insn;
+ if (addrdelta)
+ state_machine_regs.view = 0;
}
break;
SAFE_BYTE_GET_AND_INC (uladv, data, 2, end);
state_machine_regs.address += uladv;
state_machine_regs.op_index = 0;
+ /* Do NOT reset view. */
break;
case DW_LNS_set_prologue_end:
/* Only Special opcodes, DW_LNS_copy and DW_LNE_end_sequence adds a row
to the DWARF address/line matrix. */
- if ((is_special_opcode) || (op_code == DW_LNE_end_sequence)
- || (op_code == DW_LNS_copy))
+ if ((is_special_opcode) || (xop == -DW_LNE_end_sequence)
+ || (xop == DW_LNS_copy))
{
const unsigned int MAX_FILENAME_LENGTH = 35;
char *fileName;
if (!do_wide || (fileNameLength <= MAX_FILENAME_LENGTH))
{
if (linfo.li_max_ops_per_insn == 1)
- printf ("%-35s %11d %#18" DWARF_VMA_FMT "x\n",
+ printf ("%-35s %11d %#18" DWARF_VMA_FMT "x",
newFileName, state_machine_regs.line,
state_machine_regs.address);
else
- printf ("%-35s %11d %#18" DWARF_VMA_FMT "x[%d]\n",
+ printf ("%-35s %11d %#18" DWARF_VMA_FMT "x[%d]",
newFileName, state_machine_regs.line,
state_machine_regs.address,
state_machine_regs.op_index);
else
{
if (linfo.li_max_ops_per_insn == 1)
- printf ("%s %11d %#18" DWARF_VMA_FMT "x\n",
+ printf ("%s %11d %#18" DWARF_VMA_FMT "x",
newFileName, state_machine_regs.line,
state_machine_regs.address);
else
- printf ("%s %11d %#18" DWARF_VMA_FMT "x[%d]\n",
+ printf ("%s %11d %#18" DWARF_VMA_FMT "x[%d]",
newFileName, state_machine_regs.line,
state_machine_regs.address,
state_machine_regs.op_index);
}
- if (op_code == DW_LNE_end_sequence)
- printf ("\n");
+ if (state_machine_regs.view)
+ printf (" %6u\n", state_machine_regs.view);
+ else
+ putchar ('\n');
+ state_machine_regs.view++;
+
+ if (xop == -DW_LNE_end_sequence)
+ {
+ reset_state_machine (linfo.li_default_is_stmt);
+ putchar ('\n');
+ }
free (newFileName);
}
return ((addr & mask) == mask);
}
+/* Display a view pair list starting at *VSTART_PTR and ending at
+ VLISTEND within SECTION. */
+
+static void
+display_view_pair_list (struct dwarf_section *section,
+ unsigned char **vstart_ptr,
+ unsigned int debug_info_entry,
+ unsigned char *vlistend)
+{
+ unsigned char *vstart = *vstart_ptr;
+ unsigned char *section_end = section->start + section->size;
+ unsigned int pointer_size = debug_information [debug_info_entry].pointer_size;
+
+ if (vlistend < section_end)
+ section_end = vlistend;
+
+ putchar ('\n');
+
+ while (vstart < section_end)
+ {
+ dwarf_vma off = vstart - section->start;
+ dwarf_vma vbegin, vend;
+
+ unsigned int bytes_read;
+ vbegin = read_uleb128 (vstart, &bytes_read, section_end);
+ vstart += bytes_read;
+ if (vstart == section_end)
+ {
+ vstart -= bytes_read;
+ break;
+ }
+
+ vend = read_uleb128 (vstart, &bytes_read, section_end);
+ vstart += bytes_read;
+
+ printf (" %8.8lx ", (unsigned long) off);
+
+ print_dwarf_view (vbegin, pointer_size, 1);
+ print_dwarf_view (vend, pointer_size, 1);
+ printf (_("location view pair\n"));
+ }
+
+ putchar ('\n');
+ *vstart_ptr = vstart;
+}
+
/* Display a location list from a normal (ie, non-dwo) .debug_loc section. */
static void
unsigned int debug_info_entry,
dwarf_vma offset,
dwarf_vma base_address,
+ unsigned char **vstart_ptr,
int has_frame_base)
{
- unsigned char *start = *start_ptr;
+ unsigned char *start = *start_ptr, *vstart = *vstart_ptr;
unsigned char *section_end = section->start + section->size;
unsigned long cu_offset;
unsigned int pointer_size;
while (1)
{
dwarf_vma off = offset + (start - *start_ptr);
+ dwarf_vma vbegin = vm1, vend = vm1;
if (start + 2 * pointer_size > section_end)
{
continue;
}
+ if (vstart)
+ {
+ unsigned int bytes_read;
+
+ off = offset + (vstart - *start_ptr);
+
+ vbegin = read_uleb128 (vstart, &bytes_read, section_end);
+ vstart += bytes_read;
+ print_dwarf_view (vbegin, pointer_size, 1);
+
+ vend = read_uleb128 (vstart, &bytes_read, section_end);
+ vstart += bytes_read;
+ print_dwarf_view (vend, pointer_size, 1);
+
+ printf (_("views at %8.8lx for:\n %*s "),
+ (unsigned long) off, 8, "");
+ }
+
if (start + 2 > section_end)
{
warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
if (need_frame_base && !has_frame_base)
printf (_(" [without DW_AT_frame_base]"));
- if (begin == end)
+ if (begin == end && vbegin == vend)
fputs (_(" (start == end)"), stdout);
- else if (begin > end)
+ else if (begin > end || (begin == end && vbegin > vend))
fputs (_(" (start > end)"), stdout);
putchar ('\n');
}
*start_ptr = start;
+ *vstart_ptr = vstart;
}
/* Display a location list from a normal (ie, non-dwo) .debug_loclists section. */
unsigned int debug_info_entry,
dwarf_vma offset,
dwarf_vma base_address,
+ unsigned char **vstart_ptr,
int has_frame_base)
{
- unsigned char *start = *start_ptr;
+ unsigned char *start = *start_ptr, *vstart = *vstart_ptr;
unsigned char *section_end = section->start + section->size;
unsigned long cu_offset;
unsigned int pointer_size;
unsigned int bytes_read;
/* Initialize it due to a false compiler warning. */
- dwarf_vma begin = -1;
- dwarf_vma end = -1;
+ dwarf_vma begin = -1, vbegin = -1;
+ dwarf_vma end = -1, vend = -1;
dwarf_vma length;
int need_frame_base;
SAFE_BYTE_GET_AND_INC (llet, start, 1, section_end);
+ if (vstart && llet == DW_LLE_offset_pair)
+ {
+ off = offset + (vstart - *start_ptr);
+
+ vbegin = read_uleb128 (vstart, &bytes_read, section_end);
+ vstart += bytes_read;
+ print_dwarf_view (vbegin, pointer_size, 1);
+
+ vend = read_uleb128 (vstart, &bytes_read, section_end);
+ vstart += bytes_read;
+ print_dwarf_view (vend, pointer_size, 1);
+
+ printf (_("views at %8.8lx for:\n %*s "),
+ (unsigned long) off, 8, "");
+ }
+
switch (llet)
{
case DW_LLE_end_of_list:
print_dwarf_vma (base_address, pointer_size);
printf (_("(base address)\n"));
break;
+#ifdef DW_LLE_view_pair
+ case DW_LLE_view_pair:
+ if (vstart)
+ printf (_("View pair entry in loclist with locviews attribute\n"));
+ vbegin = read_uleb128 (start, &bytes_read, section_end);
+ start += bytes_read;
+ print_dwarf_view (vbegin, pointer_size, 1);
+
+ vend = read_uleb128 (start, &bytes_read, section_end);
+ start += bytes_read;
+ print_dwarf_view (vend, pointer_size, 1);
+
+ printf (_("views for:\n"));
+ continue;
+#endif
default:
error (_("Invalid location list entry type %d\n"), llet);
return;
if (need_frame_base && !has_frame_base)
printf (_(" [without DW_AT_frame_base]"));
- if (begin == end)
+ if (begin == end && vbegin == vend)
fputs (_(" (start == end)"), stdout);
- else if (begin > end)
+ else if (begin > end || (begin == end && vbegin > vend))
fputs (_(" (start > end)"), stdout);
putchar ('\n');
start += length;
+ vbegin = vend = -1;
}
+ if (vbegin != vm1 || vend != vm1)
+ printf (_("Trailing view pair not used in a range"));
+
*start_ptr = start;
+ *vstart_ptr = vstart;
}
/* Print a .debug_addr table index in decimal, surrounded by square brackets,
unsigned char **start_ptr,
unsigned int debug_info_entry,
dwarf_vma offset,
+ unsigned char **vstart_ptr,
int has_frame_base)
{
- unsigned char *start = *start_ptr;
+ unsigned char *start = *start_ptr, *vstart = *vstart_ptr;
unsigned char *section_end = section->start + section->size;
unsigned long cu_offset;
unsigned int pointer_size;
}
SAFE_BYTE_GET_AND_INC (entry_type, start, 1, section_end);
+
+ if (vstart)
+ switch (entry_type)
+ {
+ default:
+ break;
+
+ case 2:
+ case 3:
+ case 4:
+ {
+ dwarf_vma view;
+ dwarf_vma off = offset + (vstart - *start_ptr);
+
+ view = read_uleb128 (vstart, &bytes_read, section_end);
+ vstart += bytes_read;
+ print_dwarf_view (view, 8, 1);
+
+ view = read_uleb128 (vstart, &bytes_read, section_end);
+ vstart += bytes_read;
+ print_dwarf_view (view, 8, 1);
+
+ printf (_("views at %8.8lx for:\n %*s "),
+ (unsigned long) off, 8, "");
+
+ }
+ break;
+ }
+
switch (entry_type)
{
case 0: /* A terminating entry. */
*start_ptr = start;
+ *vstart_ptr = vstart;
printf (_("<End of list>\n"));
return;
case 1: /* A base-address entry. */
idx = read_uleb128 (start, &bytes_read, section_end);
start += bytes_read;
print_addr_index (idx, 8);
- printf (" ");
+ printf ("%*s", 9 + (vstart ? 2 * 6 : 0), "");
printf (_("(base address selection entry)\n"));
continue;
case 2: /* A start/end entry. */
default:
warn (_("Unknown location list entry type 0x%x.\n"), entry_type);
*start_ptr = start;
+ *vstart_ptr = vstart;
return;
}
}
*start_ptr = start;
+ *vstart_ptr = vstart;
}
-/* Sort array of indexes in ascending order of loc_offsets[idx]. */
+/* Sort array of indexes in ascending order of loc_offsets[idx] and
+ loc_views. */
-static dwarf_vma *loc_offsets;
+static dwarf_vma *loc_offsets, *loc_views;
static int
loc_offsets_compar (const void *ap, const void *bp)
dwarf_vma a = loc_offsets[*(const unsigned int *) ap];
dwarf_vma b = loc_offsets[*(const unsigned int *) bp];
- return (a > b) - (b > a);
+ int ret = (a > b) - (b > a);
+ if (ret)
+ return ret;
+
+ a = loc_views[*(const unsigned int *) ap];
+ b = loc_views[*(const unsigned int *) bp];
+
+ ret = (a > b) - (b > a);
+
+ return ret;
}
static int
display_debug_loc (struct dwarf_section *section, void *file)
{
- unsigned char *start = section->start;
+ unsigned char *start = section->start, *vstart = NULL;
unsigned long bytes;
unsigned char *section_begin = start;
unsigned int num_loc_list = 0;
unsigned long last_offset = 0;
+ unsigned long last_view = 0;
unsigned int first = 0;
unsigned int i;
unsigned int j;
int seen_first_offset = 0;
int locs_sorted = 1;
- unsigned char *next;
+ unsigned char *next = start, *vnext = vstart;
unsigned int *array = NULL;
const char *suffix = strrchr (section->name, '.');
int is_dwo = 0;
{
/* This is the first location list. */
last_offset = debug_information [i].loc_offsets [0];
+ last_view = debug_information [i].loc_views [0];
first = i;
seen_first_offset = 1;
j = 1;
for (; j < num; j++)
{
if (last_offset >
- debug_information [i].loc_offsets [j])
+ debug_information [i].loc_offsets [j]
+ || (last_offset == debug_information [i].loc_offsets [j]
+ && last_view > debug_information [i].loc_views [j]))
{
locs_sorted = 0;
break;
}
last_offset = debug_information [i].loc_offsets [j];
+ last_view = debug_information [i].loc_views [j];
}
}
}
error (_("No location lists in .debug_info section!\n"));
if (debug_information [first].num_loc_offsets > 0
- && debug_information [first].loc_offsets [0] != expected_start)
+ && debug_information [first].loc_offsets [0] != expected_start
+ && debug_information [first].loc_views [0] != expected_start)
warn (_("Location lists in %s section start at 0x%s\n"),
section->name,
dwarf_vmatoa ("x", debug_information [first].loc_offsets [0]));
seen_first_offset = 0;
for (i = first; i < num_debug_info_entries; i++)
{
- dwarf_vma offset;
+ dwarf_vma offset, voffset;
dwarf_vma base_address;
unsigned int k;
int has_frame_base;
for (k = 0; k < debug_information [i].num_loc_offsets; k++)
array[k] = k;
loc_offsets = debug_information [i].loc_offsets;
+ loc_views = debug_information [i].loc_views;
qsort (array, debug_information [i].num_loc_offsets,
sizeof (*array), loc_offsets_compar);
}
+ int adjacent_view_loclists = 1;
for (k = 0; k < debug_information [i].num_loc_offsets; k++)
{
j = locs_sorted ? k : array[k];
if (k
- && debug_information [i].loc_offsets [locs_sorted
+ && (debug_information [i].loc_offsets [locs_sorted
? k - 1 : array [k - 1]]
- == debug_information [i].loc_offsets [j])
+ == debug_information [i].loc_offsets [j])
+ && (debug_information [i].loc_views [locs_sorted
+ ? k - 1 : array [k - 1]]
+ == debug_information [i].loc_views [j]))
continue;
has_frame_base = debug_information [i].have_frame_base [j];
offset = debug_information [i].loc_offsets [j];
next = section_begin + offset;
+ voffset = debug_information [i].loc_views [j];
+ if (voffset != vm1)
+ vnext = section_begin + voffset;
+ else
+ vnext = NULL;
base_address = debug_information [i].base_address;
- if (!seen_first_offset)
+ if (vnext && vnext < next)
+ {
+ vstart = vnext;
+ display_view_pair_list (section, &vstart, i, next);
+ if (start == vnext)
+ start = vstart;
+ }
+
+ if (!seen_first_offset || !adjacent_view_loclists)
seen_first_offset = 1;
else
{
(unsigned long) offset);
}
start = next;
+ vstart = vnext;
if (offset >= bytes)
{
continue;
}
+ if (vnext && voffset >= bytes)
+ {
+ warn (_("View Offset 0x%lx is bigger than .debug_loc section size.\n"),
+ (unsigned long) voffset);
+ continue;
+ }
+
if (!is_loclists)
{
if (is_dwo)
display_loc_list_dwo (section, &start, i, offset,
- has_frame_base);
+ &vstart, has_frame_base);
else
display_loc_list (section, &start, i, offset, base_address,
- has_frame_base);
+ &vstart, has_frame_base);
}
else
{
warn (_("DWO is not yet supported.\n"));
else
display_loclists_list (section, &start, i, offset, base_address,
- has_frame_base);
+ &vstart, has_frame_base);
}
+
+ /* FIXME: this arrangement is quite simplistic. Nothing
+ requires locview lists to be adjacent to corresponding
+ loclists, and a single loclist could be augmented by
+ different locview lists, and vice-versa, unlikely as it
+ is that it would make sense to do so. Hopefully we'll
+ have view pair support built into loclists before we ever
+ need to address all these possibilities. */
+ if (adjacent_view_loclists && vnext
+ && vnext != start && vstart != next)
+ {
+ adjacent_view_loclists = 0;
+ warn (_("Hole and overlap detection requires adjacent view lists and loclists.\n"));
+ }
+
+ if (vnext && vnext == start)
+ display_view_pair_list (section, &start, i, vstart);
}
}
regname (unsigned int regno, int row)
{
static char reg[64];
+
if (dwarf_regnames
&& regno < dwarf_regnames_count
&& dwarf_regnames [regno] != NULL)
}
#define GET(VAR, N) SAFE_BYTE_GET_AND_INC (VAR, start, N, end)
-#define LEB() read_uleb128 (start, & length_return, end); start += length_return
-#define SLEB() read_sleb128 (start, & length_return, end); start += length_return
static unsigned char *
read_cie (unsigned char *start, unsigned char *end,
fc->ptr_size = eh_addr_size;
fc->segment_size = 0;
}
- fc->code_factor = LEB ();
- fc->data_factor = SLEB ();
+ READ_ULEB (fc->code_factor);
+ READ_SLEB (fc->data_factor);
if (version == 1)
{
GET (fc->ra, 1);
}
else
{
- fc->ra = LEB ();
+ READ_ULEB (fc->ra);
}
if (fc->augmentation[0] == 'z')
{
- augmentation_data_len = LEB ();
+ READ_ULEB (augmentation_data_len);
augmentation_data = start;
start += augmentation_data_len;
/* PR 17512: file: 11042-2589-0.004. */
if (start > end)
{
- warn (_("Augmentation data too long: 0x%lx\n"), augmentation_data_len);
+ warn (_("Augmentation data too long: %#lx, expected at most %#lx\n"),
+ augmentation_data_len, (long)((end - start) + augmentation_data_len));
return end;
}
}
if (cie->augmentation[0] == 'z')
{
- augmentation_data_len = LEB ();
+ READ_ULEB (augmentation_data_len);
augmentation_data = start;
start += augmentation_data_len;
/* PR 17512: file: 722-8446-0.004. */
case DW_CFA_advance_loc:
break;
case DW_CFA_offset:
- LEB ();
+ SKIP_ULEB ();
if (frame_need_space (fc, opa) >= 0)
fc->col_type[opa] = DW_CFA_undefined;
break;
break;
case DW_CFA_offset_extended:
case DW_CFA_val_offset:
- reg = LEB (); LEB ();
+ READ_ULEB (reg);
+ SKIP_ULEB ();
if (frame_need_space (fc, reg) >= 0)
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_restore_extended:
- reg = LEB ();
+ READ_ULEB (reg);
if (frame_need_space (fc, reg) >= 0)
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_undefined:
- reg = LEB ();
+ READ_ULEB (reg);
if (frame_need_space (fc, reg) >= 0)
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_same_value:
- reg = LEB ();
+ READ_ULEB (reg);
if (frame_need_space (fc, reg) >= 0)
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_register:
- reg = LEB (); LEB ();
+ READ_ULEB (reg);
+ SKIP_ULEB ();
if (frame_need_space (fc, reg) >= 0)
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_def_cfa:
- LEB (); LEB ();
+ SKIP_ULEB ();
+ SKIP_ULEB ();
break;
case DW_CFA_def_cfa_register:
- LEB ();
+ SKIP_ULEB ();
break;
case DW_CFA_def_cfa_offset:
- LEB ();
+ SKIP_ULEB ();
break;
case DW_CFA_def_cfa_expression:
- temp = LEB ();
+ READ_ULEB (temp);
new_start = start + temp;
if (new_start < start)
{
break;
case DW_CFA_expression:
case DW_CFA_val_expression:
- reg = LEB ();
- temp = LEB ();
+ READ_ULEB (reg);
+ READ_ULEB (temp);
new_start = start + temp;
if (new_start < start)
{
break;
case DW_CFA_offset_extended_sf:
case DW_CFA_val_offset_sf:
- reg = LEB (); SLEB ();
+ READ_ULEB (reg);
+ SKIP_SLEB ();
if (frame_need_space (fc, reg) >= 0)
fc->col_type[reg] = DW_CFA_undefined;
break;
case DW_CFA_def_cfa_sf:
- LEB (); SLEB ();
+ SKIP_ULEB ();
+ SKIP_SLEB ();
break;
case DW_CFA_def_cfa_offset_sf:
- SLEB ();
+ SKIP_SLEB ();
break;
case DW_CFA_MIPS_advance_loc8:
start += 8;
break;
case DW_CFA_GNU_args_size:
- LEB ();
+ SKIP_ULEB ();
break;
case DW_CFA_GNU_negative_offset_extended:
- reg = LEB (); LEB ();
+ READ_ULEB (reg);
+ SKIP_ULEB ();
if (frame_need_space (fc, reg) >= 0)
fc->col_type[reg] = DW_CFA_undefined;
break;
{
unsigned char * tmp;
unsigned op, opa;
- unsigned long ul, reg, roffs;
- dwarf_vma l;
+ unsigned long ul, roffs;
+ /* Note: It is tempting to use an unsigned long for 'reg' but there
+ are various functions, notably frame_space_needed() that assume that
+ reg is an unsigned int. */
+ unsigned int reg;
+ dwarf_signed_vma l;
dwarf_vma ofs;
dwarf_vma vma;
const char *reg_prefix = "";
break;
case DW_CFA_offset:
- roffs = LEB ();
+ READ_ULEB (roffs);
if (opa >= (unsigned int) fc->ncols)
reg_prefix = bad_reg;
if (! do_debug_frames_interp || *reg_prefix != '\0')
break;
case DW_CFA_offset_extended:
- reg = LEB ();
- roffs = LEB ();
+ READ_ULEB (reg);
+ READ_ULEB (roffs);
if (reg >= (unsigned int) fc->ncols)
reg_prefix = bad_reg;
if (! do_debug_frames_interp || *reg_prefix != '\0')
break;
case DW_CFA_val_offset:
- reg = LEB ();
- roffs = LEB ();
+ READ_ULEB (reg);
+ READ_ULEB (roffs);
if (reg >= (unsigned int) fc->ncols)
reg_prefix = bad_reg;
if (! do_debug_frames_interp || *reg_prefix != '\0')
break;
case DW_CFA_restore_extended:
- reg = LEB ();
+ READ_ULEB (reg);
if (reg >= (unsigned int) fc->ncols)
reg_prefix = bad_reg;
if (! do_debug_frames_interp || *reg_prefix != '\0')
break;
case DW_CFA_undefined:
- reg = LEB ();
+ READ_ULEB (reg);
if (reg >= (unsigned int) fc->ncols)
reg_prefix = bad_reg;
if (! do_debug_frames_interp || *reg_prefix != '\0')
break;
case DW_CFA_same_value:
- reg = LEB ();
+ READ_ULEB (reg);
if (reg >= (unsigned int) fc->ncols)
reg_prefix = bad_reg;
if (! do_debug_frames_interp || *reg_prefix != '\0')
break;
case DW_CFA_register:
- reg = LEB ();
- roffs = LEB ();
+ READ_ULEB (reg);
+ READ_ULEB (roffs);
if (reg >= (unsigned int) fc->ncols)
reg_prefix = bad_reg;
if (! do_debug_frames_interp || *reg_prefix != '\0')
break;
case DW_CFA_def_cfa:
- fc->cfa_reg = LEB ();
- fc->cfa_offset = LEB ();
+ READ_SLEB (fc->cfa_reg);
+ READ_ULEB (fc->cfa_offset);
fc->cfa_exp = 0;
if (! do_debug_frames_interp)
printf (" DW_CFA_def_cfa: %s ofs %d\n",
break;
case DW_CFA_def_cfa_register:
- fc->cfa_reg = LEB ();
+ READ_SLEB (fc->cfa_reg);
fc->cfa_exp = 0;
if (! do_debug_frames_interp)
printf (" DW_CFA_def_cfa_register: %s\n",
break;
case DW_CFA_def_cfa_offset:
- fc->cfa_offset = LEB ();
+ READ_ULEB (fc->cfa_offset);
if (! do_debug_frames_interp)
printf (" DW_CFA_def_cfa_offset: %d\n", (int) fc->cfa_offset);
break;
break;
case DW_CFA_def_cfa_expression:
- ul = LEB ();
+ READ_ULEB (ul);
if (start >= block_end || ul > (unsigned long) (block_end - start))
{
printf (_(" DW_CFA_def_cfa_expression: <corrupt len %lu>\n"), ul);
break;
case DW_CFA_expression:
- reg = LEB ();
- ul = LEB ();
+ READ_ULEB (reg);
+ READ_ULEB (ul);
if (reg >= (unsigned int) fc->ncols)
reg_prefix = bad_reg;
/* PR 17512: file: 069-133014-0.006. */
break;
case DW_CFA_val_expression:
- reg = LEB ();
- ul = LEB ();
+ READ_ULEB (reg);
+ READ_ULEB (ul);
if (reg >= (unsigned int) fc->ncols)
reg_prefix = bad_reg;
tmp = start + ul;
break;
case DW_CFA_offset_extended_sf:
- reg = LEB ();
- l = SLEB ();
+ READ_ULEB (reg);
+ READ_SLEB (l);
if (frame_need_space (fc, reg) < 0)
reg_prefix = bad_reg;
if (! do_debug_frames_interp || *reg_prefix != '\0')
break;
case DW_CFA_val_offset_sf:
- reg = LEB ();
- l = SLEB ();
+ READ_ULEB (reg);
+ READ_SLEB (l);
if (frame_need_space (fc, reg) < 0)
reg_prefix = bad_reg;
if (! do_debug_frames_interp || *reg_prefix != '\0')
break;
case DW_CFA_def_cfa_sf:
- fc->cfa_reg = LEB ();
- fc->cfa_offset = SLEB ();
+ READ_SLEB (fc->cfa_reg);
+ READ_ULEB (fc->cfa_offset);
fc->cfa_offset = fc->cfa_offset * fc->data_factor;
fc->cfa_exp = 0;
if (! do_debug_frames_interp)
break;
case DW_CFA_def_cfa_offset_sf:
- fc->cfa_offset = SLEB ();
+ READ_ULEB (fc->cfa_offset);
fc->cfa_offset *= fc->data_factor;
if (! do_debug_frames_interp)
printf (" DW_CFA_def_cfa_offset_sf: %d\n", (int) fc->cfa_offset);
break;
case DW_CFA_GNU_args_size:
- ul = LEB ();
+ READ_ULEB (ul);
if (! do_debug_frames_interp)
printf (" DW_CFA_GNU_args_size: %ld\n", ul);
break;
case DW_CFA_GNU_negative_offset_extended:
- reg = LEB ();
- l = - LEB ();
+ READ_ULEB (reg);
+ READ_SLEB (l);
+ l = - l;
if (frame_need_space (fc, reg) < 0)
reg_prefix = bad_reg;
if (! do_debug_frames_interp || *reg_prefix != '\0')
}
#undef GET
-#undef LEB
-#undef SLEB
+
+static int
+display_debug_names (struct dwarf_section *section, void *file)
+{
+ unsigned char *hdrptr = section->start;
+ dwarf_vma unit_length;
+ unsigned char *unit_start;
+ const unsigned char *const section_end = section->start + section->size;
+ unsigned char *unit_end;
+
+ printf (_("Contents of the %s section:\n"), section->name);
+
+ load_debug_section (str, file);
+
+ for (; hdrptr < section_end; hdrptr = unit_end)
+ {
+ unsigned int offset_size;
+ uint16_t dwarf_version, padding;
+ uint32_t comp_unit_count, local_type_unit_count, foreign_type_unit_count;
+ uint32_t bucket_count, name_count, abbrev_table_size;
+ uint32_t augmentation_string_size;
+ unsigned int i;
+
+ unit_start = hdrptr;
+
+ /* Get and check the length of the block. */
+ SAFE_BYTE_GET_AND_INC (unit_length, hdrptr, 4, section_end);
+
+ if (unit_length == 0xffffffff)
+ {
+ /* This section is 64-bit DWARF. */
+ SAFE_BYTE_GET_AND_INC (unit_length, hdrptr, 8, section_end);
+ offset_size = 8;
+ }
+ else
+ offset_size = 4;
+ unit_end = hdrptr + unit_length;
+
+ if ((hdrptr - section->start) + unit_length > section->size)
+ {
+ warn (_("The length field (0x%lx) for unit 0x%lx in the debug_names "
+ "header is wrong - the section is too small\n"),
+ (long) unit_length, (long) (unit_start - section->start));
+ return 0;
+ }
+
+ /* Get and check the version number. */
+ SAFE_BYTE_GET_AND_INC (dwarf_version, hdrptr, 2, unit_end);
+ printf (_("Version %ld\n"), (long) dwarf_version);
+
+ /* Prior versions did not exist, and future versions may not be
+ backwards compatible. */
+ if (dwarf_version != 5)
+ {
+ warn (_("Only DWARF version 5 .debug_names "
+ "is currently supported.\n"));
+ return 0;
+ }
+
+ SAFE_BYTE_GET_AND_INC (padding, hdrptr, 2, unit_end);
+ if (padding != 0)
+ warn (_("Padding field of .debug_names must be 0 (found 0x%x)\n"),
+ padding);
+
+ SAFE_BYTE_GET_AND_INC (comp_unit_count, hdrptr, 4, unit_end);
+ if (comp_unit_count == 0)
+ warn (_("Compilation unit count must be >= 1 in .debug_names\n"));
+
+ SAFE_BYTE_GET_AND_INC (local_type_unit_count, hdrptr, 4, unit_end);
+ SAFE_BYTE_GET_AND_INC (foreign_type_unit_count, hdrptr, 4, unit_end);
+ SAFE_BYTE_GET_AND_INC (bucket_count, hdrptr, 4, unit_end);
+ SAFE_BYTE_GET_AND_INC (name_count, hdrptr, 4, unit_end);
+ SAFE_BYTE_GET_AND_INC (abbrev_table_size, hdrptr, 4, unit_end);
+
+ SAFE_BYTE_GET_AND_INC (augmentation_string_size, hdrptr, 4, unit_end);
+ if (augmentation_string_size % 4 != 0)
+ {
+ warn (_("Augmentation string length %u must be rounded up "
+ "to a multiple of 4 in .debug_names.\n"),
+ augmentation_string_size);
+ augmentation_string_size += (-augmentation_string_size) & 3;
+ }
+ printf (_("Augmentation string:"));
+ for (i = 0; i < augmentation_string_size; i++)
+ {
+ unsigned char uc;
+
+ SAFE_BYTE_GET_AND_INC (uc, hdrptr, 1, unit_end);
+ printf (" %02x", uc);
+ }
+ putchar ('\n');
+ putchar ('\n');
+
+ printf (_("CU table:\n"));
+ for (i = 0; i < comp_unit_count; i++)
+ {
+ uint64_t cu_offset;
+
+ SAFE_BYTE_GET_AND_INC (cu_offset, hdrptr, offset_size, unit_end);
+ printf (_("[%3u] 0x%lx\n"), i, (unsigned long) cu_offset);
+ }
+ putchar ('\n');
+
+ printf (_("TU table:\n"));
+ for (i = 0; i < local_type_unit_count; i++)
+ {
+ uint64_t tu_offset;
+
+ SAFE_BYTE_GET_AND_INC (tu_offset, hdrptr, offset_size, unit_end);
+ printf (_("[%3u] 0x%lx\n"), i, (unsigned long) tu_offset);
+ }
+ putchar ('\n');
+
+ printf (_("Foreign TU table:\n"));
+ for (i = 0; i < foreign_type_unit_count; i++)
+ {
+ uint64_t signature;
+
+ SAFE_BYTE_GET_AND_INC (signature, hdrptr, 8, unit_end);
+ printf (_("[%3u] "), i);
+ print_dwarf_vma (signature, 8);
+ putchar ('\n');
+ }
+ putchar ('\n');
+
+ const uint32_t *const hash_table_buckets = (uint32_t *) hdrptr;
+ hdrptr += bucket_count * sizeof (uint32_t);
+ const uint32_t *const hash_table_hashes = (uint32_t *) hdrptr;
+ hdrptr += name_count * sizeof (uint32_t);
+ unsigned char *const name_table_string_offsets = hdrptr;
+ hdrptr += name_count * offset_size;
+ unsigned char *const name_table_entry_offsets = hdrptr;
+ hdrptr += name_count * offset_size;
+ unsigned char *const abbrev_table = hdrptr;
+ hdrptr += abbrev_table_size;
+ const unsigned char *const abbrev_table_end = hdrptr;
+ unsigned char *const entry_pool = hdrptr;
+ if (hdrptr > unit_end)
+ {
+ warn (_("Entry pool offset (0x%lx) exceeds unit size 0x%lx "
+ "for unit 0x%lx in the debug_names\n"),
+ (long) (hdrptr - section->start),
+ (long) (unit_end - section->start),
+ (long) (unit_start - section->start));
+ return 0;
+ }
+
+ size_t buckets_filled = 0;
+ size_t bucketi;
+ for (bucketi = 0; bucketi < bucket_count; bucketi++)
+ {
+ const uint32_t bucket = hash_table_buckets[bucketi];
+
+ if (bucket != 0)
+ ++buckets_filled;
+ }
+ printf (_("Used %zu of %lu buckets.\n"), buckets_filled,
+ (unsigned long) bucket_count);
+
+ uint32_t hash_prev = 0;
+ size_t hash_clash_count = 0;
+ size_t longest_clash = 0;
+ size_t this_length = 0;
+ size_t hashi;
+ for (hashi = 0; hashi < name_count; hashi++)
+ {
+ const uint32_t hash_this = hash_table_hashes[hashi];
+
+ if (hashi > 0)
+ {
+ if (hash_prev % bucket_count == hash_this % bucket_count)
+ {
+ ++hash_clash_count;
+ ++this_length;
+ longest_clash = MAX (longest_clash, this_length);
+ }
+ else
+ this_length = 0;
+ }
+ hash_prev = hash_this;
+ }
+ printf (_("Out of %lu items there are %zu bucket clashes"
+ " (longest of %zu entries).\n"),
+ (unsigned long) name_count, hash_clash_count, longest_clash);
+ assert (name_count == buckets_filled + hash_clash_count);
+
+ struct abbrev_lookup_entry
+ {
+ dwarf_vma abbrev_tag;
+ unsigned char *abbrev_lookup_ptr;
+ };
+ struct abbrev_lookup_entry *abbrev_lookup = NULL;
+ size_t abbrev_lookup_used = 0;
+ size_t abbrev_lookup_allocated = 0;
+
+ unsigned char *abbrevptr = abbrev_table;
+ for (;;)
+ {
+ unsigned int bytes_read;
+ const dwarf_vma abbrev_tag = read_uleb128 (abbrevptr, &bytes_read,
+ abbrev_table_end);
+ abbrevptr += bytes_read;
+ if (abbrev_tag == 0)
+ break;
+ if (abbrev_lookup_used == abbrev_lookup_allocated)
+ {
+ abbrev_lookup_allocated = MAX (0x100,
+ abbrev_lookup_allocated * 2);
+ abbrev_lookup = xrealloc (abbrev_lookup,
+ (abbrev_lookup_allocated
+ * sizeof (*abbrev_lookup)));
+ }
+ assert (abbrev_lookup_used < abbrev_lookup_allocated);
+ struct abbrev_lookup_entry *entry;
+ for (entry = abbrev_lookup;
+ entry < abbrev_lookup + abbrev_lookup_used;
+ entry++)
+ if (entry->abbrev_tag == abbrev_tag)
+ {
+ warn (_("Duplicate abbreviation tag %lu "
+ "in unit 0x%lx in the debug_names\n"),
+ (long) abbrev_tag, (long) (unit_start - section->start));
+ break;
+ }
+ entry = &abbrev_lookup[abbrev_lookup_used++];
+ entry->abbrev_tag = abbrev_tag;
+ entry->abbrev_lookup_ptr = abbrevptr;
+
+ /* Skip DWARF tag. */
+ read_uleb128 (abbrevptr, &bytes_read, abbrev_table_end);
+ abbrevptr += bytes_read;
+ for (;;)
+ {
+ const dwarf_vma xindex = read_uleb128 (abbrevptr,
+ &bytes_read,
+ abbrev_table_end);
+ abbrevptr += bytes_read;
+ const dwarf_vma form = read_uleb128 (abbrevptr, &bytes_read,
+ abbrev_table_end);
+ abbrevptr += bytes_read;
+ if (xindex == 0 && form == 0)
+ break;
+ }
+ }
+
+ printf (_("\nSymbol table:\n"));
+ uint32_t namei;
+ for (namei = 0; namei < name_count; ++namei)
+ {
+ uint64_t string_offset, entry_offset;
+
+ SAFE_BYTE_GET (string_offset,
+ name_table_string_offsets + namei * offset_size,
+ offset_size, unit_end);
+ SAFE_BYTE_GET (entry_offset,
+ name_table_entry_offsets + namei * offset_size,
+ offset_size, unit_end);
+
+ printf ("[%3u] #%08x %s:", namei, hash_table_hashes[namei],
+ fetch_indirect_string (string_offset));
+
+ unsigned char *entryptr = entry_pool + entry_offset;
+
+ // We need to scan first whether there is a single or multiple
+ // entries. TAGNO is -2 for the first entry, it is -1 for the
+ // initial tag read of the second entry, then it becomes 0 for the
+ // first entry for real printing etc.
+ int tagno = -2;
+ /* Initialize it due to a false compiler warning. */
+ dwarf_vma second_abbrev_tag = -1;
+ for (;;)
+ {
+ unsigned int bytes_read;
+ const dwarf_vma abbrev_tag = read_uleb128 (entryptr, &bytes_read,
+ unit_end);
+ entryptr += bytes_read;
+ if (tagno == -1)
+ {
+ second_abbrev_tag = abbrev_tag;
+ tagno = 0;
+ entryptr = entry_pool + entry_offset;
+ continue;
+ }
+ if (abbrev_tag == 0)
+ break;
+ if (tagno >= 0)
+ printf ("%s<%lu>",
+ (tagno == 0 && second_abbrev_tag == 0 ? " " : "\n\t"),
+ (unsigned long) abbrev_tag);
+
+ const struct abbrev_lookup_entry *entry;
+ for (entry = abbrev_lookup;
+ entry < abbrev_lookup + abbrev_lookup_used;
+ entry++)
+ if (entry->abbrev_tag == abbrev_tag)
+ break;
+ if (entry >= abbrev_lookup + abbrev_lookup_used)
+ {
+ warn (_("Undefined abbreviation tag %lu "
+ "in unit 0x%lx in the debug_names\n"),
+ (long) abbrev_tag,
+ (long) (unit_start - section->start));
+ break;
+ }
+ abbrevptr = entry->abbrev_lookup_ptr;
+ const dwarf_vma dwarf_tag = read_uleb128 (abbrevptr, &bytes_read,
+ abbrev_table_end);
+ abbrevptr += bytes_read;
+ if (tagno >= 0)
+ printf (" %s", get_TAG_name (dwarf_tag));
+ for (;;)
+ {
+ const dwarf_vma xindex = read_uleb128 (abbrevptr,
+ &bytes_read,
+ abbrev_table_end);
+ abbrevptr += bytes_read;
+ const dwarf_vma form = read_uleb128 (abbrevptr, &bytes_read,
+ abbrev_table_end);
+ abbrevptr += bytes_read;
+ if (xindex == 0 && form == 0)
+ break;
+
+ if (tagno >= 0)
+ printf (" %s", get_IDX_name (xindex));
+ entryptr = read_and_display_attr_value (0, form, 0, entryptr,
+ unit_end, 0, 0,
+ offset_size,
+ dwarf_version, NULL,
+ (tagno < 0), NULL,
+ NULL, '=');
+ }
+ ++tagno;
+ }
+ if (tagno <= 0)
+ printf (_(" <no entries>"));
+ putchar ('\n');
+ }
+
+ free (abbrev_lookup);
+ }
+
+ return 1;
+}
static int
display_gdb_index (struct dwarf_section *section,
/* PR 17531: file: 18a47d3d. */
if (symbol_table_offset < address_table_offset)
{
- warn (_("Symbol table offset (%xl) is less then Address table offset (%x)\n"),
+ warn (_("Symbol table offset (%x) is less then Address table offset (%x)\n"),
symbol_table_offset, address_table_offset);
return 0;
}
symbol_table = start + symbol_table_offset;
constant_pool = start + constant_pool_offset;
- if (address_table + address_table_size * (2 + 8 + 4) > section->start + section->size)
+ if (address_table + address_table_size > section->start + section->size)
{
warn (_("Address table extends beyond end of section.\n"));
return 0;
display_debug_not_supported, NULL, FALSE },
{ { ".gdb_index", "", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
display_gdb_index, &do_gdb_index, FALSE },
+ { { ".debug_names", "", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
+ display_debug_names, &do_gdb_index, FALSE },
{ { ".trace_info", "", NULL, NULL, 0, 0, trace_abbrev, NULL, 0, NULL },
display_trace_info, &do_trace_info, TRUE },
{ { ".trace_abbrev", "", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
{ { ".debug_tu_index", "", NULL, NULL, 0, 0, 0, NULL, 0, NULL },
display_cu_index, &do_debug_cu_index, FALSE },
};
+
+/* A static assertion. */
+extern int debug_displays_assert[ARRAY_SIZE (debug_displays) == max ? 1 : -1];
projects / deliverable / binutils-gdb.git / blobdiff