binutils/
[deliverable/binutils-gdb.git] / binutils / dwarf.c
index 41c63e2baad4723c6daa8f530eaeff89beb681ef..862a060bd90cbdf752ffce6c68a3cb63f2859535 100644 (file)
@@ -1,6 +1,5 @@
 /* dwarf.c -- display DWARF contents of a BFD binary file
-   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-   Free Software Foundation, Inc.
+   Copyright 2005-2013 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
 #include "dwarf.h"
 #include "gdb/gdb-index.h"
 
+#if !HAVE_DECL_STRNLEN
+size_t strnlen (const char *, size_t);
+#endif
+
 static const char *regname (unsigned int regno, int row);
 
 static int have_frame_base;
@@ -71,6 +74,36 @@ unsigned long dwarf_start_die;
 
 int dwarf_check = 0;
 
+/* 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
+   sections from a .dwo file.  */
+
+static int cu_tu_indexes_read = 0;
+static unsigned int *shndx_pool = NULL;
+static unsigned int shndx_pool_size = 0;
+static unsigned int shndx_pool_used = 0;
+
+/* For version 2 package files, each set contains an array of section offsets
+   and an array of section sizes, giving the offset and size of the
+   contribution from a CU or TU within one of the debug sections.
+   When displaying debug info from a package file, we need to use these
+   tables to locate the corresponding contributions to each section.  */
+
+struct cu_tu_set
+{
+  uint64_t signature;
+  dwarf_vma section_offsets[DW_SECT_MAX];
+  size_t section_sizes[DW_SECT_MAX];
+};
+
+static int cu_count = 0;
+static int tu_count = 0;
+static struct cu_tu_set *cu_sets = NULL;
+static struct cu_tu_set *tu_sets = NULL;
+
+static void load_cu_tu_indexes (void *file);
+
 /* Values for do_debug_lines.  */
 #define FLAG_DEBUG_LINES_RAW    1
 #define FLAG_DEBUG_LINES_DECODED 2
@@ -195,15 +228,23 @@ dwarf_vmatoa64 (dwarf_vma hvalue, dwarf_vma lvalue, char *buf,
   return buf;
 }
 
+/* Read in a LEB128 encoded value starting at address DATA.
+   If SIGN is true, return a signed LEB128 value.
+   If LENGTH_RETURN is not NULL, return in it the number of bytes read.
+   No bytes will be read at address END or beyond.  */
+
 dwarf_vma
-read_leb128 (unsigned char *data, unsigned int *length_return, int sign)
+read_leb128 (unsigned char *data,
+            unsigned int *length_return,
+            bfd_boolean sign,
+            const unsigned char * const end)
 {
   dwarf_vma result = 0;
   unsigned int num_read = 0;
   unsigned int shift = 0;
-  unsigned char byte;
+  unsigned char byte = 0;
 
-  do
+  while (data < end)
     {
       byte = *data++;
       num_read++;
@@ -211,9 +252,9 @@ read_leb128 (unsigned char *data, unsigned int *length_return, int sign)
       result |= ((dwarf_vma) (byte & 0x7f)) << shift;
 
       shift += 7;
-
+      if ((byte & 0x80) == 0)
+       break;
     }
-  while (byte & 0x80);
 
   if (length_return != NULL)
     *length_return = num_read;
@@ -225,12 +266,88 @@ read_leb128 (unsigned char *data, unsigned int *length_return, int sign)
 }
 
 /* Create a signed version to avoid painful typecasts.  */
-static dwarf_signed_vma
-read_sleb128 (unsigned char *data, unsigned int *length_return)
+static inline dwarf_signed_vma
+read_sleb128 (unsigned char * data,
+             unsigned int *  length_return,
+             const unsigned char * const end)
+{
+  return (dwarf_signed_vma) read_leb128 (data, length_return, TRUE, end);
+}
+
+static inline dwarf_vma
+read_uleb128 (unsigned char * data,
+             unsigned int *  length_return,
+             const unsigned char * const end)
 {
-  return (dwarf_signed_vma) read_leb128 (data, length_return, 1);
+  return read_leb128 (data, length_return, FALSE, end);
 }
 
+#define SAFE_BYTE_GET(VAL, PTR, AMOUNT, END)   \
+  do                                           \
+    {                                          \
+      unsigned int amount = (AMOUNT);          \
+      if (((PTR) + amount) >= (END))           \
+       {                                       \
+         if ((PTR) < (END))                    \
+           amount = (END) - (PTR);             \
+         else                                  \
+           amount = 0;                         \
+       }                                       \
+      if (amount)                              \
+       VAL = byte_get ((PTR), amount);         \
+      else                                     \
+       VAL = 0;                                \
+    }                                          \
+  while (0)
+
+#define SAFE_BYTE_GET_AND_INC(VAL, PTR, AMOUNT, END)   \
+  do                                                   \
+    {                                                  \
+      SAFE_BYTE_GET (VAL, PTR, AMOUNT, END);           \
+      PTR += AMOUNT;                                   \
+    }                                                  \
+  while (0)
+
+#define SAFE_SIGNED_BYTE_GET(VAL, PTR, AMOUNT, END)    \
+  do                                                   \
+    {                                                  \
+      unsigned int amount = (AMOUNT);                  \
+      if (((PTR) + amount) >= (END))                   \
+       {                                               \
+         if ((PTR) < (END))                            \
+           amount = (END) - (PTR);                     \
+         else                                          \
+           amount = 0;                                 \
+       }                                               \
+      if (amount)                                      \
+       VAL = byte_get_signed ((PTR), amount);          \
+      else                                             \
+       VAL = 0;                                        \
+    }                                                  \
+  while (0)
+
+#define SAFE_SIGNED_BYTE_GET_AND_INC(VAL, PTR, AMOUNT, END)    \
+  do                                                           \
+    {                                                          \
+      SAFE_SIGNED_BYTE_GET (VAL, PTR, AMOUNT, END);            \
+      PTR += AMOUNT;                                           \
+    }                                                          \
+  while (0)
+
+#define SAFE_BYTE_GET64(PTR, HIGH, LOW, END)           \
+  do                                                   \
+    {                                                  \
+      if (((PTR) + 8) <= (END))                                \
+       {                                               \
+         byte_get_64 ((PTR), (HIGH), (LOW));           \
+       }                                               \
+      else                                             \
+       {                                               \
+         * (LOW) = * (HIGH) = 0;                       \
+       }                                               \
+    }                                                  \
+  while (0)
+
 typedef struct State_Machine_Registers
 {
   dwarf_vma address;
@@ -266,19 +383,21 @@ reset_state_machine (int is_stmt)
    Returns the number of bytes read.  */
 
 static int
-process_extended_line_op (unsigned char *data, int is_stmt)
+process_extended_line_op (unsigned char * data,
+                         int is_stmt,
+                         unsigned char * end)
 {
   unsigned char op_code;
   unsigned int bytes_read;
   unsigned int len;
   unsigned char *name;
-  dwarf_vma adr;
   unsigned char *orig_data = data;
+  dwarf_vma adr;
 
-  len = read_leb128 (data, & bytes_read, 0);
+  len = read_uleb128 (data, & bytes_read, end);
   data += bytes_read;
 
-  if (len == 0)
+  if (len == 0 || data == end)
     {
       warn (_("badly formed extended line op encountered!\n"));
       return bytes_read;
@@ -297,7 +416,7 @@ process_extended_line_op (unsigned char *data, int is_stmt)
       break;
 
     case DW_LNE_set_address:
-      adr = byte_get (data, len - bytes_read - 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.op_index = 0;
@@ -306,25 +425,25 @@ process_extended_line_op (unsigned char *data, int is_stmt)
     case DW_LNE_define_file:
       printf (_("define new File Table entry\n"));
       printf (_("  Entry\tDir\tTime\tSize\tName\n"));
-
       printf ("   %d\t", ++state_machine_regs.last_file_entry);
+
       name = data;
-      data += strlen ((char *) data) + 1;
-      printf ("%s\t", dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
+      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_leb128 (data, & bytes_read, 0)));
+      printf ("%s\t", dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
       data += bytes_read;
-      printf ("%s\t", dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
+      printf ("%s\t", dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
       data += bytes_read;
-      printf ("%s", name);
-      if ((unsigned int) (data - orig_data) != len)
-        printf (_(" [Bad opcode length]"));
-      printf ("\n\n");
+      printf ("%s\n\n", name);
+
+      if (((unsigned int) (data - orig_data) != len) || data == end)
+        warn (_("DW_LNE_define_file: Bad opcode length\n"));
       break;
 
     case DW_LNE_set_discriminator:
       printf (_("set Discriminator to %s\n"),
-             dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
+             dwarf_vmatoa ("u", read_uleb128 (data, & bytes_read, end)));
       break;
 
     /* HP extensions.  */
@@ -368,7 +487,7 @@ process_extended_line_op (unsigned char *data, int is_stmt)
           {
             unsigned int opc;
 
-            opc = read_leb128 (data, & bytes_read, 0);
+            opc = read_uleb128 (data, & bytes_read, edata);
             data += bytes_read;
 
             switch (opc)
@@ -379,22 +498,22 @@ process_extended_line_op (unsigned char *data, int is_stmt)
               case DW_LNE_HP_SFC_set_listing_line:
                 printf ("    DW_LNE_HP_SFC_set_listing_line (%s)\n",
                         dwarf_vmatoa ("u",
-                                      read_leb128 (data, & bytes_read, 0)));
+                                      read_uleb128 (data, & bytes_read, edata)));
                 data += bytes_read;
                 break;
               case DW_LNE_HP_SFC_associate:
                 printf ("    DW_LNE_HP_SFC_associate ");
                 printf ("(%s",
                         dwarf_vmatoa ("u",
-                                      read_leb128 (data, & bytes_read, 0)));
+                                      read_uleb128 (data, & bytes_read, edata)));
                 data += bytes_read;
                 printf (",%s",
                         dwarf_vmatoa ("u",
-                                      read_leb128 (data, & bytes_read, 0)));
+                                      read_uleb128 (data, & bytes_read, edata)));
                 data += bytes_read;
                 printf (",%s)\n",
                         dwarf_vmatoa ("u",
-                                      read_leb128 (data, & bytes_read, 0)));
+                                      read_uleb128 (data, & bytes_read, edata)));
                 data += bytes_read;
                 break;
               default:
@@ -429,13 +548,13 @@ process_extended_line_op (unsigned char *data, int is_stmt)
   return len;
 }
 
-static const char *
+static const unsigned char *
 fetch_indirect_string (dwarf_vma offset)
 {
   struct dwarf_section *section = &debug_displays [str].section;
 
   if (section->start == NULL)
-    return _("<no .debug_str section>");
+    return (const unsigned char *) _("<no .debug_str section>");
 
   /* DWARF sections under Mach-O have non-zero addresses.  */
   offset -= section->address;
@@ -443,14 +562,15 @@ fetch_indirect_string (dwarf_vma offset)
     {
       warn (_("DW_FORM_strp offset too big: %s\n"),
            dwarf_vmatoa ("x", offset));
-      return _("<offset is too big>");
+      return (const unsigned char *) _("<offset is too big>");
     }
 
-  return (const char *) section->start + offset;
+  return (const unsigned char *) section->start + offset;
 }
 
 static const char *
-fetch_indexed_string (dwarf_vma idx, dwarf_vma offset_size, int dwo)
+fetch_indexed_string (dwarf_vma idx, struct cu_tu_set *this_set,
+                     dwarf_vma offset_size, int dwo)
 {
   enum dwarf_section_display_enum str_sec_idx = dwo ? str_dwo : str;
   enum dwarf_section_display_enum idx_sec_idx = dwo ? str_index_dwo : str_index;
@@ -465,6 +585,8 @@ fetch_indexed_string (dwarf_vma idx, dwarf_vma offset_size, int dwo)
 
   /* DWARF sections under Mach-O have non-zero addresses.  */
   index_offset -= index_section->address;
+  if (this_set != NULL)
+    index_offset += this_set->section_offsets [DW_SECT_STR_OFFSETS];
   if (index_offset > index_section->size)
     {
       warn (_("DW_FORM_GNU_str_index offset too big: %s\n"),
@@ -623,17 +745,21 @@ process_abbrev_section (unsigned char *start, unsigned char *end)
       unsigned long attribute;
       int children;
 
-      entry = read_leb128 (start, & bytes_read, 0);
+      entry = read_uleb128 (start, & bytes_read, end);
       start += bytes_read;
 
       /* A single zero is supposed to end the section according
         to the standard.  If there's more, then signal that to
         the caller.  */
+      if (start == end)
+       return NULL;
       if (entry == 0)
-       return start == end ? NULL : start;
+       return start;
 
-      tag = read_leb128 (start, & bytes_read, 0);
+      tag = read_uleb128 (start, & bytes_read, end);
       start += bytes_read;
+      if (start == end)
+       return NULL;
 
       children = *start++;
 
@@ -643,11 +769,15 @@ process_abbrev_section (unsigned char *start, unsigned char *end)
        {
          unsigned long form;
 
-         attribute = read_leb128 (start, & bytes_read, 0);
+         attribute = read_uleb128 (start, & bytes_read, end);
          start += bytes_read;
+         if (start == end)
+           break;
 
-         form = read_leb128 (start, & bytes_read, 0);
+         form = read_uleb128 (start, & bytes_read, end);
          start += bytes_read;
+         if (start == end)
+           break;
 
          add_abbrev_attr (attribute, form);
        }
@@ -697,10 +827,17 @@ get_FORM_name (unsigned long form)
 }
 
 static unsigned char *
-display_block (unsigned char *data, dwarf_vma length)
+display_block (unsigned char *data,
+              dwarf_vma length,
+              const unsigned char * const end)
 {
+  dwarf_vma maxlen;
+
   printf (_(" %s byte block: "), dwarf_vmatoa ("u", length));
 
+  maxlen = (dwarf_vma) (end - data);
+  length = length > maxlen ? maxlen : length;
+
   while (length --)
     printf ("%lx ", (unsigned long) byte_get (data++, 1));
 
@@ -719,6 +856,7 @@ decode_location_expression (unsigned char * data,
   unsigned op;
   unsigned int bytes_read;
   dwarf_vma uvalue;
+  dwarf_signed_vma svalue;
   unsigned char *end = data + length;
   int need_frame_base = 0;
 
@@ -729,53 +867,56 @@ decode_location_expression (unsigned char * data,
       switch (op)
        {
        case DW_OP_addr:
-         printf ("DW_OP_addr: %s",
-                 dwarf_vmatoa ("x", byte_get (data, pointer_size)));
-         data += pointer_size;
+         SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
+         printf ("DW_OP_addr: %s", dwarf_vmatoa ("x", uvalue));
          break;
        case DW_OP_deref:
          printf ("DW_OP_deref");
          break;
        case DW_OP_const1u:
-         printf ("DW_OP_const1u: %lu", (unsigned long) byte_get (data++, 1));
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         printf ("DW_OP_const1u: %lu", (unsigned long) uvalue);
          break;
        case DW_OP_const1s:
-         printf ("DW_OP_const1s: %ld", (long) byte_get_signed (data++, 1));
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 1, end);
+         printf ("DW_OP_const1s: %ld", (long) svalue);
          break;
        case DW_OP_const2u:
-         printf ("DW_OP_const2u: %lu", (unsigned long) byte_get (data, 2));
-         data += 2;
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 2, end);
+         printf ("DW_OP_const2u: %lu", (unsigned long) uvalue);
          break;
        case DW_OP_const2s:
-         printf ("DW_OP_const2s: %ld", (long) byte_get_signed (data, 2));
-         data += 2;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 2, end);
+         printf ("DW_OP_const2s: %ld", (long) svalue);
          break;
        case DW_OP_const4u:
-         printf ("DW_OP_const4u: %lu", (unsigned long) byte_get (data, 4));
-         data += 4;
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 4, end);
+         printf ("DW_OP_const4u: %lu", (unsigned long) uvalue);
          break;
        case DW_OP_const4s:
-         printf ("DW_OP_const4s: %ld", (long) byte_get_signed (data, 4));
-         data += 4;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 4, end);
+         printf ("DW_OP_const4s: %ld", (long) svalue);
          break;
        case DW_OP_const8u:
-         printf ("DW_OP_const8u: %lu %lu", (unsigned long) byte_get (data, 4),
-                 (unsigned long) byte_get (data + 4, 4));
-         data += 8;
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 4, end);
+         printf ("DW_OP_const8u: %lu ", (unsigned long) uvalue);
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 4, end);
+         printf ("%lu", (unsigned long) uvalue);
          break;
        case DW_OP_const8s:
-         printf ("DW_OP_const8s: %ld %ld", (long) byte_get (data, 4),
-                 (long) byte_get (data + 4, 4));
-         data += 8;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 4, end);
+         printf ("DW_OP_const8s: %ld ", (long) svalue);
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 4, end);
+         printf ("%ld", (long) svalue);
          break;
        case DW_OP_constu:
          printf ("DW_OP_constu: %s",
-                 dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
+                 dwarf_vmatoa ("u", read_uleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_consts:
          printf ("DW_OP_consts: %s",
-                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read)));
+                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_dup:
@@ -788,7 +929,8 @@ decode_location_expression (unsigned char * data,
          printf ("DW_OP_over");
          break;
        case DW_OP_pick:
-         printf ("DW_OP_pick: %ld", (unsigned long) byte_get (data++, 1));
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         printf ("DW_OP_pick: %ld", (unsigned long) uvalue);
          break;
        case DW_OP_swap:
          printf ("DW_OP_swap");
@@ -831,7 +973,7 @@ decode_location_expression (unsigned char * data,
          break;
        case DW_OP_plus_uconst:
          printf ("DW_OP_plus_uconst: %s",
-                 dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
+                 dwarf_vmatoa ("u", read_uleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_shl:
@@ -847,8 +989,8 @@ decode_location_expression (unsigned char * data,
          printf ("DW_OP_xor");
          break;
        case DW_OP_bra:
-         printf ("DW_OP_bra: %ld", (long) byte_get_signed (data, 2));
-         data += 2;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 2, end);
+         printf ("DW_OP_bra: %ld", (long) svalue);
          break;
        case DW_OP_eq:
          printf ("DW_OP_eq");
@@ -869,8 +1011,8 @@ decode_location_expression (unsigned char * data,
          printf ("DW_OP_ne");
          break;
        case DW_OP_skip:
-         printf ("DW_OP_skip: %ld", (long) byte_get_signed (data, 2));
-         data += 2;
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 2, end);
+         printf ("DW_OP_skip: %ld", (long) svalue);
          break;
 
        case DW_OP_lit0:
@@ -979,13 +1121,12 @@ decode_location_expression (unsigned char * data,
          printf ("DW_OP_breg%d (%s): %s",
                  op - DW_OP_breg0,
                  regname (op - DW_OP_breg0, 1),
-                 dwarf_vmatoa ("d", (dwarf_signed_vma)
-                   read_leb128 (data, &bytes_read, 1)));
+                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
 
        case DW_OP_regx:
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
          printf ("DW_OP_regx: %s (%s)",
                  dwarf_vmatoa ("u", uvalue), regname (uvalue, 1));
@@ -993,27 +1134,29 @@ decode_location_expression (unsigned char * data,
        case DW_OP_fbreg:
          need_frame_base = 1;
          printf ("DW_OP_fbreg: %s",
-                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read)));
+                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_bregx:
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
          printf ("DW_OP_bregx: %s (%s) %s",
                  dwarf_vmatoa ("u", uvalue), regname (uvalue, 1),
-                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read)));
+                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_piece:
          printf ("DW_OP_piece: %s",
-                 dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
+                 dwarf_vmatoa ("u", read_uleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
        case DW_OP_deref_size:
-         printf ("DW_OP_deref_size: %ld", (long) byte_get (data++, 1));
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         printf ("DW_OP_deref_size: %ld", (long) uvalue);
          break;
        case DW_OP_xderef_size:
-         printf ("DW_OP_xderef_size: %ld", (long) byte_get (data++, 1));
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         printf ("DW_OP_xderef_size: %ld", (long) uvalue);
          break;
        case DW_OP_nop:
          printf ("DW_OP_nop");
@@ -1026,18 +1169,16 @@ decode_location_expression (unsigned char * data,
        case DW_OP_call2:
          /* XXX: Strictly speaking for 64-bit DWARF3 files
             this ought to be an 8-byte wide computation.  */
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 2, end);
          printf ("DW_OP_call2: <0x%s>",
-                 dwarf_vmatoa ("x", (dwarf_signed_vma) byte_get (data, 2)
-                                    + cu_offset));
-         data += 2;
+                 dwarf_vmatoa ("x", svalue + cu_offset));
          break;
        case DW_OP_call4:
          /* XXX: Strictly speaking for 64-bit DWARF3 files
             this ought to be an 8-byte wide computation.  */
+         SAFE_SIGNED_BYTE_GET_AND_INC (svalue, data, 4, end);
          printf ("DW_OP_call4: <0x%s>",
-                 dwarf_vmatoa ("x", (dwarf_signed_vma) byte_get (data, 4)
-                                    + cu_offset));
-         data += 4;
+                 dwarf_vmatoa ("x", svalue + cu_offset));
          break;
        case DW_OP_call_ref:
          /* XXX: Strictly speaking for 64-bit DWARF3 files
@@ -1050,16 +1191,13 @@ decode_location_expression (unsigned char * data,
            }
          if (dwarf_version == 2)
            {
-             printf ("DW_OP_call_ref: <0x%s>",
-                     dwarf_vmatoa ("x", byte_get (data, pointer_size)));
-             data += pointer_size;
+             SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
            }
          else
            {
-             printf ("DW_OP_call_ref: <0x%s>",
-                     dwarf_vmatoa ("x", byte_get (data, offset_size)));
-             data += offset_size;
+             SAFE_BYTE_GET_AND_INC (uvalue, data, offset_size, end);
            }
+         printf ("DW_OP_call_ref: <0x%s>", dwarf_vmatoa ("x", uvalue));
          break;
        case DW_OP_form_tls_address:
          printf ("DW_OP_form_tls_address");
@@ -1070,10 +1208,10 @@ decode_location_expression (unsigned char * data,
        case DW_OP_bit_piece:
          printf ("DW_OP_bit_piece: ");
          printf (_("size: %s "),
-                 dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
+                 dwarf_vmatoa ("u", read_uleb128 (data, &bytes_read, end)));
          data += bytes_read;
          printf (_("offset: %s "),
-                 dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
+                 dwarf_vmatoa ("u", read_uleb128 (data, &bytes_read, end)));
          data += bytes_read;
          break;
 
@@ -1084,9 +1222,9 @@ decode_location_expression (unsigned char * data,
 
        case DW_OP_implicit_value:
          printf ("DW_OP_implicit_value");
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
-         display_block (data, uvalue);
+         display_block (data, uvalue, end);
          data += uvalue;
          break;
 
@@ -1122,23 +1260,20 @@ decode_location_expression (unsigned char * data,
            }
          if (dwarf_version == 2)
            {
-             printf ("DW_OP_GNU_implicit_pointer: <0x%s> %s",
-                     dwarf_vmatoa ("x", byte_get (data, pointer_size)),
-                     dwarf_vmatoa ("d", read_sleb128 (data + pointer_size,
-                                    &bytes_read)));
-             data += pointer_size + bytes_read;
+             SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
            }
          else
            {
-             printf ("DW_OP_GNU_implicit_pointer: <0x%s> %s",
-                     dwarf_vmatoa ("x", byte_get (data, offset_size)),
-                     dwarf_vmatoa ("d", read_sleb128 (data + offset_size,
-                                    &bytes_read)));
-             data += offset_size + bytes_read;
+             SAFE_BYTE_GET_AND_INC (uvalue, data, offset_size, end);
            }
+         printf ("DW_OP_GNU_implicit_pointer: <0x%s> %s",
+                 dwarf_vmatoa ("x", uvalue),
+                 dwarf_vmatoa ("d", read_sleb128 (data,
+                                                  &bytes_read, end)));
+         data += bytes_read;
          break;
        case DW_OP_GNU_entry_value:
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
          printf ("DW_OP_GNU_entry_value: (");
          if (decode_location_expression (data, pointer_size, offset_size,
@@ -1149,53 +1284,54 @@ decode_location_expression (unsigned char * data,
          data += uvalue;
          break;
        case DW_OP_GNU_const_type:
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
          printf ("DW_OP_GNU_const_type: <0x%s> ",
                  dwarf_vmatoa ("x", cu_offset + uvalue));
-         uvalue = byte_get (data++, 1);
-         display_block (data, uvalue);
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         display_block (data, uvalue, end);
          data += uvalue;
          break;
        case DW_OP_GNU_regval_type:
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
          printf ("DW_OP_GNU_regval_type: %s (%s)",
                  dwarf_vmatoa ("u", uvalue), regname (uvalue, 1));
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
          printf (" <0x%s>", dwarf_vmatoa ("x", cu_offset + uvalue));
          break;
        case DW_OP_GNU_deref_type:
-         printf ("DW_OP_GNU_deref_type: %ld", (long) byte_get (data++, 1));
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
+         printf ("DW_OP_GNU_deref_type: %ld", (long) uvalue);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
          printf (" <0x%s>", dwarf_vmatoa ("x", cu_offset + uvalue));
          break;
        case DW_OP_GNU_convert:
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
          printf ("DW_OP_GNU_convert <0x%s>",
                  dwarf_vmatoa ("x", uvalue ? cu_offset + uvalue : 0));
          break;
        case DW_OP_GNU_reinterpret:
-         uvalue = read_leb128 (data, &bytes_read, 0);
+         uvalue = read_uleb128 (data, &bytes_read, end);
          data += bytes_read;
          printf ("DW_OP_GNU_reinterpret <0x%s>",
                  dwarf_vmatoa ("x", uvalue ? cu_offset + uvalue : 0));
          break;
        case DW_OP_GNU_parameter_ref:
+         SAFE_BYTE_GET_AND_INC (uvalue, data, 4, end);
          printf ("DW_OP_GNU_parameter_ref: <0x%s>",
-                 dwarf_vmatoa ("x", cu_offset + byte_get (data, 4)));
-         data += 4;
+                 dwarf_vmatoa ("x", cu_offset + uvalue));
          break;
         case DW_OP_GNU_addr_index:
-          uvalue = read_leb128 (data, &bytes_read, 0);
+          uvalue = read_uleb128 (data, &bytes_read, end);
           data += bytes_read;
           printf ("DW_OP_GNU_addr_index <0x%s>", dwarf_vmatoa ("x", uvalue));
           break;
         case DW_OP_GNU_const_index:
-          uvalue = read_leb128 (data, &bytes_read, 0);
+          uvalue = read_uleb128 (data, &bytes_read, end);
           data += bytes_read;
           printf ("DW_OP_GNU_const_index <0x%s>", dwarf_vmatoa ("x", uvalue));
           break;
@@ -1253,23 +1389,63 @@ decode_location_expression (unsigned char * data,
   return need_frame_base;
 }
 
+/* Find the CU or TU set corresponding to the given CU_OFFSET.
+   This is used for DWARF package files.  */
+
+static struct cu_tu_set *
+find_cu_tu_set_v2 (dwarf_vma cu_offset, int do_types)
+{
+  struct cu_tu_set *p;
+  unsigned int nsets;
+  unsigned int dw_sect;
+
+  if (do_types)
+    {
+      p = tu_sets;
+      nsets = tu_count;
+      dw_sect = DW_SECT_TYPES;
+    }
+  else
+    {
+      p = cu_sets;
+      nsets = cu_count;
+      dw_sect = DW_SECT_INFO;
+    }
+  while (nsets > 0)
+    {
+      if (p->section_offsets [dw_sect] == cu_offset)
+       return p;
+      p++;
+      nsets--;
+    }
+  return NULL;
+}
+
 static unsigned char *
 read_and_display_attr_value (unsigned long attribute,
                             unsigned long form,
                             unsigned char * data,
+                            unsigned char * end,
                             dwarf_vma cu_offset,
                             dwarf_vma pointer_size,
                             dwarf_vma offset_size,
                             int dwarf_version,
                             debug_info * debug_info_p,
                             int do_loc,
-                            struct dwarf_section * section)
+                            struct dwarf_section * section,
+                            struct cu_tu_set * this_set)
 {
   dwarf_vma uvalue = 0;
   unsigned char *block_start = NULL;
   unsigned char * orig_data = data;
   unsigned int bytes_read;
 
+  if (data == end)
+    {
+      warn (_("corrupt attribute\n"));
+      return data;
+    }
+
   switch (form)
     {
     default:
@@ -1277,31 +1453,23 @@ read_and_display_attr_value (unsigned long attribute,
 
     case DW_FORM_ref_addr:
       if (dwarf_version == 2)
-       {
-         uvalue = byte_get (data, pointer_size);
-         data += pointer_size;
-       }
+       SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
       else if (dwarf_version == 3 || dwarf_version == 4)
-       {
-         uvalue = byte_get (data, offset_size);
-         data += offset_size;
-       }
+       SAFE_BYTE_GET_AND_INC (uvalue, data, offset_size, end);
       else
        error (_("Internal error: DWARF version is not 2, 3 or 4.\n"));
 
       break;
 
     case DW_FORM_addr:
-      uvalue = byte_get (data, pointer_size);
-      data += pointer_size;
+      SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
       break;
 
     case DW_FORM_strp:
     case DW_FORM_sec_offset:
     case DW_FORM_GNU_ref_alt:
     case DW_FORM_GNU_strp_alt:
-      uvalue = byte_get (data, offset_size);
-      data += offset_size;
+      SAFE_BYTE_GET_AND_INC (uvalue, data, offset_size, end);
       break;
 
     case DW_FORM_flag_present:
@@ -1311,49 +1479,47 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_FORM_ref1:
     case DW_FORM_flag:
     case DW_FORM_data1:
-      uvalue = byte_get (data++, 1);
+      SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
       break;
 
     case DW_FORM_ref2:
     case DW_FORM_data2:
-      uvalue = byte_get (data, 2);
-      data += 2;
+      SAFE_BYTE_GET_AND_INC (uvalue, data, 2, end);
       break;
 
     case DW_FORM_ref4:
     case DW_FORM_data4:
-      uvalue = byte_get (data, 4);
-      data += 4;
+      SAFE_BYTE_GET_AND_INC (uvalue, data, 4, end);
       break;
 
     case DW_FORM_sdata:
-      uvalue = read_leb128 (data, & bytes_read, 1);
+      uvalue = read_sleb128 (data, & bytes_read, end);
       data += bytes_read;
       break;
 
     case DW_FORM_GNU_str_index:
-      uvalue = read_leb128 (data, & bytes_read, 0);
+      uvalue = read_uleb128 (data, & bytes_read, end);
       data += bytes_read;
       break;
 
     case DW_FORM_ref_udata:
     case DW_FORM_udata:
-      uvalue = read_leb128 (data, & bytes_read, 0);
+      uvalue = read_uleb128 (data, & bytes_read, end);
       data += bytes_read;
       break;
 
     case DW_FORM_indirect:
-      form = read_leb128 (data, & bytes_read, 0);
+      form = read_uleb128 (data, & bytes_read, end);
       data += bytes_read;
       if (!do_loc)
        printf (" %s", get_FORM_name (form));
-      return read_and_display_attr_value (attribute, form, data,
+      return read_and_display_attr_value (attribute, form, data, end,
                                          cu_offset, pointer_size,
                                          offset_size, dwarf_version,
                                          debug_info_p, do_loc,
-                                         section);
+                                         section, this_set);
     case DW_FORM_GNU_addr_index:
-      uvalue = read_leb128 (data, & bytes_read, 0);
+      uvalue = read_uleb128 (data, & bytes_read, end);
       data += bytes_read;
       break;
     }
@@ -1402,62 +1568,65 @@ read_and_display_attr_value (unsigned long attribute,
          dwarf_vma high_bits;
          char buf[64];
 
-         byte_get_64 (data, &high_bits, &uvalue);
+         SAFE_BYTE_GET64 (data, &high_bits, &uvalue, end);
+
          printf (" 0x%s",
                  dwarf_vmatoa64 (high_bits, uvalue, buf, sizeof (buf)));
        }
+
       if ((do_loc || do_debug_loc || do_debug_ranges)
          && num_debug_info_entries == 0)
        {
          if (sizeof (uvalue) == 8)
-           uvalue = byte_get (data, 8);
+           SAFE_BYTE_GET (uvalue, data, 8, end);
          else
            error (_("DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n"));
        }
+
       data += 8;
       break;
 
     case DW_FORM_string:
       if (!do_loc)
-       printf (" %s", data);
-      data += strlen ((char *) data) + 1;
+       printf (" %.*s", (int) (end - data), data);
+      data += strnlen ((char *) data, end - data) + 1;
       break;
 
     case DW_FORM_block:
     case DW_FORM_exprloc:
-      uvalue = read_leb128 (data, & bytes_read, 0);
+      uvalue = read_uleb128 (data, & bytes_read, end);
       block_start = data + bytes_read;
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue);
+       data = display_block (block_start, uvalue, end);
       break;
 
     case DW_FORM_block1:
-      uvalue = byte_get (data, 1);
+      SAFE_BYTE_GET (uvalue, data, 1, end);
       block_start = data + 1;
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue);
+       data = display_block (block_start, uvalue, end);
       break;
 
     case DW_FORM_block2:
-      uvalue = byte_get (data, 2);
+      SAFE_BYTE_GET (uvalue, data, 2, end);
       block_start = data + 2;
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue);
+       data = display_block (block_start, uvalue, end);
       break;
 
     case DW_FORM_block4:
-      uvalue = byte_get (data, 4);
+      SAFE_BYTE_GET (uvalue, data, 4, end);
       block_start = data + 4;
       if (do_loc)
        data = block_start + uvalue;
       else
-       data = display_block (block_start, uvalue);
+       data = display_block (block_start, uvalue, end);
       break;
 
     case DW_FORM_strp:
@@ -1475,7 +1644,7 @@ read_and_display_attr_value (unsigned long attribute,
 
           printf (_(" (indexed string: 0x%s): %s"),
                   dwarf_vmatoa ("x", uvalue),
-                  fetch_indexed_string (uvalue, offset_size, dwo));
+                  fetch_indexed_string (uvalue, this_set, offset_size, dwo));
         }
       break;
 
@@ -1495,7 +1664,7 @@ read_and_display_attr_value (unsigned long attribute,
          dwarf_vma high_bits;
          char buf[64];
 
-         byte_get_64 (data, &high_bits, &uvalue);
+         SAFE_BYTE_GET64 (data, &high_bits, &uvalue, end);
          printf (" signature: 0x%s",
                  dwarf_vmatoa64 (high_bits, uvalue, buf, sizeof (buf)));
        }
@@ -1553,6 +1722,8 @@ read_and_display_attr_value (unsigned long attribute,
                                 lmax, sizeof (*debug_info_p->have_frame_base));
                  debug_info_p->max_loc_offsets = lmax;
                }
+             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++;
@@ -1842,7 +2013,7 @@ read_and_display_attr_value (unsigned long attribute,
            unsigned long abbrev_number;
            abbrev_entry * entry;
 
-           abbrev_number = read_leb128 (section->start + uvalue, NULL, 0);
+           abbrev_number = read_uleb128 (section->start + uvalue, NULL, end);
 
            printf (_("[Abbrev Number: %ld"), abbrev_number);
            /* Don't look up abbrev for DW_FORM_ref_addr, as it very often will
@@ -1898,26 +2069,27 @@ static unsigned char *
 read_and_display_attr (unsigned long attribute,
                       unsigned long form,
                       unsigned char * data,
+                      unsigned char * end,
                       dwarf_vma cu_offset,
                       dwarf_vma pointer_size,
                       dwarf_vma offset_size,
                       int dwarf_version,
                       debug_info * debug_info_p,
                       int do_loc,
-                      struct dwarf_section * section)
+                      struct dwarf_section * section,
+                      struct cu_tu_set * this_set)
 {
   if (!do_loc)
     printf ("   %-18s:", get_AT_name (attribute));
-  data = read_and_display_attr_value (attribute, form, data, cu_offset,
-                                     pointer_size, offset_size,
+  data = read_and_display_attr_value (attribute, form, data, end,
+                                     cu_offset, pointer_size, offset_size,
                                      dwarf_version, debug_info_p,
-                                     do_loc, section);
+                                     do_loc, section, this_set);
   if (!do_loc)
     printf ("\n");
   return data;
 }
 
-
 /* Process the contents of a .debug_info section.  If do_loc is non-zero
    then we are scanning for location lists and we do not want to display
    anything to the user.  If do_types is non-zero, we are processing
@@ -1949,11 +2121,11 @@ process_debug_info (struct dwarf_section *section,
          /* Read the first 4 bytes.  For a 32-bit DWARF section, this
             will be the length.  For a 64-bit DWARF section, it'll be
             the escape code 0xffffffff followed by an 8 byte length.  */
-         length = byte_get (section_begin, 4);
+         SAFE_BYTE_GET (length, section_begin, 4, end);
 
          if (length == 0xffffffff)
            {
-             length = byte_get (section_begin + 4, 8);
+             SAFE_BYTE_GET (length, section_begin + 4, 8, end);
              section_begin += length + 12;
            }
          else if (length >= 0xfffffff0 && length < 0xffffffff)
@@ -2025,16 +2197,17 @@ process_debug_info (struct dwarf_section *section,
       dwarf_vma signature_high = 0;
       dwarf_vma signature_low = 0;
       dwarf_vma type_offset = 0;
+      struct cu_tu_set *this_set;
+      dwarf_vma abbrev_base;
+      size_t abbrev_size;
 
       hdrptr = start;
 
-      compunit.cu_length = byte_get (hdrptr, 4);
-      hdrptr += 4;
+      SAFE_BYTE_GET_AND_INC (compunit.cu_length, hdrptr, 4, end);
 
       if (compunit.cu_length == 0xffffffff)
        {
-         compunit.cu_length = byte_get (hdrptr, 8);
-         hdrptr += 8;
+         SAFE_BYTE_GET_AND_INC (compunit.cu_length, hdrptr, 8, end);
          offset_size = 8;
          initial_length_size = 12;
        }
@@ -2044,23 +2217,32 @@ process_debug_info (struct dwarf_section *section,
          initial_length_size = 4;
        }
 
-      compunit.cu_version = byte_get (hdrptr, 2);
-      hdrptr += 2;
+      SAFE_BYTE_GET_AND_INC (compunit.cu_version, hdrptr, 2, end);
 
       cu_offset = start - section_begin;
 
-      compunit.cu_abbrev_offset = byte_get (hdrptr, offset_size);
-      hdrptr += offset_size;
+      this_set = find_cu_tu_set_v2 (cu_offset, do_types);
 
-      compunit.cu_pointer_size = byte_get (hdrptr, 1);
-      hdrptr += 1;
+      SAFE_BYTE_GET_AND_INC (compunit.cu_abbrev_offset, hdrptr, offset_size, end);
+
+      if (this_set == NULL)
+       {
+         abbrev_base = 0;
+         abbrev_size = debug_displays [abbrev_sec].section.size;
+       }
+      else
+       {
+         abbrev_base = this_set->section_offsets [DW_SECT_ABBREV];
+         abbrev_size = this_set->section_sizes [DW_SECT_ABBREV];
+       }
+
+      SAFE_BYTE_GET_AND_INC (compunit.cu_pointer_size, hdrptr, 1, end);
 
       if (do_types)
         {
-          byte_get_64 (hdrptr, &signature_high, &signature_low);
-          hdrptr += 8;
-          type_offset = byte_get (hdrptr, offset_size);
-          hdrptr += offset_size;
+         SAFE_BYTE_GET64 (hdrptr, &signature_high, &signature_low, end);
+         hdrptr += 8;
+         SAFE_BYTE_GET_AND_INC (type_offset, hdrptr, offset_size, end);
         }
 
       if ((do_loc || do_debug_loc || do_debug_ranges)
@@ -2105,6 +2287,25 @@ process_debug_info (struct dwarf_section *section,
              printf (_("   Type Offset:   0x%s\n"),
                      dwarf_vmatoa ("x", type_offset));
            }
+         if (this_set != NULL)
+           {
+             dwarf_vma *offsets = this_set->section_offsets;
+             size_t *sizes = this_set->section_sizes;
+
+             printf (_("   Section contributions:\n"));
+             printf (_("    .debug_abbrev.dwo:       0x%s  0x%s\n"),
+                     dwarf_vmatoa ("x", offsets [DW_SECT_ABBREV]),
+                     dwarf_vmatoa ("x", sizes [DW_SECT_ABBREV]));
+             printf (_("    .debug_line.dwo:         0x%s  0x%s\n"),
+                     dwarf_vmatoa ("x", offsets [DW_SECT_LINE]),
+                     dwarf_vmatoa ("x", sizes [DW_SECT_LINE]));
+             printf (_("    .debug_loc.dwo:          0x%s  0x%s\n"),
+                     dwarf_vmatoa ("x", offsets [DW_SECT_LOC]),
+                     dwarf_vmatoa ("x", sizes [DW_SECT_LOC]));
+             printf (_("    .debug_str_offsets.dwo:  0x%s  0x%s\n"),
+                     dwarf_vmatoa ("x", offsets [DW_SECT_STR_OFFSETS]),
+                     dwarf_vmatoa ("x", sizes [DW_SECT_STR_OFFSETS]));
+           }
        }
 
       if (cu_offset + compunit.cu_length + initial_length_size
@@ -2133,16 +2334,16 @@ process_debug_info (struct dwarf_section *section,
 
       /* Process the abbrevs used by this compilation unit. DWARF
         sections under Mach-O have non-zero addresses.  */
-      if (compunit.cu_abbrev_offset >= debug_displays [abbrev_sec].section.size)
+      if (compunit.cu_abbrev_offset >= abbrev_size)
        warn (_("Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section size (%lx)\n"),
              (unsigned long) compunit.cu_abbrev_offset,
-             (unsigned long) debug_displays [abbrev_sec].section.size);
+             (unsigned long) abbrev_size);
       else
        process_abbrev_section
-         ((unsigned char *) debug_displays [abbrev_sec].section.start
-          + compunit.cu_abbrev_offset,
-          (unsigned char *) debug_displays [abbrev_sec].section.start
-          + debug_displays [abbrev_sec].section.size);
+         (((unsigned char *) debug_displays [abbrev_sec].section.start
+           + abbrev_base + compunit.cu_abbrev_offset),
+          ((unsigned char *) debug_displays [abbrev_sec].section.start
+           + abbrev_base + abbrev_size));
 
       level = 0;
       last_level = level;
@@ -2158,7 +2359,7 @@ process_debug_info (struct dwarf_section *section,
 
          die_offset = tags - section_begin;
 
-         abbrev_number = read_leb128 (tags, & bytes_read, 0);
+         abbrev_number = read_uleb128 (tags, & bytes_read, start);
          tags += bytes_read;
 
          /* A null DIE marks the end of a list of siblings or it may also be
@@ -2177,7 +2378,9 @@ process_debug_info (struct dwarf_section *section,
                    break;
                }
 
-             if (!do_loc && die_offset >= dwarf_start_die)
+             if (!do_loc && die_offset >= dwarf_start_die
+                 && (dwarf_cutoff_level == -1
+                     || level < dwarf_cutoff_level))
                printf (_(" <%d><%lx>: Abbrev Number: 0\n"),
                        level, die_offset);
 
@@ -2274,12 +2477,16 @@ process_debug_info (struct dwarf_section *section,
 
              tags = read_and_display_attr (attr->attribute,
                                            attr->form,
-                                           tags, cu_offset,
+                                           tags,
+                                           end,
+                                           cu_offset,
                                            compunit.cu_pointer_size,
                                            offset_size,
                                            compunit.cu_version,
                                            arg,
-                                           do_loc || ! do_printing, section);
+                                           do_loc || ! do_printing,
+                                           section,
+                                           this_set);
            }
 
          if (entry->children)
@@ -2323,6 +2530,9 @@ load_debug_info (void * file)
   if (num_debug_info_entries > 0)
     return num_debug_info_entries;
 
+  /* If this is a DWARF package file, load the CU and TU indexes.  */
+  load_cu_tu_indexes (file);
+
   if (load_debug_section (info, file)
       && process_debug_info (&debug_displays [info].section, file, abbrev, 1, 0))
     return num_debug_info_entries;
@@ -2335,39 +2545,33 @@ load_debug_info (void * file)
   return 0;
 }
 
-static int
-display_debug_lines_raw (struct dwarf_section *section,
-                        unsigned char *data,
-                         unsigned char *end)
-{
-  unsigned char *start = section->start;
-
-  printf (_("Raw dump of debug contents of section %s:\n\n"),
-          section->name);
+/* Read a DWARF .debug_line section header starting at DATA.
+   Upon success returns an updated DATA pointer and the LINFO
+   structure and the END_OF_SEQUENCE pointer will be filled in.
+   Otherwise returns NULL.  */
 
-  while (data < end)
-    {
-      DWARF2_Internal_LineInfo linfo;
-      unsigned char *standard_opcodes;
-      unsigned char *end_of_sequence;
-      unsigned char *hdrptr;
-      unsigned long hdroff;
-      int initial_length_size;
-      int offset_size;
-      int i;
+static unsigned char *
+read_debug_line_header (struct dwarf_section * section,
+                       unsigned char * data,
+                       unsigned char * end,
+                       DWARF2_Internal_LineInfo * linfo,
+                       unsigned char ** end_of_sequence)
+{
+  unsigned char *hdrptr;
+  unsigned int offset_size;
+  unsigned int initial_length_size;
 
+  /* Extract information from the Line Number Program Header.
+     (section 6.2.4 in the Dwarf3 doc).  */
       hdrptr = data;
-      hdroff = hdrptr - start;
 
-      /* Check the length of the block.  */
-      linfo.li_length = byte_get (hdrptr, 4);
-      hdrptr += 4;
+  /* Get and check the length of the block.  */
+  SAFE_BYTE_GET_AND_INC (linfo->li_length, hdrptr, 4, end);
 
-      if (linfo.li_length == 0xffffffff)
+  if (linfo->li_length == 0xffffffff)
        {
          /* This section is 64-bit DWARF 3.  */
-         linfo.li_length = byte_get (hdrptr, 8);
-         hdrptr += 8;
+      SAFE_BYTE_GET_AND_INC (linfo->li_length, hdrptr, 8, end);
          offset_size = 8;
          initial_length_size = 12;
        }
@@ -2377,316 +2581,384 @@ display_debug_lines_raw (struct dwarf_section *section,
          initial_length_size = 4;
        }
 
-      if (linfo.li_length + initial_length_size > section->size)
+  if (linfo->li_length + initial_length_size > section->size)
        {
-         warn
-           (_("The information in section %s appears to be corrupt - the section is too small\n"),
-            section->name);
-         return 0;
+      /* If the length is just a bias against the initial_length_size then
+        this means that the field has a relocation against it which has not
+        been applied.  (Ie we are dealing with an object file, not a linked
+        binary).  Do not complain but instead assume that the rest of the
+        section applies to this particular header.  */
+      if (linfo->li_length == - initial_length_size)
+       {
+         linfo->li_length = section->size - initial_length_size;
+       }
+      else
+       {
+         warn (_("The line info appears to be corrupt - "
+                 "the section is too small\n"));
+         return NULL;
        }
+       }
+
+  /* Get and check the version number.  */
+  SAFE_BYTE_GET_AND_INC (linfo->li_version, hdrptr, 2, end);
 
-      /* Check its version number.  */
-      linfo.li_version = byte_get (hdrptr, 2);
-      hdrptr += 2;
-      if (linfo.li_version != 2
-         && linfo.li_version != 3
-         && linfo.li_version != 4)
+  if (linfo->li_version != 2
+      && linfo->li_version != 3
+      && linfo->li_version != 4)
        {
          warn (_("Only DWARF version 2, 3 and 4 line info is currently supported.\n"));
-         return 0;
+      return NULL;
        }
 
-      linfo.li_prologue_length = byte_get (hdrptr, offset_size);
-      hdrptr += offset_size;
-      linfo.li_min_insn_length = byte_get (hdrptr, 1);
-      hdrptr++;
-      if (linfo.li_version >= 4)
+  SAFE_BYTE_GET_AND_INC (linfo->li_prologue_length, hdrptr, offset_size, end);
+  SAFE_BYTE_GET_AND_INC (linfo->li_min_insn_length, hdrptr, 1, end);
+
+  if (linfo->li_version >= 4)
        {
-         linfo.li_max_ops_per_insn = byte_get (hdrptr, 1);
-         hdrptr++;
-         if (linfo.li_max_ops_per_insn == 0)
+      SAFE_BYTE_GET_AND_INC (linfo->li_max_ops_per_insn, hdrptr, 1, end);
+
+      if (linfo->li_max_ops_per_insn == 0)
            {
              warn (_("Invalid maximum operations per insn.\n"));
-             return 0;
+         return NULL;
            }
        }
       else
-       linfo.li_max_ops_per_insn = 1;
-      linfo.li_default_is_stmt = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_line_base = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_line_range = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_opcode_base = byte_get (hdrptr, 1);
-      hdrptr++;
-
-      /* Sign extend the line base field.  */
-      linfo.li_line_base <<= 24;
-      linfo.li_line_base >>= 24;
-
-      printf (_("  Offset:                      0x%lx\n"), hdroff);
-      printf (_("  Length:                      %ld\n"), (long) linfo.li_length);
-      printf (_("  DWARF Version:               %d\n"), linfo.li_version);
-      printf (_("  Prologue Length:             %d\n"), linfo.li_prologue_length);
-      printf (_("  Minimum Instruction Length:  %d\n"), linfo.li_min_insn_length);
-      if (linfo.li_version >= 4)
-       printf (_("  Maximum Ops per Instruction: %d\n"), linfo.li_max_ops_per_insn);
-      printf (_("  Initial value of 'is_stmt':  %d\n"), linfo.li_default_is_stmt);
-      printf (_("  Line Base:                   %d\n"), linfo.li_line_base);
-      printf (_("  Line Range:                  %d\n"), linfo.li_line_range);
-      printf (_("  Opcode Base:                 %d\n"), linfo.li_opcode_base);
+    linfo->li_max_ops_per_insn = 1;
 
-      end_of_sequence = data + linfo.li_length + initial_length_size;
+  SAFE_BYTE_GET_AND_INC (linfo->li_default_is_stmt, hdrptr, 1, end);
+  SAFE_BYTE_GET_AND_INC (linfo->li_line_base, hdrptr, 1, end);
+  SAFE_BYTE_GET_AND_INC (linfo->li_line_range, hdrptr, 1, end);
+  SAFE_BYTE_GET_AND_INC (linfo->li_opcode_base, hdrptr, 1, end);
 
-      reset_state_machine (linfo.li_default_is_stmt);
+      /* Sign extend the line base field.  */
+  linfo->li_line_base <<= 24;
+  linfo->li_line_base >>= 24;
 
-      /* Display the contents of the Opcodes table.  */
-      standard_opcodes = hdrptr;
+  * end_of_sequence = data + linfo->li_length + initial_length_size;
+  return hdrptr;
+}
 
-      printf (_("\n Opcodes:\n"));
+static int
+display_debug_lines_raw (struct dwarf_section *section,
+                        unsigned char *data,
+                         unsigned char *end)
+{
+  unsigned char *start = section->start;
 
-      for (i = 1; i < linfo.li_opcode_base; i++)
-       printf (_("  Opcode %d has %d args\n"), i, standard_opcodes[i - 1]);
+  printf (_("Raw dump of debug contents of section %s:\n\n"),
+          section->name);
 
-      /* Display the contents of the Directory table.  */
-      data = standard_opcodes + linfo.li_opcode_base - 1;
+  while (data < end)
+    {
+      static DWARF2_Internal_LineInfo saved_linfo;
+      DWARF2_Internal_LineInfo linfo;
+      unsigned char *standard_opcodes;
+      unsigned char *end_of_sequence;
+       int i;
 
-      if (*data == 0)
-       printf (_("\n The Directory Table is empty.\n"));
-      else
+      if (const_strneq (section->name, ".debug_line.")
+         /* Note: the following does not apply to .debug_line.dwo sections.
+            These are full debug_line sections.  */
+         && strcmp (section->name, ".debug_line.dwo") != 0)
        {
-         printf (_("\n The Directory Table:\n"));
-
-         while (*data != 0)
-           {
-             printf ("  %s\n", data);
-
-             data += strlen ((char *) data) + 1;
-           }
+         /* Sections named .debug_line.<foo> are fragments of a .debug_line
+            section containing just the Line Number Statements.  They are
+            created by the assembler and intended to be used alongside gcc's
+            -ffunction-sections command line option.  When the linker's
+            garbage collection decides to discard a .text.<foo> section it
+            can then also discard the line number information in .debug_line.<foo>.
+
+            Since the section is a fragment it does not have the details
+            needed to fill out a LineInfo structure, so instead we use the
+            details from the last full debug_line section that we processed.  */
+         end_of_sequence = end;
+         standard_opcodes = NULL;
+         linfo = saved_linfo;
+         reset_state_machine (linfo.li_default_is_stmt);
        }
-
-      /* Skip the NUL at the end of the table.  */
-      data++;
-
-      /* Display the contents of the File Name table.  */
-      if (*data == 0)
-       printf (_("\n The File Name Table is empty.\n"));
       else
        {
-         printf (_("\n The File Name Table:\n"));
-         printf (_("  Entry\tDir\tTime\tSize\tName\n"));
+         unsigned char * hdrptr;
 
-         while (*data != 0)
-           {
-             unsigned char *name;
-             unsigned int bytes_read;
+         if ((hdrptr = read_debug_line_header (section, data, end, & linfo,
+                                               & end_of_sequence)) == NULL)
+           return 0;
 
-             printf ("  %d\t", ++state_machine_regs.last_file_entry);
-             name = data;
-
-             data += strlen ((char *) data) + 1;
-
-             printf ("%s\t",
-                     dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
-             data += bytes_read;
-             printf ("%s\t",
-                     dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
-             data += bytes_read;
-             printf ("%s\t",
-                     dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
-             data += bytes_read;
-             printf ("%s\n", name);
-           }
-       }
+         printf (_("  Offset:                      0x%lx\n"), (long)(data - start));
+         printf (_("  Length:                      %ld\n"), (long) linfo.li_length);
+         printf (_("  DWARF Version:               %d\n"), linfo.li_version);
+         printf (_("  Prologue Length:             %d\n"), linfo.li_prologue_length);
+         printf (_("  Minimum Instruction Length:  %d\n"), linfo.li_min_insn_length);
+         if (linfo.li_version >= 4)
+           printf (_("  Maximum Ops per Instruction: %d\n"), linfo.li_max_ops_per_insn);
+         printf (_("  Initial value of 'is_stmt':  %d\n"), linfo.li_default_is_stmt);
+         printf (_("  Line Base:                   %d\n"), linfo.li_line_base);
+         printf (_("  Line Range:                  %d\n"), linfo.li_line_range);
+         printf (_("  Opcode Base:                 %d\n"), linfo.li_opcode_base);
 
-      /* Skip the NUL at the end of the table.  */
-      data++;
+         reset_state_machine (linfo.li_default_is_stmt);
 
-      /* Now display the statements.  */
-      printf (_("\n Line Number Statements:\n"));
+         /* Display the contents of the Opcodes table.  */
+         standard_opcodes = hdrptr;
 
-      while (data < end_of_sequence)
-       {
-         unsigned char op_code;
-         dwarf_signed_vma adv;
-         dwarf_vma uladv;
-         unsigned int bytes_read;
+         printf (_("\n Opcodes:\n"));
 
-         op_code = *data++;
+         for (i = 1; i < linfo.li_opcode_base; i++)
+           printf (_("  Opcode %d has %d args\n"), i, standard_opcodes[i - 1]);
 
-         if (op_code >= linfo.li_opcode_base)
-           {
-             op_code -= linfo.li_opcode_base;
-             uladv = (op_code / linfo.li_line_range);
-             if (linfo.li_max_ops_per_insn == 1)
-               {
-                 uladv *= linfo.li_min_insn_length;
-                 state_machine_regs.address += uladv;
-                 printf (_("  Special opcode %d: "
-                           "advance Address by %s to 0x%s"),
-                         op_code, dwarf_vmatoa ("u", uladv),
-                         dwarf_vmatoa ("x", state_machine_regs.address));
-               }
-             else
-               {
-                 state_machine_regs.address
-                   += ((state_machine_regs.op_index + uladv)
-                       / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
-                 state_machine_regs.op_index
-                   = (state_machine_regs.op_index + uladv)
-                     % linfo.li_max_ops_per_insn;
-                 printf (_("  Special opcode %d: "
-                           "advance Address by %s to 0x%s[%d]"),
-                         op_code, dwarf_vmatoa ("u", uladv),
-                         dwarf_vmatoa ("x", state_machine_regs.address),
-                         state_machine_regs.op_index);
-               }
-             adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
-             state_machine_regs.line += adv;
-             printf (_(" and Line by %s to %d\n"),
-                     dwarf_vmatoa ("d", adv), state_machine_regs.line);
-           }
-         else switch (op_code)
-           {
-           case DW_LNS_extended_op:
-             data += process_extended_line_op (data, linfo.li_default_is_stmt);
-             break;
+         /* Display the contents of the Directory table.  */
+         data = standard_opcodes + linfo.li_opcode_base - 1;
 
-           case DW_LNS_copy:
-             printf (_("  Copy\n"));
-             break;
+         if (*data == 0)
+           printf (_("\n The Directory Table is empty.\n"));
+         else
+           {
+             printf (_("\n The Directory Table:\n"));
 
-           case DW_LNS_advance_pc:
-             uladv = read_leb128 (data, & bytes_read, 0);
-             data += bytes_read;
-             if (linfo.li_max_ops_per_insn == 1)
-               {
-                 uladv *= linfo.li_min_insn_length;
-                 state_machine_regs.address += uladv;
-                 printf (_("  Advance PC by %s to 0x%s\n"),
-                         dwarf_vmatoa ("u", uladv),
-                         dwarf_vmatoa ("x", state_machine_regs.address));
-               }
-             else
+             while (*data != 0)
                {
-                 state_machine_regs.address
-                   += ((state_machine_regs.op_index + uladv)
-                       / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
-                 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"),
-                         dwarf_vmatoa ("u", uladv),
-                         dwarf_vmatoa ("x", state_machine_regs.address),
-                         state_machine_regs.op_index);
+                 printf ("  %s\n", data);
+
+                 data += strnlen ((char *) data, end - data) + 1;
                }
-             break;
+           }
 
-           case DW_LNS_advance_line:
-             adv = read_sleb128 (data, & bytes_read);
-             data += bytes_read;
-             state_machine_regs.line += adv;
-             printf (_("  Advance Line by %s to %d\n"),
-                       dwarf_vmatoa ("d", adv),
-                       state_machine_regs.line);
-             break;
+         /* Skip the NUL at the end of the table.  */
+         data++;
 
-           case DW_LNS_set_file:
-             adv = read_leb128 (data, & bytes_read, 0);
-             data += bytes_read;
-             printf (_("  Set File Name to entry %s in the File Name Table\n"),
-                     dwarf_vmatoa ("d", adv));
-             state_machine_regs.file = adv;
-             break;
+         /* Display the contents of the File Name table.  */
+         if (*data == 0)
+           printf (_("\n The File Name Table is empty.\n"));
+         else
+           {
+             printf (_("\n The File Name Table:\n"));
+             printf (_("  Entry\tDir\tTime\tSize\tName\n"));
 
-           case DW_LNS_set_column:
-             uladv = read_leb128 (data, & bytes_read, 0);
-             data += bytes_read;
-             printf (_("  Set column to %s\n"),
-                     dwarf_vmatoa ("u", uladv));
-             state_machine_regs.column = uladv;
-             break;
+             while (*data != 0)
+               {
+                 unsigned char *name;
+                 unsigned int bytes_read;
 
-           case DW_LNS_negate_stmt:
-             adv = state_machine_regs.is_stmt;
-             adv = ! adv;
-             printf (_("  Set is_stmt to %s\n"), dwarf_vmatoa ("d", adv));
-             state_machine_regs.is_stmt = adv;
-             break;
+                 printf ("  %d\t", ++state_machine_regs.last_file_entry);
+                 name = data;
+                 data += strnlen ((char *) data, end - data) + 1;
 
-           case DW_LNS_set_basic_block:
-             printf (_("  Set basic block\n"));
-             state_machine_regs.basic_block = 1;
-             break;
+                 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", name);
 
-           case DW_LNS_const_add_pc:
-             uladv = ((255 - linfo.li_opcode_base) / linfo.li_line_range);
-             if (linfo.li_max_ops_per_insn)
-               {
-                 uladv *= linfo.li_min_insn_length;
-                 state_machine_regs.address += uladv;
-                 printf (_("  Advance PC by constant %s to 0x%s\n"),
-                         dwarf_vmatoa ("u", uladv),
-                         dwarf_vmatoa ("x", state_machine_regs.address));
-               }
-             else
-               {
-                 state_machine_regs.address
-                   += ((state_machine_regs.op_index + uladv)
-                       / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
-                 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"),
-                         dwarf_vmatoa ("u", uladv),
-                         dwarf_vmatoa ("x", state_machine_regs.address),
-                         state_machine_regs.op_index);
+                 if (data == end)
+                   {
+                     warn (_("Corrupt file name table entry\n"));
+                     break;
+                   }
                }
-             break;
-
-           case DW_LNS_fixed_advance_pc:
-             uladv = byte_get (data, 2);
-             data += 2;
-             state_machine_regs.address += uladv;
-             state_machine_regs.op_index = 0;
-             printf (_("  Advance PC by fixed size amount %s to 0x%s\n"),
-                     dwarf_vmatoa ("u", uladv),
-                     dwarf_vmatoa ("x", state_machine_regs.address));
-             break;
+           }
 
-           case DW_LNS_set_prologue_end:
-             printf (_("  Set prologue_end to true\n"));
-             break;
+         /* Skip the NUL at the end of the table.  */
+         data++;
+         putchar ('\n');
+         saved_linfo = linfo;
+       }
 
-           case DW_LNS_set_epilogue_begin:
-             printf (_("  Set epilogue_begin to true\n"));
-             break;
+      /* Now display the statements.  */
+      if (data >= end_of_sequence)
+       printf (_(" No Line Number Statements.\n"));
+      else
+       {
+         printf (_(" Line Number Statements:\n"));
 
-           case DW_LNS_set_isa:
-             uladv = read_leb128 (data, & bytes_read, 0);
-             data += bytes_read;
-             printf (_("  Set ISA to %s\n"), dwarf_vmatoa ("u", uladv));
-             break;
+         while (data < end_of_sequence)
+           {
+             unsigned char op_code;
+             dwarf_signed_vma adv;
+             dwarf_vma uladv;
+             unsigned int bytes_read;
 
-           default:
-             printf (_("  Unknown opcode %d with operands: "), op_code);
+             op_code = *data++;
 
-             for (i = standard_opcodes[op_code - 1]; i > 0 ; --i)
+             if (op_code >= linfo.li_opcode_base)
                {
-                 printf ("0x%s%s", dwarf_vmatoa ("x", read_leb128 (data,
-                                                        &bytes_read, 0)),
-                         i == 1 ? "" : ", ");
-                 data += bytes_read;
+                 op_code -= linfo.li_opcode_base;
+                 uladv = (op_code / linfo.li_line_range);
+                 if (linfo.li_max_ops_per_insn == 1)
+                   {
+                     uladv *= linfo.li_min_insn_length;
+                     state_machine_regs.address += uladv;
+                     printf (_("  Special opcode %d: "
+                               "advance Address by %s to 0x%s"),
+                             op_code, dwarf_vmatoa ("u", uladv),
+                             dwarf_vmatoa ("x", state_machine_regs.address));
+                   }
+                 else
+                   {
+                     state_machine_regs.address
+                       += ((state_machine_regs.op_index + uladv)
+                           / linfo.li_max_ops_per_insn)
+                       * linfo.li_min_insn_length;
+                     state_machine_regs.op_index
+                       = (state_machine_regs.op_index + uladv)
+                       % linfo.li_max_ops_per_insn;
+                     printf (_("  Special opcode %d: "
+                               "advance Address by %s to 0x%s[%d]"),
+                             op_code, dwarf_vmatoa ("u", uladv),
+                             dwarf_vmatoa ("x", state_machine_regs.address),
+                             state_machine_regs.op_index);
+                   }
+                 adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
+                 state_machine_regs.line += adv;
+                 printf (_(" and Line by %s to %d\n"),
+                         dwarf_vmatoa ("d", adv), state_machine_regs.line);
                }
-             putchar ('\n');
-             break;
+             else switch (op_code)
+                    {
+                    case DW_LNS_extended_op:
+                      data += process_extended_line_op (data, linfo.li_default_is_stmt, end);
+                      break;
+
+                    case DW_LNS_copy:
+                      printf (_("  Copy\n"));
+                      break;
+
+                    case DW_LNS_advance_pc:
+                      uladv = read_uleb128 (data, & bytes_read, end);
+                      data += bytes_read;
+                      if (linfo.li_max_ops_per_insn == 1)
+                        {
+                          uladv *= linfo.li_min_insn_length;
+                          state_machine_regs.address += uladv;
+                          printf (_("  Advance PC by %s to 0x%s\n"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address));
+                        }
+                      else
+                        {
+                          state_machine_regs.address
+                            += ((state_machine_regs.op_index + uladv)
+                                / linfo.li_max_ops_per_insn)
+                            * linfo.li_min_insn_length;
+                          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"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address),
+                                  state_machine_regs.op_index);
+                        }
+                      break;
+
+                    case DW_LNS_advance_line:
+                      adv = read_sleb128 (data, & bytes_read, end);
+                      data += bytes_read;
+                      state_machine_regs.line += adv;
+                      printf (_("  Advance Line by %s to %d\n"),
+                              dwarf_vmatoa ("d", adv),
+                              state_machine_regs.line);
+                      break;
+
+                    case DW_LNS_set_file:
+                      adv = read_uleb128 (data, & bytes_read, end);
+                      data += bytes_read;
+                      printf (_("  Set File Name to entry %s in the File Name Table\n"),
+                              dwarf_vmatoa ("d", adv));
+                      state_machine_regs.file = adv;
+                      break;
+
+                    case DW_LNS_set_column:
+                      uladv = read_uleb128 (data, & bytes_read, end);
+                      data += bytes_read;
+                      printf (_("  Set column to %s\n"),
+                              dwarf_vmatoa ("u", uladv));
+                      state_machine_regs.column = uladv;
+                      break;
+
+                    case DW_LNS_negate_stmt:
+                      adv = state_machine_regs.is_stmt;
+                      adv = ! adv;
+                      printf (_("  Set is_stmt to %s\n"), dwarf_vmatoa ("d", adv));
+                      state_machine_regs.is_stmt = adv;
+                      break;
+
+                    case DW_LNS_set_basic_block:
+                      printf (_("  Set basic block\n"));
+                      state_machine_regs.basic_block = 1;
+                      break;
+
+                    case DW_LNS_const_add_pc:
+                      uladv = ((255 - linfo.li_opcode_base) / linfo.li_line_range);
+                      if (linfo.li_max_ops_per_insn)
+                        {
+                          uladv *= linfo.li_min_insn_length;
+                          state_machine_regs.address += uladv;
+                          printf (_("  Advance PC by constant %s to 0x%s\n"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address));
+                        }
+                      else
+                        {
+                          state_machine_regs.address
+                            += ((state_machine_regs.op_index + uladv)
+                                / linfo.li_max_ops_per_insn)
+                            * linfo.li_min_insn_length;
+                          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"),
+                                  dwarf_vmatoa ("u", uladv),
+                                  dwarf_vmatoa ("x", state_machine_regs.address),
+                                  state_machine_regs.op_index);
+                        }
+                      break;
+
+                    case DW_LNS_fixed_advance_pc:
+                      SAFE_BYTE_GET_AND_INC (uladv, data, 2, end);
+                      state_machine_regs.address += uladv;
+                      state_machine_regs.op_index = 0;
+                      printf (_("  Advance PC by fixed size amount %s to 0x%s\n"),
+                              dwarf_vmatoa ("u", uladv),
+                              dwarf_vmatoa ("x", state_machine_regs.address));
+                      break;
+
+                    case DW_LNS_set_prologue_end:
+                      printf (_("  Set prologue_end to true\n"));
+                      break;
+
+                    case DW_LNS_set_epilogue_begin:
+                      printf (_("  Set epilogue_begin to true\n"));
+                      break;
+
+                    case DW_LNS_set_isa:
+                      uladv = read_uleb128 (data, & bytes_read, end);
+                      data += bytes_read;
+                      printf (_("  Set ISA to %s\n"), dwarf_vmatoa ("u", uladv));
+                      break;
+
+                    default:
+                      printf (_("  Unknown opcode %d with operands: "), op_code);
+
+                      if (standard_opcodes != NULL)
+                        for (i = standard_opcodes[op_code - 1]; i > 0 ; --i)
+                          {
+                            printf ("0x%s%s", dwarf_vmatoa ("x", read_uleb128 (data,
+                                                                               &bytes_read, end)),
+                                    i == 1 ? "" : ", ");
+                            data += bytes_read;
+                          }
+                      putchar ('\n');
+                      break;
+                    }
            }
+         putchar ('\n');
        }
-      putchar ('\n');
     }
 
   return 1;
@@ -2707,6 +2979,8 @@ display_debug_lines_decoded (struct dwarf_section *section,
                             unsigned char *data,
                             unsigned char *end)
 {
+  static DWARF2_Internal_LineInfo saved_linfo;
+
   printf (_("Decoded dump of debug contents of section %s:\n\n"),
           section->name);
 
@@ -2716,188 +2990,136 @@ display_debug_lines_decoded (struct dwarf_section *section,
       DWARF2_Internal_LineInfo linfo;
       unsigned char *standard_opcodes;
       unsigned char *end_of_sequence;
-      unsigned char *hdrptr;
-      int initial_length_size;
-      int offset_size;
       int i;
       File_Entry *file_table = NULL;
       unsigned int n_files = 0;
       unsigned char **directory_table = NULL;
       unsigned int n_directories = 0;
 
-      hdrptr = data;
-
-      /* Extract information from the Line Number Program Header.
-        (section 6.2.4 in the Dwarf3 doc).  */
-
-      /* Get the length of this CU's line number information block.  */
-      linfo.li_length = byte_get (hdrptr, 4);
-      hdrptr += 4;
-
-      if (linfo.li_length == 0xffffffff)
+      if (const_strneq (section->name, ".debug_line.")
+         /* Note: the following does not apply to .debug_line.dwo sections.
+            These are full debug_line sections.  */
+         && strcmp (section->name, ".debug_line.dwo") != 0)
         {
-          /* This section is 64-bit DWARF 3.  */
-          linfo.li_length = byte_get (hdrptr, 8);
-          hdrptr += 8;
-          offset_size = 8;
-          initial_length_size = 12;
+         /* See comment in display_debug_lines_raw().  */
+         end_of_sequence = end;
+         standard_opcodes = NULL;
+         linfo = saved_linfo;
+         reset_state_machine (linfo.li_default_is_stmt);
         }
       else
         {
-          offset_size = 4;
-          initial_length_size = 4;
-        }
-
-      if (linfo.li_length + initial_length_size > section->size)
-        {
-          warn (_("The line info appears to be corrupt - "
-                  "the section is too small\n"));
-          return 0;
-        }
+         unsigned char *hdrptr;
 
-      /* Get this CU's Line Number Block version number.  */
-      linfo.li_version = byte_get (hdrptr, 2);
-      hdrptr += 2;
-      if (linfo.li_version != 2
-         && linfo.li_version != 3
-         && linfo.li_version != 4)
-        {
-          warn (_("Only DWARF version 2, 3 and 4 line info is currently "
-                "supported.\n"));
-          return 0;
-        }
-
-      linfo.li_prologue_length = byte_get (hdrptr, offset_size);
-      hdrptr += offset_size;
-      linfo.li_min_insn_length = byte_get (hdrptr, 1);
-      hdrptr++;
-      if (linfo.li_version >= 4)
-       {
-         linfo.li_max_ops_per_insn = byte_get (hdrptr, 1);
-         hdrptr++;
-         if (linfo.li_max_ops_per_insn == 0)
-           {
-             warn (_("Invalid maximum operations per insn.\n"));
+         if ((hdrptr = read_debug_line_header (section, data, end, & linfo,
+                                               & end_of_sequence)) == NULL)
              return 0;
-           }
-       }
-      else
-       linfo.li_max_ops_per_insn = 1;
-      linfo.li_default_is_stmt = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_line_base = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_line_range = byte_get (hdrptr, 1);
-      hdrptr++;
-      linfo.li_opcode_base = byte_get (hdrptr, 1);
-      hdrptr++;
 
-      /* Sign extend the line base field.  */
-      linfo.li_line_base <<= 24;
-      linfo.li_line_base >>= 24;
+         reset_state_machine (linfo.li_default_is_stmt);
 
-      /* Find the end of this CU's Line Number Information Block.  */
-      end_of_sequence = data + linfo.li_length + initial_length_size;
+         /* Save a pointer to the contents of the Opcodes table.  */
+         standard_opcodes = hdrptr;
 
-      reset_state_machine (linfo.li_default_is_stmt);
+         /* Traverse the Directory table just to count entries.  */
+         data = standard_opcodes + linfo.li_opcode_base - 1;
+         if (*data != 0)
+           {
+             unsigned char *ptr_directory_table = data;
 
-      /* Save a pointer to the contents of the Opcodes table.  */
-      standard_opcodes = hdrptr;
+             while (*data != 0)
+               {
+                 data += strnlen ((char *) data, end - data) + 1;
+                 n_directories++;
+               }
 
-      /* Traverse the Directory table just to count entries.  */
-      data = standard_opcodes + linfo.li_opcode_base - 1;
-      if (*data != 0)
-        {
-          unsigned char *ptr_directory_table = data;
+             /* Go through the directory table again to save the directories.  */
+             directory_table = (unsigned char **)
+               xmalloc (n_directories * sizeof (unsigned char *));
 
-         while (*data != 0)
-           {
-             data += strlen ((char *) data) + 1;
-             n_directories++;
+             i = 0;
+             while (*ptr_directory_table != 0)
+               {
+                 directory_table[i] = ptr_directory_table;
+                 ptr_directory_table += strnlen ((char *) ptr_directory_table,
+                                                 ptr_directory_table - end) + 1;
+                 i++;
+               }
            }
+         /* Skip the NUL at the end of the table.  */
+         data++;
 
-          /* Go through the directory table again to save the directories.  */
-          directory_table = (unsigned char **)
-              xmalloc (n_directories * sizeof (unsigned char *));
+         /* Traverse the File Name table just to count the entries.  */
+         if (*data != 0)
+           {
+             unsigned char *ptr_file_name_table = data;
 
-          i = 0;
-          while (*ptr_directory_table != 0)
-            {
-              directory_table[i] = ptr_directory_table;
-              ptr_directory_table += strlen ((char *) ptr_directory_table) + 1;
-              i++;
-            }
-        }
-      /* Skip the NUL at the end of the table.  */
-      data++;
+             while (*data != 0)
+               {
+                 unsigned int bytes_read;
 
-      /* Traverse the File Name table just to count the entries.  */
-      if (*data != 0)
-        {
-          unsigned char *ptr_file_name_table = data;
+                 /* Skip Name, directory index, last modification time and length
+                    of file.  */
+                 data += strnlen ((char *) data, end - data) + 1;
+                 read_uleb128 (data, & bytes_read, end);
+                 data += bytes_read;
+                 read_uleb128 (data, & bytes_read, end);
+                 data += bytes_read;
+                 read_uleb128 (data, & bytes_read, end);
+                 data += bytes_read;
 
-          while (*data != 0)
-            {
-             unsigned int bytes_read;
+                 n_files++;
+               }
 
-              /* Skip Name, directory index, last modification time and length
-                 of file.  */
-              data += strlen ((char *) data) + 1;
-              read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-              read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-              read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-
-              n_files++;
-            }
+             /* Go through the file table again to save the strings.  */
+             file_table = (File_Entry *) xmalloc (n_files * sizeof (File_Entry));
 
-          /* Go through the file table again to save the strings.  */
-          file_table = (File_Entry *) xmalloc (n_files * sizeof (File_Entry));
+             i = 0;
+             while (*ptr_file_name_table != 0)
+               {
+                 unsigned int bytes_read;
+
+                 file_table[i].name = ptr_file_name_table;
+                 ptr_file_name_table += strnlen ((char *) ptr_file_name_table,
+                                                 end - ptr_file_name_table) + 1;
+
+                 /* We are not interested in directory, time or size.  */
+                 file_table[i].directory_index = read_uleb128 (ptr_file_name_table,
+                                                               & bytes_read, end);
+                 ptr_file_name_table += bytes_read;
+                 file_table[i].modification_date = read_uleb128 (ptr_file_name_table,
+                                                                 & bytes_read, end);
+                 ptr_file_name_table += bytes_read;
+                 file_table[i].length = read_uleb128 (ptr_file_name_table, & bytes_read, end);
+                 ptr_file_name_table += bytes_read;
+                 i++;
+               }
+             i = 0;
 
-          i = 0;
-          while (*ptr_file_name_table != 0)
-            {
-              unsigned int bytes_read;
-
-              file_table[i].name = ptr_file_name_table;
-              ptr_file_name_table += strlen ((char *) ptr_file_name_table) + 1;
-
-              /* We are not interested in directory, time or size.  */
-              file_table[i].directory_index = read_leb128 (ptr_file_name_table,
-                                                           & bytes_read, 0);
-              ptr_file_name_table += bytes_read;
-              file_table[i].modification_date = read_leb128 (ptr_file_name_table,
-                                                            & bytes_read, 0);
-              ptr_file_name_table += bytes_read;
-              file_table[i].length = read_leb128 (ptr_file_name_table, & bytes_read, 0);
-              ptr_file_name_table += bytes_read;
-              i++;
-            }
-          i = 0;
+             /* 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"));
+               }
+             else
+               {
+                 unsigned int ix = file_table[0].directory_index;
+                 const char *directory = ix ? (char *)directory_table[ix - 1] : ".";
 
-          /* 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"));
-            }
-          else
-            {
-              unsigned int ix = file_table[0].directory_index;
-              const char *directory = ix ? (char *)directory_table[ix - 1] : ".";
-              if (do_wide || strlen (directory) < 76)
-               printf (_("CU: %s/%s:\n"), directory, file_table[0].name);
-              else
-               printf ("%s:\n", file_table[0].name);
+                 if (do_wide || strlen (directory) < 76)
+                   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\n"));
+               }
+           }
 
-      /* Skip the NUL at the end of the table.  */
-      data++;
+         /* Skip the NUL at the end of the table.  */
+         data++;
+
+         saved_linfo = linfo;
+       }
 
       /* This loop iterates through the Dwarf Line Number Program.  */
       while (data < end_of_sequence)
@@ -2924,10 +3146,10 @@ display_debug_lines_decoded (struct dwarf_section *section,
                  state_machine_regs.address
                    += ((state_machine_regs.op_index + uladv)
                        / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
+                   * linfo.li_min_insn_length;
                  state_machine_regs.op_index
                    = (state_machine_regs.op_index + uladv)
-                     % linfo.li_max_ops_per_insn;
+                   % linfo.li_max_ops_per_insn;
                }
 
               adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
@@ -2935,186 +3157,194 @@ display_debug_lines_decoded (struct dwarf_section *section,
               is_special_opcode = 1;
             }
           else switch (op_code)
-            {
-            case DW_LNS_extended_op:
-              {
-                unsigned int ext_op_code_len;
-                unsigned char ext_op_code;
-                unsigned char *op_code_data = data;
-
-                ext_op_code_len = read_leb128 (op_code_data, &bytes_read, 0);
-                op_code_data += bytes_read;
-
-                if (ext_op_code_len == 0)
-                  {
-                    warn (_("badly formed extended line op encountered!\n"));
-                    break;
-                  }
-                ext_op_code_len += bytes_read;
-                ext_op_code = *op_code_data++;
-
-                switch (ext_op_code)
-                  {
-                  case DW_LNE_end_sequence:
-                    reset_state_machine (linfo.li_default_is_stmt);
-                    break;
-                  case DW_LNE_set_address:
-                    state_machine_regs.address =
-                    byte_get (op_code_data, ext_op_code_len - bytes_read - 1);
-                   state_machine_regs.op_index = 0;
-                    break;
-                  case DW_LNE_define_file:
-                    {
-                      file_table = (File_Entry *) xrealloc
-                        (file_table, (n_files + 1) * sizeof (File_Entry));
-
-                      ++state_machine_regs.last_file_entry;
-                      /* Source file name.  */
-                      file_table[n_files].name = op_code_data;
-                      op_code_data += strlen ((char *) op_code_data) + 1;
-                      /* Directory index.  */
-                      file_table[n_files].directory_index =
-                        read_leb128 (op_code_data, & bytes_read, 0);
-                      op_code_data += bytes_read;
-                      /* Last modification time.  */
-                      file_table[n_files].modification_date =
-                        read_leb128 (op_code_data, & bytes_read, 0);
-                      op_code_data += bytes_read;
-                      /* File length.  */
-                      file_table[n_files].length =
-                        read_leb128 (op_code_data, & bytes_read, 0);
-
-                      n_files++;
-                      break;
-                    }
-                  case DW_LNE_set_discriminator:
-                  case DW_LNE_HP_set_sequence:
-                    /* Simply ignored.  */
-                    break;
-
-                  default:
-                    printf (_("UNKNOWN (%u): length %d\n"),
-                            ext_op_code, ext_op_code_len - bytes_read);
-                    break;
-                  }
-                data += ext_op_code_len;
-                break;
-              }
-            case DW_LNS_copy:
-              break;
-
-            case DW_LNS_advance_pc:
-              uladv = read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-             if (linfo.li_max_ops_per_insn == 1)
-               {
-                 uladv *= linfo.li_min_insn_length;
-                 state_machine_regs.address += uladv;
-               }
-             else
-               {
-                 state_machine_regs.address
-                   += ((state_machine_regs.op_index + uladv)
-                       / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
-                 state_machine_regs.op_index
-                   = (state_machine_regs.op_index + uladv)
-                     % linfo.li_max_ops_per_insn;
-               }
-              break;
-
-            case DW_LNS_advance_line:
-              adv = read_sleb128 (data, & bytes_read);
-              data += bytes_read;
-              state_machine_regs.line += adv;
-              break;
-
-            case DW_LNS_set_file:
-              adv = read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-              state_machine_regs.file = adv;
-              if (file_table[state_machine_regs.file - 1].directory_index == 0)
-                {
-                  /* If directory index is 0, that means current directory.  */
-                  printf ("\n./%s:[++]\n",
-                          file_table[state_machine_regs.file - 1].name);
-                }
-              else
-                {
-                  /* The directory index starts counting at 1.  */
-                  printf ("\n%s/%s:\n",
-                          directory_table[file_table[state_machine_regs.file - 1].directory_index - 1],
-                          file_table[state_machine_regs.file - 1].name);
-                }
-              break;
-
-            case DW_LNS_set_column:
-              uladv = read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-              state_machine_regs.column = uladv;
-              break;
-
-            case DW_LNS_negate_stmt:
-              adv = state_machine_regs.is_stmt;
-              adv = ! adv;
-              state_machine_regs.is_stmt = adv;
-              break;
-
-            case DW_LNS_set_basic_block:
-              state_machine_regs.basic_block = 1;
-              break;
-
-            case DW_LNS_const_add_pc:
-             uladv = ((255 - linfo.li_opcode_base) / linfo.li_line_range);
-             if (linfo.li_max_ops_per_insn == 1)
-               {
-                 uladv *= linfo.li_min_insn_length;
-                 state_machine_regs.address += uladv;
-               }
-             else
-               {
-                 state_machine_regs.address
-                   += ((state_machine_regs.op_index + uladv)
-                       / linfo.li_max_ops_per_insn)
-                      * linfo.li_min_insn_length;
-                 state_machine_regs.op_index
-                   = (state_machine_regs.op_index + uladv)
-                     % linfo.li_max_ops_per_insn;
-               }
-              break;
-
-            case DW_LNS_fixed_advance_pc:
-              uladv = byte_get (data, 2);
-              data += 2;
-              state_machine_regs.address += uladv;
-             state_machine_regs.op_index = 0;
-              break;
-
-            case DW_LNS_set_prologue_end:
-              break;
-
-            case DW_LNS_set_epilogue_begin:
-              break;
-
-            case DW_LNS_set_isa:
-              uladv = read_leb128 (data, & bytes_read, 0);
-              data += bytes_read;
-              printf (_("  Set ISA to %lu\n"), uladv);
-              break;
-
-            default:
-              printf (_("  Unknown opcode %d with operands: "), op_code);
-
-              for (i = standard_opcodes[op_code - 1]; i > 0 ; --i)
-                {
-                  printf ("0x%s%s", dwarf_vmatoa ("x", read_leb128 (data,
-                                                        &bytes_read, 0)),
-                          i == 1 ? "" : ", ");
-                  data += bytes_read;
-                }
-              putchar ('\n');
-              break;
-            }
+                {
+                case DW_LNS_extended_op:
+                  {
+                    unsigned int ext_op_code_len;
+                    unsigned char ext_op_code;
+                    unsigned char *op_code_data = data;
+
+                    ext_op_code_len = read_uleb128 (op_code_data, &bytes_read,
+                                                    end_of_sequence);
+                    op_code_data += bytes_read;
+
+                    if (ext_op_code_len == 0)
+                      {
+                        warn (_("badly formed extended line op encountered!\n"));
+                        break;
+                      }
+                    ext_op_code_len += bytes_read;
+                    ext_op_code = *op_code_data++;
+
+                    switch (ext_op_code)
+                      {
+                      case DW_LNE_end_sequence:
+                        reset_state_machine (linfo.li_default_is_stmt);
+                        break;
+                      case DW_LNE_set_address:
+                        SAFE_BYTE_GET_AND_INC (state_machine_regs.address,
+                                               op_code_data,
+                                               ext_op_code_len - bytes_read - 1,
+                                               end);
+                        state_machine_regs.op_index = 0;
+                        break;
+                      case DW_LNE_define_file:
+                        {
+                          file_table = (File_Entry *) xrealloc
+                            (file_table, (n_files + 1) * sizeof (File_Entry));
+
+                          ++state_machine_regs.last_file_entry;
+                          /* Source file name.  */
+                          file_table[n_files].name = op_code_data;
+                          op_code_data += strlen ((char *) op_code_data) + 1;
+                          /* Directory index.  */
+                          file_table[n_files].directory_index =
+                            read_uleb128 (op_code_data, & bytes_read,
+                                          end_of_sequence);
+                          op_code_data += bytes_read;
+                          /* Last modification time.  */
+                          file_table[n_files].modification_date =
+                            read_uleb128 (op_code_data, & bytes_read,
+                                          end_of_sequence);
+                          op_code_data += bytes_read;
+                          /* File length.  */
+                          file_table[n_files].length =
+                            read_uleb128 (op_code_data, & bytes_read,
+                                          end_of_sequence);
+
+                          n_files++;
+                          break;
+                        }
+                      case DW_LNE_set_discriminator:
+                      case DW_LNE_HP_set_sequence:
+                        /* Simply ignored.  */
+                        break;
+
+                      default:
+                        printf (_("UNKNOWN (%u): length %d\n"),
+                                ext_op_code, ext_op_code_len - bytes_read);
+                        break;
+                      }
+                    data += ext_op_code_len;
+                    break;
+                  }
+                case DW_LNS_copy:
+                  break;
+
+                case DW_LNS_advance_pc:
+                  uladv = read_uleb128 (data, & bytes_read, end);
+                  data += bytes_read;
+                  if (linfo.li_max_ops_per_insn == 1)
+                    {
+                      uladv *= linfo.li_min_insn_length;
+                      state_machine_regs.address += uladv;
+                    }
+                  else
+                    {
+                      state_machine_regs.address
+                        += ((state_machine_regs.op_index + uladv)
+                            / linfo.li_max_ops_per_insn)
+                        * linfo.li_min_insn_length;
+                      state_machine_regs.op_index
+                        = (state_machine_regs.op_index + uladv)
+                        % linfo.li_max_ops_per_insn;
+                    }
+                  break;
+
+                case DW_LNS_advance_line:
+                  adv = read_sleb128 (data, & bytes_read, end);
+                  data += bytes_read;
+                  state_machine_regs.line += adv;
+                  break;
+
+                case DW_LNS_set_file:
+                  adv = read_uleb128 (data, & bytes_read, end);
+                  data += bytes_read;
+                  state_machine_regs.file = adv;
+
+                  if (file_table == NULL)
+                    printf (_("\n [Use file table entry %d]\n"), state_machine_regs.file - 1);
+                  else if (file_table[state_machine_regs.file - 1].directory_index == 0)
+                    /* If directory index is 0, that means current directory.  */
+                    printf ("\n./%s:[++]\n",
+                            file_table[state_machine_regs.file - 1].name);
+                  else if (directory_table == NULL)
+                    printf (_("\n [Use directory table entry %d]\n"),
+                            file_table[state_machine_regs.file - 1].directory_index - 1);
+                  else
+                    /* The directory index starts counting at 1.  */
+                    printf ("\n%s/%s:\n",
+                            directory_table[file_table[state_machine_regs.file - 1].directory_index - 1],
+                            file_table[state_machine_regs.file - 1].name);
+                  break;
+
+                case DW_LNS_set_column:
+                  uladv = read_uleb128 (data, & bytes_read, end);
+                  data += bytes_read;
+                  state_machine_regs.column = uladv;
+                  break;
+
+                case DW_LNS_negate_stmt:
+                  adv = state_machine_regs.is_stmt;
+                  adv = ! adv;
+                  state_machine_regs.is_stmt = adv;
+                  break;
+
+                case DW_LNS_set_basic_block:
+                  state_machine_regs.basic_block = 1;
+                  break;
+
+                case DW_LNS_const_add_pc:
+                  uladv = ((255 - linfo.li_opcode_base) / linfo.li_line_range);
+                  if (linfo.li_max_ops_per_insn == 1)
+                    {
+                      uladv *= linfo.li_min_insn_length;
+                      state_machine_regs.address += uladv;
+                    }
+                  else
+                    {
+                      state_machine_regs.address
+                        += ((state_machine_regs.op_index + uladv)
+                            / linfo.li_max_ops_per_insn)
+                        * linfo.li_min_insn_length;
+                      state_machine_regs.op_index
+                        = (state_machine_regs.op_index + uladv)
+                        % linfo.li_max_ops_per_insn;
+                    }
+                  break;
+
+                case DW_LNS_fixed_advance_pc:
+                  SAFE_BYTE_GET_AND_INC (uladv, data, 2, end);
+                  state_machine_regs.address += uladv;
+                  state_machine_regs.op_index = 0;
+                  break;
+
+                case DW_LNS_set_prologue_end:
+                  break;
+
+                case DW_LNS_set_epilogue_begin:
+                  break;
+
+                case DW_LNS_set_isa:
+                  uladv = read_uleb128 (data, & bytes_read, end);
+                  data += bytes_read;
+                  printf (_("  Set ISA to %lu\n"), uladv);
+                  break;
+
+                default:
+                  printf (_("  Unknown opcode %d with operands: "), op_code);
+
+                  if (standard_opcodes != NULL)
+                    for (i = standard_opcodes[op_code - 1]; i > 0 ; --i)
+                      {
+                        printf ("0x%s%s", dwarf_vmatoa ("x", read_uleb128 (data,
+                                                                           &bytes_read, end)),
+                                i == 1 ? "" : ", ");
+                        data += bytes_read;
+                      }
+                  putchar ('\n');
+                  break;
+                }
 
           /* Only Special opcodes, DW_LNS_copy and DW_LNE_end_sequence adds a row
              to the DWARF address/line matrix.  */
@@ -3122,9 +3352,16 @@ display_debug_lines_decoded (struct dwarf_section *section,
              || (op_code == DW_LNS_copy))
             {
               const unsigned int MAX_FILENAME_LENGTH = 35;
-              char *fileName = (char *)file_table[state_machine_regs.file - 1].name;
+              char *fileName;
               char *newFileName = NULL;
-              size_t fileNameLength = strlen (fileName);
+              size_t fileNameLength;
+
+             if (file_table)
+               fileName = (char *) file_table[state_machine_regs.file - 1].name;
+             else
+               fileName = "<unknown>";
+
+             fileNameLength = strlen (fileName);
 
               if ((fileNameLength > MAX_FILENAME_LENGTH) && (!do_wide))
                 {
@@ -3171,10 +3408,21 @@ display_debug_lines_decoded (struct dwarf_section *section,
               free (newFileName);
             }
         }
-      free (file_table);
-      file_table = NULL;
-      free (directory_table);
-      directory_table = NULL;
+
+      if (file_table)
+       {
+         free (file_table);
+         file_table = NULL;
+         n_files = 0;
+       }
+
+      if (directory_table)
+       {
+         free (directory_table);
+         directory_table = NULL;
+         n_directories = 0;
+       }
+
       putchar ('\n');
     }
 
@@ -3241,12 +3489,10 @@ display_debug_pubnames (struct dwarf_section *section,
 
       data = start;
 
-      names.pn_length = byte_get (data, 4);
-      data += 4;
+      SAFE_BYTE_GET_AND_INC (names.pn_length, data, 4, end);
       if (names.pn_length == 0xffffffff)
        {
-         names.pn_length = byte_get (data, 8);
-         data += 8;
+         SAFE_BYTE_GET_AND_INC (names.pn_length, data, 8, end);
          offset_size = 8;
          initial_length_size = 12;
        }
@@ -3256,11 +3502,8 @@ display_debug_pubnames (struct dwarf_section *section,
          initial_length_size = 4;
        }
 
-      names.pn_version = byte_get (data, 2);
-      data += 2;
-
-      names.pn_offset = byte_get (data, offset_size);
-      data += offset_size;
+      SAFE_BYTE_GET_AND_INC (names.pn_version, data, 2, end);
+      SAFE_BYTE_GET_AND_INC (names.pn_offset, data, offset_size, end);
 
       if (num_debug_info_entries != DEBUG_INFO_UNAVAILABLE
          && num_debug_info_entries > 0
@@ -3268,8 +3511,7 @@ display_debug_pubnames (struct dwarf_section *section,
        warn (_(".debug_info offset of 0x%lx in %s section does not point to a CU header.\n"),
              (unsigned long) names.pn_offset, section->name);
 
-      names.pn_size = byte_get (data, offset_size);
-      data += offset_size;
+      SAFE_BYTE_GET_AND_INC (names.pn_size, data, offset_size, end);
 
       start += names.pn_length + initial_length_size;
 
@@ -3299,13 +3541,13 @@ display_debug_pubnames (struct dwarf_section *section,
 
       do
        {
-         offset = byte_get (data, offset_size);
+         SAFE_BYTE_GET (offset, data, offset_size, end);
 
          if (offset != 0)
            {
              data += offset_size;
              printf ("    %-6lx\t%s\n", offset, data);
-             data += strlen ((char *) data) + 1;
+             data += strnlen ((char *) data, end - data) + 1;
            }
        }
       while (offset != 0);
@@ -3330,7 +3572,7 @@ display_debug_macinfo (struct dwarf_section *section,
   while (curr < end)
     {
       unsigned int lineno;
-      const char *string;
+      const unsigned char *string;
 
       op = (enum dwarf_macinfo_record_type) *curr;
       curr++;
@@ -3341,9 +3583,9 @@ display_debug_macinfo (struct dwarf_section *section,
          {
            unsigned int filenum;
 
-           lineno = read_leb128 (curr, & bytes_read, 0);
+           lineno = read_uleb128 (curr, & bytes_read, end);
            curr += bytes_read;
-           filenum = read_leb128 (curr, & bytes_read, 0);
+           filenum = read_uleb128 (curr, & bytes_read, end);
            curr += bytes_read;
 
            printf (_(" DW_MACINFO_start_file - lineno: %d filenum: %d\n"),
@@ -3356,19 +3598,19 @@ display_debug_macinfo (struct dwarf_section *section,
          break;
 
        case DW_MACINFO_define:
-         lineno = read_leb128 (curr, & bytes_read, 0);
+         lineno = read_uleb128 (curr, & bytes_read, end);
          curr += bytes_read;
-         string = (char *) curr;
-         curr += strlen (string) + 1;
+         string = curr;
+         curr += strnlen ((char *) string, end - string) + 1;
          printf (_(" DW_MACINFO_define - lineno : %d macro : %s\n"),
                  lineno, string);
          break;
 
        case DW_MACINFO_undef:
-         lineno = read_leb128 (curr, & bytes_read, 0);
+         lineno = read_uleb128 (curr, & bytes_read, end);
          curr += bytes_read;
-         string = (char *) curr;
-         curr += strlen (string) + 1;
+         string = curr;
+         curr += strnlen ((char *) string, end - string) + 1;
          printf (_(" DW_MACINFO_undef - lineno : %d macro : %s\n"),
                  lineno, string);
          break;
@@ -3377,10 +3619,10 @@ display_debug_macinfo (struct dwarf_section *section,
          {
            unsigned int constant;
 
-           constant = read_leb128 (curr, & bytes_read, 0);
+           constant = read_uleb128 (curr, & bytes_read, end);
            curr += bytes_read;
-           string = (char *) curr;
-           curr += strlen (string) + 1;
+           string = curr;
+           curr += strnlen ((char *) string, end - string) + 1;
            printf (_(" DW_MACINFO_vendor_ext - constant : %d string : %s\n"),
                    constant, string);
          }
@@ -3396,7 +3638,8 @@ display_debug_macinfo (struct dwarf_section *section,
    FILEIDX.  Return NULL on failure.  */
 
 static unsigned char *
-get_line_filename_and_dirname (dwarf_vma line_offset, dwarf_vma fileidx,
+get_line_filename_and_dirname (dwarf_vma line_offset,
+                              dwarf_vma fileidx,
                               unsigned char **dir_name)
 {
   struct dwarf_section *section = &debug_displays [line].section;
@@ -3404,6 +3647,7 @@ get_line_filename_and_dirname (dwarf_vma line_offset, dwarf_vma fileidx,
   unsigned int offset_size, initial_length_size;
   unsigned int version, opcode_base, bytes_read;
   dwarf_vma length, diridx;
+  const unsigned char * end;
 
   *dir_name = NULL;
   if (section->start == NULL
@@ -3412,13 +3656,13 @@ get_line_filename_and_dirname (dwarf_vma line_offset, dwarf_vma fileidx,
     return NULL;
 
   hdrptr = section->start + line_offset;
-  length = byte_get (hdrptr, 4);
-  hdrptr += 4;
+  end = section->start + section->size;
+
+  SAFE_BYTE_GET_AND_INC (length, hdrptr, 4, end);
   if (length == 0xffffffff)
     {
       /* This section is 64-bit DWARF 3.  */
-      length = byte_get (hdrptr, 8);
-      hdrptr += 8;
+      SAFE_BYTE_GET_AND_INC (length, hdrptr, 8, end);
       offset_size = 8;
       initial_length_size = 12;
     }
@@ -3429,44 +3673,45 @@ get_line_filename_and_dirname (dwarf_vma line_offset, dwarf_vma fileidx,
     }
   if (length + initial_length_size > section->size)
     return NULL;
-  version = byte_get (hdrptr, 2);
-  hdrptr += 2;
+
+  SAFE_BYTE_GET_AND_INC (version, hdrptr, 2, end);
   if (version != 2 && version != 3 && version != 4)
     return NULL;
   hdrptr += offset_size + 1;/* Skip prologue_length and min_insn_length.  */
   if (version >= 4)
     hdrptr++;              /* Skip max_ops_per_insn.  */
   hdrptr += 3;             /* Skip default_is_stmt, line_base, line_range.  */
-  opcode_base = byte_get (hdrptr, 1);
+
+  SAFE_BYTE_GET_AND_INC (opcode_base, hdrptr, 1, end);
   if (opcode_base == 0)
     return NULL;
-  hdrptr++;
+
   hdrptr += opcode_base - 1;
   dirtable = hdrptr;
   /* Skip over dirname table.  */
   while (*hdrptr != '\0')
-    hdrptr += strlen ((char *) hdrptr) + 1;
+    hdrptr += strnlen ((char *) hdrptr, end - hdrptr) + 1;
   hdrptr++;                /* Skip the NUL at the end of the table.  */
   /* Now skip over preceding filename table entries.  */
   for (; *hdrptr != '\0' && fileidx > 1; fileidx--)
     {
-      hdrptr += strlen ((char *) hdrptr) + 1;
-      read_leb128 (hdrptr, &bytes_read, 0);
+      hdrptr += strnlen ((char *) hdrptr, end - hdrptr) + 1;
+      read_uleb128 (hdrptr, &bytes_read, end);
       hdrptr += bytes_read;
-      read_leb128 (hdrptr, &bytes_read, 0);
+      read_uleb128 (hdrptr, &bytes_read, end);
       hdrptr += bytes_read;
-      read_leb128 (hdrptr, &bytes_read, 0);
+      read_uleb128 (hdrptr, &bytes_read, end);
       hdrptr += bytes_read;
     }
-  if (*hdrptr == '\0')
+  if (hdrptr == end || *hdrptr == '\0')
     return NULL;
   file_name = hdrptr;
-  hdrptr += strlen ((char *) hdrptr) + 1;
-  diridx = read_leb128 (hdrptr, &bytes_read, 0);
+  hdrptr += strnlen ((char *) hdrptr, end - hdrptr) + 1;
+  diridx = read_uleb128 (hdrptr, &bytes_read, end);
   if (diridx == 0)
     return file_name;
   for (; *dirtable != '\0' && diridx > 1; diridx--)
-    dirtable += strlen ((char *) dirtable) + 1;
+    dirtable += strnlen ((char *) dirtable, end - dirtable) + 1;
   if (*dirtable == '\0')
     return NULL;
   *dir_name = dirtable;
@@ -3492,13 +3737,11 @@ display_debug_macro (struct dwarf_section *section,
     {
       unsigned int lineno, version, flags;
       unsigned int offset_size = 4;
-      const char *string;
+      const unsigned char *string;
       dwarf_vma line_offset = 0, sec_offset = curr - start, offset;
       unsigned char **extended_ops = NULL;
 
-      version = byte_get (curr, 2);
-      curr += 2;
-
+      SAFE_BYTE_GET_AND_INC (version, curr, 2, end);
       if (version != 4)
        {
          error (_("Only GNU extension to DWARF 4 of %s is currently supported.\n"),
@@ -3506,7 +3749,7 @@ display_debug_macro (struct dwarf_section *section,
          return 0;
        }
 
-      flags = byte_get (curr++, 1);
+      SAFE_BYTE_GET_AND_INC (flags, curr, 1, end);
       if (flags & 1)
        offset_size = 8;
       printf (_("  Offset:                      0x%lx\n"),
@@ -3515,15 +3758,17 @@ display_debug_macro (struct dwarf_section *section,
       printf (_("  Offset size:                 %d\n"), offset_size);
       if (flags & 2)
        {
-         line_offset = byte_get (curr, offset_size);
-         curr += offset_size;
+         SAFE_BYTE_GET_AND_INC (line_offset, curr, offset_size, end);
          printf (_("  Offset into .debug_line:     0x%lx\n"),
                  (unsigned long) line_offset);
        }
       if (flags & 4)
        {
-         unsigned int i, count = byte_get (curr++, 1), op;
+         unsigned int i, count, op;
          dwarf_vma nargs, n;
+
+         SAFE_BYTE_GET_AND_INC (count, curr, 1, end);
+         
          memset (extended_op_buf, 0, sizeof (extended_op_buf));
          extended_ops = extended_op_buf;
          if (count)
@@ -3531,9 +3776,9 @@ display_debug_macro (struct dwarf_section *section,
              printf (_("  Extension opcode arguments:\n"));
              for (i = 0; i < count; i++)
                {
-                 op = byte_get (curr++, 1);
+                 SAFE_BYTE_GET_AND_INC (op, curr, 1, end);
                  extended_ops[op] = curr;
-                 nargs = read_leb128 (curr, &bytes_read, 0);
+                 nargs = read_uleb128 (curr, &bytes_read, end);
                  curr += bytes_read;
                  if (nargs == 0)
                    printf (_("    DW_MACRO_GNU_%02x has no arguments\n"), op);
@@ -3542,7 +3787,9 @@ display_debug_macro (struct dwarf_section *section,
                      printf (_("    DW_MACRO_GNU_%02x arguments: "), op);
                      for (n = 0; n < nargs; n++)
                        {
-                         unsigned int form = byte_get (curr++, 1);
+                         unsigned int form;
+
+                         SAFE_BYTE_GET_AND_INC (form, curr, 1, end);
                          printf ("%s%s", get_FORM_name (form),
                                  n == nargs - 1 ? "\n" : ", ");
                          switch (form)
@@ -3584,7 +3831,7 @@ display_debug_macro (struct dwarf_section *section,
              return 0;
            }
 
-         op = byte_get (curr++, 1);
+         SAFE_BYTE_GET_AND_INC (op, curr, 1, end);
          if (op == 0)
            break;
 
@@ -3595,9 +3842,9 @@ display_debug_macro (struct dwarf_section *section,
                unsigned int filenum;
                unsigned char *file_name = NULL, *dir_name = NULL;
 
-               lineno = read_leb128 (curr, &bytes_read, 0);
+               lineno = read_uleb128 (curr, &bytes_read, end);
                curr += bytes_read;
-               filenum = read_leb128 (curr, &bytes_read, 0);
+               filenum = read_uleb128 (curr, &bytes_read, end);
                curr += bytes_read;
 
                if ((flags & 2) == 0)
@@ -3622,71 +3869,65 @@ display_debug_macro (struct dwarf_section *section,
              break;
 
            case DW_MACRO_GNU_define:
-             lineno = read_leb128 (curr, &bytes_read, 0);
+             lineno = read_uleb128 (curr, &bytes_read, end);
              curr += bytes_read;
-             string = (char *) curr;
-             curr += strlen (string) + 1;
+             string = curr;
+             curr += strnlen ((char *) string, end - string) + 1;
              printf (_(" DW_MACRO_GNU_define - lineno : %d macro : %s\n"),
                      lineno, string);
              break;
 
            case DW_MACRO_GNU_undef:
-             lineno = read_leb128 (curr, &bytes_read, 0);
+             lineno = read_uleb128 (curr, &bytes_read, end);
              curr += bytes_read;
-             string = (char *) curr;
-             curr += strlen (string) + 1;
+             string = curr;
+             curr += strnlen ((char *) string, end - string) + 1;
              printf (_(" DW_MACRO_GNU_undef - lineno : %d macro : %s\n"),
                      lineno, string);
              break;
 
            case DW_MACRO_GNU_define_indirect:
-             lineno = read_leb128 (curr, &bytes_read, 0);
+             lineno = read_uleb128 (curr, &bytes_read, end);
              curr += bytes_read;
-             offset = byte_get (curr, offset_size);
-             curr += offset_size;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
              string = fetch_indirect_string (offset);
              printf (_(" DW_MACRO_GNU_define_indirect - lineno : %d macro : %s\n"),
                      lineno, string);
              break;
 
            case DW_MACRO_GNU_undef_indirect:
-             lineno = read_leb128 (curr, &bytes_read, 0);
+             lineno = read_uleb128 (curr, &bytes_read, end);
              curr += bytes_read;
-             offset = byte_get (curr, offset_size);
-             curr += offset_size;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
              string = fetch_indirect_string (offset);
              printf (_(" DW_MACRO_GNU_undef_indirect - lineno : %d macro : %s\n"),
                      lineno, string);
              break;
 
            case DW_MACRO_GNU_transparent_include:
-             offset = byte_get (curr, offset_size);
-             curr += offset_size;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
              printf (_(" DW_MACRO_GNU_transparent_include - offset : 0x%lx\n"),
                      (unsigned long) offset);
              break;
 
            case DW_MACRO_GNU_define_indirect_alt:
-             lineno = read_leb128 (curr, &bytes_read, 0);
+             lineno = read_uleb128 (curr, &bytes_read, end);
              curr += bytes_read;
-             offset = byte_get (curr, offset_size);
-             curr += offset_size;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
              printf (_(" DW_MACRO_GNU_define_indirect_alt - lineno : %d macro offset : 0x%lx\n"),
                      lineno, (unsigned long) offset);
              break;
 
            case DW_MACRO_GNU_undef_indirect_alt:
-             lineno = read_leb128 (curr, &bytes_read, 0);
+             lineno = read_uleb128 (curr, &bytes_read, end);
              curr += bytes_read;
-             offset = byte_get (curr, offset_size);
-             curr += offset_size;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
              printf (_(" DW_MACRO_GNU_undef_indirect_alt - lineno : %d macro offset : 0x%lx\n"),
                      lineno, (unsigned long) offset);
              break;
 
            case DW_MACRO_GNU_transparent_include_alt:
-             offset = byte_get (curr, offset_size);
-             curr += offset_size;
+             SAFE_BYTE_GET_AND_INC (offset, curr, offset_size, end);
              printf (_(" DW_MACRO_GNU_transparent_include_alt - offset : 0x%lx\n"),
                      (unsigned long) offset);
              break;
@@ -3702,7 +3943,7 @@ display_debug_macro (struct dwarf_section *section,
                  /* Skip over unhandled opcodes.  */
                  dwarf_vma nargs, n;
                  unsigned char *desc = extended_ops[op];
-                 nargs = read_leb128 (desc, &bytes_read, 0);
+                 nargs = read_uleb128 (desc, &bytes_read, end);
                  desc += bytes_read;
                  if (nargs == 0)
                    {
@@ -3712,10 +3953,14 @@ display_debug_macro (struct dwarf_section *section,
                  printf (_(" DW_MACRO_GNU_%02x -"), op);
                  for (n = 0; n < nargs; n++)
                    {
+                     int val;
+
+                     SAFE_BYTE_GET_AND_INC (val, desc, 1, end);
                      curr
-                       = read_and_display_attr_value (0, byte_get (desc++, 1),
-                                                      curr, 0, 0, offset_size,
-                                                      version, NULL, 0, NULL);
+                       = read_and_display_attr_value (0, val,
+                                                      curr, end, 0, 0, offset_size,
+                                                      version, NULL, 0, NULL,
+                                                      NULL);
                      if (n != nargs - 1)
                        printf (",");
                    }
@@ -3814,10 +4059,8 @@ display_loc_list (struct dwarf_section *section,
          the -1 escape value.  Sign extension into the top 32 bits of a 32-bit
          address will not affect the values that we display since we always show
          hex values, and always the bottom 32-bits.  */
-      begin = byte_get_signed (start, pointer_size);
-      start += pointer_size;
-      end = byte_get_signed (start, pointer_size);
-      start += pointer_size;
+      SAFE_BYTE_GET_AND_INC (begin, start, pointer_size, section_end);
+      SAFE_BYTE_GET_AND_INC (end, start, pointer_size, section_end);
 
       if (begin == 0 && end == 0)
         {
@@ -3842,8 +4085,7 @@ display_loc_list (struct dwarf_section *section,
           break;
         }
 
-      length = byte_get (start, 2);
-      start += 2;
+      SAFE_BYTE_GET_AND_INC (length, start, 2, section_end);
 
       if (start + length > section_end)
         {
@@ -3888,7 +4130,7 @@ print_addr_index (unsigned int idx, unsigned int len)
 {
   static char buf[15];
   snprintf (buf, sizeof (buf), "[%d]", idx);
-  printf("%*s ", len, buf);
+  printf ("%*s ", len, buf);
 }
 
 /* Display a location list from a .dwo section. It uses address indexes rather
@@ -3925,8 +4167,7 @@ display_loc_list_dwo (struct dwarf_section *section,
           break;
         }
 
-      entry_type = byte_get (start, 1);
-      start++;
+      SAFE_BYTE_GET_AND_INC (entry_type, start, 1, section_end);
       switch (entry_type)
         {
           case 0: /* A terminating entry.  */
@@ -3934,34 +4175,31 @@ display_loc_list_dwo (struct dwarf_section *section,
            printf (_("<End of list>\n"));
             return;
           case 1: /* A base-address entry.  */
-            idx = read_leb128 (start, &bytes_read, 0);
+            idx = read_uleb128 (start, &bytes_read, section_end);
             start += bytes_read;
             print_addr_index (idx, 8);
             printf ("         ");
             printf (_("(base address selection entry)\n"));
             continue;
           case 2: /* A start/end entry.  */
-            idx = read_leb128 (start, &bytes_read, 0);
+            idx = read_uleb128 (start, &bytes_read, section_end);
             start += bytes_read;
             print_addr_index (idx, 8);
-            idx = read_leb128 (start, &bytes_read, 0);
+            idx = read_uleb128 (start, &bytes_read, section_end);
             start += bytes_read;
             print_addr_index (idx, 8);
             break;
           case 3: /* A start/length entry.  */
-            idx = read_leb128 (start, &bytes_read, 0);
+            idx = read_uleb128 (start, &bytes_read, section_end);
             start += bytes_read;
             print_addr_index (idx, 8);
-            idx = byte_get (start, 4);
-            start += 4;
+           SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
             printf ("%08x ", idx);
             break;
           case 4: /* An offset pair entry.  */
-            idx = byte_get (start, 4);
-            start += 4;
+           SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
             printf ("%08x ", idx);
-            idx = byte_get (start, 4);
-            start += 4;
+           SAFE_BYTE_GET_AND_INC (idx, start, 4, section_end);
             printf ("%08x ", idx);
             break;
           default:
@@ -3977,9 +4215,7 @@ display_loc_list_dwo (struct dwarf_section *section,
           break;
         }
 
-      length = byte_get (start, 2);
-      start += 2;
-
+      SAFE_BYTE_GET_AND_INC (length, start, 2, section_end);
       if (start + length > section_end)
         {
           warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
@@ -4281,13 +4517,10 @@ display_debug_aranges (struct dwarf_section *section,
 
       hdrptr = start;
 
-      arange.ar_length = byte_get (hdrptr, 4);
-      hdrptr += 4;
-
+      SAFE_BYTE_GET_AND_INC (arange.ar_length, hdrptr, 4, end);
       if (arange.ar_length == 0xffffffff)
        {
-         arange.ar_length = byte_get (hdrptr, 8);
-         hdrptr += 8;
+         SAFE_BYTE_GET_AND_INC (arange.ar_length, hdrptr, 8, end);
          offset_size = 8;
          initial_length_size = 12;
        }
@@ -4297,11 +4530,8 @@ display_debug_aranges (struct dwarf_section *section,
          initial_length_size = 4;
        }
 
-      arange.ar_version = byte_get (hdrptr, 2);
-      hdrptr += 2;
-
-      arange.ar_info_offset = byte_get (hdrptr, offset_size);
-      hdrptr += offset_size;
+      SAFE_BYTE_GET_AND_INC (arange.ar_version, hdrptr, 2, end);
+      SAFE_BYTE_GET_AND_INC (arange.ar_info_offset, hdrptr, offset_size, end);
 
       if (num_debug_info_entries != DEBUG_INFO_UNAVAILABLE
          && num_debug_info_entries > 0
@@ -4309,11 +4539,8 @@ display_debug_aranges (struct dwarf_section *section,
        warn (_(".debug_info offset of 0x%lx in %s section does not point to a CU header.\n"),
              (unsigned long) arange.ar_info_offset, section->name);
 
-      arange.ar_pointer_size = byte_get (hdrptr, 1);
-      hdrptr += 1;
-
-      arange.ar_segment_size = byte_get (hdrptr, 1);
-      hdrptr += 1;
+      SAFE_BYTE_GET_AND_INC (arange.ar_pointer_size, hdrptr, 1, end);
+      SAFE_BYTE_GET_AND_INC (arange.ar_segment_size, hdrptr, 1, end);
 
       if (arange.ar_version != 2 && arange.ar_version != 3)
        {
@@ -4363,13 +4590,8 @@ display_debug_aranges (struct dwarf_section *section,
 
       while (addr_ranges + 2 * address_size <= start)
        {
-         address = byte_get (addr_ranges, address_size);
-
-         addr_ranges += address_size;
-
-         length  = byte_get (addr_ranges, address_size);
-
-         addr_ranges += address_size;
+         SAFE_BYTE_GET_AND_INC (address, addr_ranges, address_size, end);
+         SAFE_BYTE_GET_AND_INC (length, addr_ranges, address_size, end);
 
          printf ("    ");
          print_dwarf_vma (address, address_size);
@@ -4507,13 +4729,12 @@ display_debug_ranges (struct dwarf_section *section,
 {
   unsigned char *start = section->start;
   unsigned char *last_start = start;
-  unsigned long bytes;
+  unsigned long bytes = section->size;
   unsigned char *section_begin = start;
+  unsigned char *finish = start + bytes;
   unsigned int num_range_list, i;
   struct range_entry *range_entries, *range_entry_fill;
 
-  bytes = section->size;
-
   if (bytes == 0)
     {
       printf (_("\nThe %s section is empty.\n"), section->name);
@@ -4601,7 +4822,7 @@ display_debug_ranges (struct dwarf_section *section,
       start = next;
       last_start = next;
 
-      while (1)
+      while (start < finish)
        {
          dwarf_vma begin;
          dwarf_vma end;
@@ -4611,10 +4832,10 @@ display_debug_ranges (struct dwarf_section *section,
             top 32 bits of a 32-bit address will not affect the values
             that we display since we always show hex values, and always
             the bottom 32-bits.  */
-         begin = byte_get_signed (start, pointer_size);
-         start += pointer_size;
-         end = byte_get_signed (start, pointer_size);
-         start += pointer_size;
+         SAFE_BYTE_GET_AND_INC (begin, start, pointer_size, finish);
+         if (start >= finish)
+           break;
+         SAFE_SIGNED_BYTE_GET_AND_INC (end, start, pointer_size, finish);
 
          printf ("    %8.8lx ", offset);
 
@@ -4876,9 +5097,9 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, int *max_regs)
   printf ("\n");
 }
 
-#define GET(N) byte_get (start, N); start += N
-#define LEB()  read_leb128 (start, & length_return, 0); start += length_return
-#define SLEB() read_sleb128 (start, & length_return); start += length_return
+#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 int
 display_debug_frames (struct dwarf_section *section,
@@ -4914,8 +5135,8 @@ display_debug_frames (struct dwarf_section *section,
       int initial_length_size;
 
       saved_start = start;
-      length = byte_get (start, 4); start += 4;
 
+      SAFE_BYTE_GET_AND_INC (length, start, 4, end);
       if (length == 0)
        {
          printf ("\n%08lx ZERO terminator\n\n",
@@ -4925,8 +5146,7 @@ display_debug_frames (struct dwarf_section *section,
 
       if (length == 0xffffffff)
        {
-         length = byte_get (start, 8);
-         start += 8;
+         SAFE_BYTE_GET_AND_INC (length, start, 8, end);
          offset_size = 8;
          initial_length_size = 12;
        }
@@ -4943,7 +5163,8 @@ display_debug_frames (struct dwarf_section *section,
                length, (unsigned long)(saved_start - section_start));
          block_end = end;
        }
-      cie_id = byte_get (start, offset_size); start += offset_size;
+
+      SAFE_BYTE_GET_AND_INC (cie_id, start, offset_size, end);
 
       if (is_eh ? (cie_id == 0) : (cie_id == DW_CIE_ID))
        {
@@ -4970,8 +5191,8 @@ display_debug_frames (struct dwarf_section *section,
 
          if (version >= 4)
            {
-             fc->ptr_size = GET (1);
-             fc->segment_size = GET (1);
+             GET (fc->ptr_size, 1);
+             GET (fc->segment_size, 1);
              eh_addr_size = fc->ptr_size;
            }
          else
@@ -4983,7 +5204,7 @@ display_debug_frames (struct dwarf_section *section,
          fc->data_factor = SLEB ();
          if (version == 1)
            {
-             fc->ra = GET (1);
+             GET (fc->ra, 1);
            }
          else
            {
@@ -5111,14 +5332,17 @@ display_debug_frames (struct dwarf_section *section,
          segment_selector = 0;
          if (fc->segment_size)
            {
-             segment_selector = byte_get (start, fc->segment_size);
-             start += fc->segment_size;
+             SAFE_BYTE_GET_AND_INC (segment_selector, start, fc->segment_size, end);
            }
          fc->pc_begin = get_encoded_value (start, fc->fde_encoding, section);
          start += encoded_ptr_size;
-         fc->pc_range = byte_get (start, encoded_ptr_size);
-         start += encoded_ptr_size;
 
+         /* FIXME: It appears that sometimes the final pc_range value is
+            encoded in less than encoded_ptr_size bytes.  See the x86_64
+            run of the "objcopy on compressed debug sections" test for an
+            example of this.  */
+         SAFE_BYTE_GET_AND_INC (fc->pc_range, start, encoded_ptr_size, end);
+         
          if (cie->augmentation[0] == 'z')
            {
              augmentation_data_len = LEB ();
@@ -5345,7 +5569,7 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_advance_loc1:
-             ofs = byte_get (start, 1); start += 1;
+             SAFE_BYTE_GET_AND_INC (ofs, start, 1, end);
              if (do_debug_frames_interp)
                frame_display_row (fc, &need_col_headers, &max_regs);
              else
@@ -5356,7 +5580,7 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_advance_loc2:
-             ofs = byte_get (start, 2); start += 2;
+             SAFE_BYTE_GET_AND_INC (ofs, start, 2, end);
              if (do_debug_frames_interp)
                frame_display_row (fc, &need_col_headers, &max_regs);
              else
@@ -5367,7 +5591,7 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_advance_loc4:
-             ofs = byte_get (start, 4); start += 4;
+             SAFE_BYTE_GET_AND_INC (ofs, start, 4, end);
              if (do_debug_frames_interp)
                frame_display_row (fc, &need_col_headers, &max_regs);
              else
@@ -5630,7 +5854,7 @@ display_debug_frames (struct dwarf_section *section,
              break;
 
            case DW_CFA_MIPS_advance_loc8:
-             ofs = byte_get (start, 8); start += 8;
+             SAFE_BYTE_GET_AND_INC (ofs, start, 8, end);
              if (do_debug_frames_interp)
                frame_display_row (fc, &need_col_headers, &max_regs);
              else
@@ -5721,7 +5945,7 @@ display_gdb_index (struct dwarf_section *section,
 
   /* Prior versions are obsolete, and future versions may not be
      backwards compatible.  */
-  if (version < 3 || version > 7)
+  if (version < 3 || version > 8)
     {
       warn (_("Unsupported version %lu.\n"), (unsigned long) version);
       return 0;
@@ -5734,6 +5958,10 @@ display_gdb_index (struct dwarf_section *section,
     warn (_("Version 5 does not include inlined functions.\n"));
   if (version < 7)
       warn (_("Version 6 does not include symbol attributes.\n"));
+  /* Version 7 indices generated by Gold have bad type unit references,
+     PR binutils/15021.  But we don't know if the index was generated by
+     Gold or not, so to avoid worrying users with gdb-generated indices
+     we say nothing for version 7 here.  */
 
   cu_list_offset = byte_get_little_endian (start + 4, 4);
   tu_list_offset = byte_get_little_endian (start + 8, 4);
@@ -5874,15 +6102,6 @@ display_gdb_index (struct dwarf_section *section,
   return 1;
 }
 
-/* Collection of CU/TU section sets from .debug_cu_index and .debug_tu_index
-   sections.  Each set is stored in SHNDX_POOL as a zero-terminated list of
-   section indexes comprising one set of debug sections from a .dwo file.  */
-
-int cu_tu_indexes_read = 0;
-unsigned int *shndx_pool = NULL;
-unsigned int shndx_pool_size = 0;
-unsigned int shndx_pool_used = 0;
-
 /* Pre-allocate enough space for the CU/TU sets needed.  */
 
 static void
@@ -5925,7 +6144,42 @@ end_cu_tu_entry (void)
   shndx_pool [shndx_pool_used++] = 0;
 }
 
-/* Process a CU or TU index.  If DO_DISPLAY is true, print the contents.  */
+/* Return the short name of a DWARF section given by a DW_SECT enumerator.  */
+
+static const char *
+get_DW_SECT_short_name (unsigned int dw_sect)
+{
+  static char buf[16];
+
+  switch (dw_sect)
+    {
+      case DW_SECT_INFO:
+       return "info";
+      case DW_SECT_TYPES:
+       return "types";
+      case DW_SECT_ABBREV:
+       return "abbrev";
+      case DW_SECT_LINE:
+       return "line";
+      case DW_SECT_LOC:
+       return "loc";
+      case DW_SECT_STR_OFFSETS:
+       return "str_off";
+      case DW_SECT_MACINFO:
+       return "macinfo";
+      case DW_SECT_MACRO:
+       return "macro";
+      default:
+        break;
+    }
+
+  snprintf (buf, sizeof (buf), "%d", dw_sect);
+  return buf;
+}
+
+/* Process a CU or TU index.  If DO_DISPLAY is true, print the contents.
+   These sections are extensions for Fission.
+   See http://gcc.gnu.org/wiki/DebugFissionDWP.  */
 
 static int
 process_cu_tu_index (struct dwarf_section *section, int do_display)
@@ -5936,24 +6190,30 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
   unsigned char *pindex;
   unsigned char *ppool;
   unsigned int version;
+  unsigned int ncols = 0;
   unsigned int nused;
   unsigned int nslots;
   unsigned int i;
+  unsigned int j;
+  dwarf_vma signature_high;
+  dwarf_vma signature_low;
+  char buf[64];
 
   version = byte_get (phdr, 4);
+  if (version >= 2)
+    ncols = byte_get (phdr + 4, 4);
   nused = byte_get (phdr + 8, 4);
   nslots = byte_get (phdr + 12, 4);
   phash = phdr + 16;
   pindex = phash + nslots * 8;
   ppool = pindex + nslots * 4;
 
-  if (!do_display)
-    prealloc_cu_tu_list((limit - ppool) / 4);
-
   if (do_display)
     {
       printf (_("Contents of the %s section:\n\n"), section->name);
       printf (_("  Version:                 %d\n"), version);
+      if (version >= 2)
+       printf (_("  Number of columns:       %d\n"), ncols);
       printf (_("  Number of used entries:  %d\n"), nused);
       printf (_("  Number of slots:         %d\n\n"), nslots);
     }
@@ -5965,49 +6225,182 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
       return 0;
     }
 
-  for (i = 0; i < nslots; i++)
+  if (version == 1)
     {
-      dwarf_vma signature_high;
-      dwarf_vma signature_low;
-      unsigned int j;
-      unsigned char *shndx_list;
-      unsigned int shndx;
-      char buf[64];
-
-      byte_get_64 (phash, &signature_high, &signature_low);
-      if (signature_high != 0 || signature_low != 0)
+      if (!do_display)
+       prealloc_cu_tu_list ((limit - ppool) / 4);
+      for (i = 0; i < nslots; i++)
        {
-         j = byte_get (pindex, 4);
-         shndx_list = ppool + j * 4;
-         if (do_display)
-           printf (_("  [%3d] Signature:  0x%s  Sections: "),
-                   i, dwarf_vmatoa64 (signature_high, signature_low,
-                                      buf, sizeof (buf)));
-         for (;;)
+         unsigned char *shndx_list;
+         unsigned int shndx;
+
+         byte_get_64 (phash, &signature_high, &signature_low);
+         if (signature_high != 0 || signature_low != 0)
            {
-             if (shndx_list >= limit)
+             j = byte_get (pindex, 4);
+             shndx_list = ppool + j * 4;
+             if (do_display)
+               printf (_("  [%3d] Signature:  0x%s  Sections: "),
+                       i, dwarf_vmatoa64 (signature_high, signature_low,
+                                          buf, sizeof (buf)));
+             for (;;)
                {
-                 warn (_("Section %s too small for shndx pool\n"),
-                       section->name);
-                 return 0;
+                 if (shndx_list >= limit)
+                   {
+                     warn (_("Section %s too small for shndx pool\n"),
+                           section->name);
+                     return 0;
+                   }
+                 shndx = byte_get (shndx_list, 4);
+                 if (shndx == 0)
+                   break;
+                 if (do_display)
+                   printf (" %d", shndx);
+                 else
+                   add_shndx_to_cu_tu_entry (shndx);
+                 shndx_list += 4;
                }
-             shndx = byte_get (shndx_list, 4);
-             if (shndx == 0)
-               break;
              if (do_display)
-               printf (" %d", shndx);
+               printf ("\n");
              else
-               add_shndx_to_cu_tu_entry (shndx);
-             shndx_list += 4;
+               end_cu_tu_entry ();
+           }
+         phash += 8;
+         pindex += 4;
+       }
+    }
+  else if (version == 2)
+    {
+      unsigned int val;
+      unsigned int dw_sect;
+      unsigned char *ph = phash;
+      unsigned char *pi = pindex;
+      unsigned char *poffsets = ppool + ncols * 4;
+      unsigned char *psizes = poffsets + nused * ncols * 4;
+      unsigned char *pend = psizes + nused * ncols * 4;
+      bfd_boolean is_tu_index;
+      struct cu_tu_set *this_set = NULL;
+      unsigned int row;
+      unsigned char *prow;
+
+      is_tu_index = strcmp (section->name, ".debug_tu_index") == 0;
+
+      if (pend > limit)
+       {
+         warn (_("Section %s too small for offset and size tables\n"),
+               section->name);
+         return 0;
+       }
+
+      if (do_display)
+       {
+         printf (_("  Offset table\n"));
+         printf ("  slot  %-16s  ",
+                is_tu_index ? _("signature") : _("dwo_id"));
+       }
+      else
+       {
+         if (is_tu_index)
+           {
+             tu_count = nused;
+             tu_sets = xcmalloc (nused, sizeof (struct cu_tu_set));
+             this_set = tu_sets;
            }
-         if (do_display)
-           printf ("\n");
          else
-           end_cu_tu_entry ();
+           {
+             cu_count = nused;
+             cu_sets = xcmalloc (nused, sizeof (struct cu_tu_set));
+             this_set = cu_sets;
+           }
+       }
+      if (do_display)
+       {
+         for (j = 0; j < ncols; j++)
+           {
+             dw_sect = byte_get (ppool + j * 4, 4);
+             printf (" %8s", get_DW_SECT_short_name (dw_sect));
+           }
+         printf ("\n");
+       }
+      for (i = 0; i < nslots; i++)
+       {
+         byte_get_64 (ph, &signature_high, &signature_low);
+         row = byte_get (pi, 4);
+         if (row != 0)
+           {
+             if (!do_display)
+               memcpy (&this_set[row - 1].signature, ph, sizeof (uint64_t));
+             prow = poffsets + (row - 1) * ncols * 4;
+             if (do_display)
+               printf (_("  [%3d] 0x%s"),
+                       i, dwarf_vmatoa64 (signature_high, signature_low,
+                                          buf, sizeof (buf)));
+             for (j = 0; j < ncols; j++)
+               {
+                 val = byte_get (prow + j * 4, 4);
+                 if (do_display)
+                   printf (" %8d", val);
+                 else
+                   {
+                     dw_sect = byte_get (ppool + j * 4, 4);
+                     this_set [row - 1].section_offsets [dw_sect] = val;
+                   }
+               }
+             if (do_display)
+               printf ("\n");
+           }
+         ph += 8;
+         pi += 4;
+       }
+
+      ph = phash;
+      pi = pindex;
+      if (do_display)
+        {
+         printf ("\n");
+         printf (_("  Size table\n"));
+         printf ("  slot  %-16s  ",
+                is_tu_index ? _("signature") : _("dwo_id"));
+        }
+      for (j = 0; j < ncols; j++)
+       {
+         val = byte_get (ppool + j * 4, 4);
+         if (do_display)
+           printf (" %8s", get_DW_SECT_short_name (val));
+       }
+      if (do_display)
+       printf ("\n");
+      for (i = 0; i < nslots; i++)
+       {
+         byte_get_64 (ph, &signature_high, &signature_low);
+         row = byte_get (pi, 4);
+         if (row != 0)
+           {
+             prow = psizes + (row - 1) * ncols * 4;
+             if (do_display)
+               printf (_("  [%3d] 0x%s"),
+                       i, dwarf_vmatoa64 (signature_high, signature_low,
+                                          buf, sizeof (buf)));
+             for (j = 0; j < ncols; j++)
+               {
+                 val = byte_get (prow + j * 4, 4);
+                 if (do_display)
+                   printf (" %8d", val);
+                 else
+                   {
+                     dw_sect = byte_get (ppool + j * 4, 4);
+                     this_set [row - 1].section_sizes [dw_sect] = val;
+                   }
+               }
+             if (do_display)
+               printf ("\n");
+           }
+         ph += 8;
+         pi += 4;
        }
-      phash += 8;
-      pindex += 4;
     }
+  else if (do_display)
+    printf (_("  Unsupported version\n"));
 
   if (do_display)
       printf ("\n");
This page took 0.071189 seconds and 4 git commands to generate.