* dwarf.c (display_gdb_index): Handle .gdb_index version 8.
[deliverable/binutils-gdb.git] / binutils / dwarf.c
index f211237599b46c9cc8c296f699b0e60cd97414fe..2d107a3258d6c8321cc3ef46f4b2549e8ce574c2 100644 (file)
@@ -1,5 +1,5 @@
 /* dwarf.c -- display DWARF contents of a BFD binary file
-   Copyright 2005, 2006, 2007
+   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 #include "sysdep.h"
 #include "libiberty.h"
 #include "bfd.h"
+#include "bfd_stdint.h"
 #include "bucomm.h"
-#include "elf/dwarf2.h"
+#include "elfcomm.h"
+#include "elf/common.h"
+#include "dwarf2.h"
 #include "dwarf.h"
+#include "gdb/gdb-index.h"
+
+static const char *regname (unsigned int regno, int row);
 
 static int have_frame_base;
 static int need_base_address;
@@ -38,12 +44,13 @@ static debug_info *debug_information = NULL;
    that the .debug_info section could not be loaded/parsed.  */
 #define DEBUG_INFO_UNAVAILABLE  (unsigned int) -1
 
-dwarf_vma eh_addr_size;
+int eh_addr_size;
 
 int do_debug_info;
 int do_debug_abbrevs;
 int do_debug_lines;
 int do_debug_pubnames;
+int do_debug_pubtypes;
 int do_debug_aranges;
 int do_debug_ranges;
 int do_debug_frames;
@@ -51,120 +58,147 @@ int do_debug_frames_interp;
 int do_debug_macinfo;
 int do_debug_str;
 int do_debug_loc;
+int do_gdb_index;
+int do_trace_info;
+int do_trace_abbrevs;
+int do_trace_aranges;
+int do_debug_addr;
+int do_debug_cu_index;
+int do_wide;
 
-dwarf_vma (*byte_get) (unsigned char *, int);
+int dwarf_cutoff_level = -1;
+unsigned long dwarf_start_die;
 
-dwarf_vma
-byte_get_little_endian (unsigned char *field, int size)
-{
-  switch (size)
-    {
-    case 1:
-      return *field;
-
-    case 2:
-      return  ((unsigned int) (field[0]))
-       |    (((unsigned int) (field[1])) << 8);
-
-    case 4:
-      return  ((unsigned long) (field[0]))
-       |    (((unsigned long) (field[1])) << 8)
-       |    (((unsigned long) (field[2])) << 16)
-       |    (((unsigned long) (field[3])) << 24);
-
-    case 8:
-      if (sizeof (dwarf_vma) == 8)
-       return  ((dwarf_vma) (field[0]))
-         |    (((dwarf_vma) (field[1])) << 8)
-         |    (((dwarf_vma) (field[2])) << 16)
-         |    (((dwarf_vma) (field[3])) << 24)
-         |    (((dwarf_vma) (field[4])) << 32)
-         |    (((dwarf_vma) (field[5])) << 40)
-         |    (((dwarf_vma) (field[6])) << 48)
-         |    (((dwarf_vma) (field[7])) << 56);
-      else if (sizeof (dwarf_vma) == 4)
-       /* We want to extract data from an 8 byte wide field and
-          place it into a 4 byte wide field.  Since this is a little
-          endian source we can just use the 4 byte extraction code.  */
-       return  ((unsigned long) (field[0]))
-         |    (((unsigned long) (field[1])) << 8)
-         |    (((unsigned long) (field[2])) << 16)
-         |    (((unsigned long) (field[3])) << 24);
+int dwarf_check = 0;
 
-    default:
-      error (_("Unhandled data length: %d\n"), size);
-      abort ();
+/* Values for do_debug_lines.  */
+#define FLAG_DEBUG_LINES_RAW    1
+#define FLAG_DEBUG_LINES_DECODED 2
+
+static int
+size_of_encoded_value (int encoding)
+{
+  switch (encoding & 0x7)
+    {
+    default:   /* ??? */
+    case 0:    return eh_addr_size;
+    case 2:    return 2;
+    case 3:    return 4;
+    case 4:    return 8;
     }
 }
 
-dwarf_vma
-byte_get_big_endian (unsigned char *field, int size)
-{
-  switch (size)
-    {
-    case 1:
-      return *field;
-
-    case 2:
-      return ((unsigned int) (field[1])) | (((int) (field[0])) << 8);
-
-    case 4:
-      return ((unsigned long) (field[3]))
-       |   (((unsigned long) (field[2])) << 8)
-       |   (((unsigned long) (field[1])) << 16)
-       |   (((unsigned long) (field[0])) << 24);
-
-    case 8:
-      if (sizeof (dwarf_vma) == 8)
-       return ((dwarf_vma) (field[7]))
-         |   (((dwarf_vma) (field[6])) << 8)
-         |   (((dwarf_vma) (field[5])) << 16)
-         |   (((dwarf_vma) (field[4])) << 24)
-         |   (((dwarf_vma) (field[3])) << 32)
-         |   (((dwarf_vma) (field[2])) << 40)
-         |   (((dwarf_vma) (field[1])) << 48)
-         |   (((dwarf_vma) (field[0])) << 56);
-      else if (sizeof (dwarf_vma) == 4)
-       {
-         /* Although we are extracing data from an 8 byte wide field,
-            we are returning only 4 bytes of data.  */
-         field += 4;
-         return ((unsigned long) (field[3]))
-           |   (((unsigned long) (field[2])) << 8)
-           |   (((unsigned long) (field[1])) << 16)
-           |   (((unsigned long) (field[0])) << 24);
-       }
+static dwarf_vma
+get_encoded_value (unsigned char *data,
+                  int encoding,
+                  struct dwarf_section *section)
+{
+  int size = size_of_encoded_value (encoding);
+  dwarf_vma val;
 
-    default:
-      error (_("Unhandled data length: %d\n"), size);
-      abort ();
+  if (encoding & DW_EH_PE_signed)
+    val = byte_get_signed (data, size);
+  else
+    val = byte_get (data, size);
+
+  if ((encoding & 0x70) == DW_EH_PE_pcrel)
+    val += section->address + (data - section->start);
+  return val;
+}
+
+/* Print a dwarf_vma value (typically an address, offset or length) in
+   hexadecimal format, followed by a space.  The length of the value (and
+   hence the precision displayed) is determined by the byte_size parameter.  */
+
+static void
+print_dwarf_vma (dwarf_vma val, unsigned byte_size)
+{
+  static char buff[18];
+  int offset = 0;
+
+  /* Printf does not have a way of specifiying a maximum field width for an
+     integer value, so we print the full value into a buffer and then select
+     the precision we need.  */
+#if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
+#ifndef __MINGW32__
+  snprintf (buff, sizeof (buff), "%16.16llx ", val);
+#else
+  snprintf (buff, sizeof (buff), "%016I64x ", val);
+#endif
+#else
+  snprintf (buff, sizeof (buff), "%16.16lx ", val);
+#endif
+
+  if (byte_size != 0)
+    {
+      if (byte_size > 0 && byte_size <= 8)
+       offset = 16 - 2 * byte_size;
+      else
+       error (_("Wrong size in print_dwarf_vma"));
     }
+
+  fputs (buff + offset, stdout);
 }
 
-static dwarf_vma
-byte_get_signed (unsigned char *field, int size)
+#if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
+#ifndef __MINGW32__
+#define  DWARF_VMA_FMT "ll"
+#else
+#define  DWARF_VMA_FMT "I64"
+#endif
+#else
+#define  DWARF_VMA_FMT "l"
+#endif
+
+static const char *
+dwarf_vmatoa (const char *fmtch, dwarf_vma value)
+{
+  /* As dwarf_vmatoa is used more then once in a printf call
+     for output, we are cycling through an fixed array of pointers
+     for return address.  */
+  static int buf_pos = 0;
+  static struct dwarf_vmatoa_buf
+  {
+    char place[64];
+  } buf[16];
+  char fmt[32];
+  char *ret;
+
+  sprintf (fmt, "%%%s%s", DWARF_VMA_FMT, fmtch);
+
+  ret = buf[buf_pos++].place;
+  buf_pos %= ARRAY_SIZE (buf);
+
+  snprintf (ret, sizeof (buf[0].place), fmt, value);
+
+  return ret;
+}
+
+/* Format a 64-bit value, given as two 32-bit values, in hex.
+   For reentrancy, this uses a buffer provided by the caller.  */
+
+static const char *
+dwarf_vmatoa64 (dwarf_vma hvalue, dwarf_vma lvalue, char *buf,
+               unsigned int buf_len)
 {
-  dwarf_vma x = byte_get (field, size);
+  int len = 0;
 
-  switch (size)
+  if (hvalue == 0)
+    snprintf (buf, buf_len, "%" DWARF_VMA_FMT "x", lvalue);
+  else
     {
-    case 1:
-      return (x ^ 0x80) - 0x80;
-    case 2:
-      return (x ^ 0x8000) - 0x8000;
-    case 4:
-      return (x ^ 0x80000000) - 0x80000000;
-    case 8:
-      return x;
-    default:
-      abort ();
+      len = snprintf (buf, buf_len, "%" DWARF_VMA_FMT "x", hvalue);
+      snprintf (buf + len, buf_len - len,
+               "%08" DWARF_VMA_FMT "x", lvalue);
     }
+
+  return buf;
 }
 
-static unsigned long int
+dwarf_vma
 read_leb128 (unsigned char *data, unsigned int *length_return, int sign)
 {
-  unsigned long int result = 0;
+  dwarf_vma result = 0;
   unsigned int num_read = 0;
   unsigned int shift = 0;
   unsigned char byte;
@@ -174,7 +208,7 @@ read_leb128 (unsigned char *data, unsigned int *length_return, int sign)
       byte = *data++;
       num_read++;
 
-      result |= ((unsigned long int) (byte & 0x7f)) << shift;
+      result |= ((dwarf_vma) (byte & 0x7f)) << shift;
 
       shift += 7;
 
@@ -190,15 +224,23 @@ read_leb128 (unsigned char *data, unsigned int *length_return, int sign)
   return result;
 }
 
+/* Create a signed version to avoid painful typecasts.  */
+static dwarf_signed_vma
+read_sleb128 (unsigned char *data, unsigned int *length_return)
+{
+  return (dwarf_signed_vma) read_leb128 (data, length_return, 1);
+}
+
 typedef struct State_Machine_Registers
 {
-  unsigned long address;
+  dwarf_vma address;
   unsigned int file;
   unsigned int line;
   unsigned int column;
   int is_stmt;
   int basic_block;
-  int end_sequence;
+  unsigned char op_index;
+  unsigned char end_sequence;
 /* This variable hold the number of the last entry seen
    in the File Table.  */
   unsigned int last_file_entry;
@@ -210,6 +252,7 @@ static void
 reset_state_machine (int is_stmt)
 {
   state_machine_regs.address = 0;
+  state_machine_regs.op_index = 0;
   state_machine_regs.file = 1;
   state_machine_regs.line = 1;
   state_machine_regs.column = 0;
@@ -229,7 +272,8 @@ process_extended_line_op (unsigned char *data, int is_stmt)
   unsigned int bytes_read;
   unsigned int len;
   unsigned char *name;
-  unsigned long adr;
+  dwarf_vma adr;
+  unsigned char *orig_data = data;
 
   len = read_leb128 (data, & bytes_read, 0);
   data += bytes_read;
@@ -254,66 +298,131 @@ process_extended_line_op (unsigned char *data, int is_stmt)
 
     case DW_LNE_set_address:
       adr = byte_get (data, len - bytes_read - 1);
-      printf (_("set Address to 0x%lx\n"), adr);
+      printf (_("set Address to 0x%s\n"), dwarf_vmatoa ("x", adr));
       state_machine_regs.address = adr;
+      state_machine_regs.op_index = 0;
       break;
 
     case DW_LNE_define_file:
-      printf (_("  define new File Table entry\n"));
+      printf (_("define new File Table entry\n"));
       printf (_("  Entry\tDir\tTime\tSize\tName\n"));
 
-      printf (_("   %d\t"), ++state_machine_regs.last_file_entry);
+      printf ("   %d\t", ++state_machine_regs.last_file_entry);
       name = data;
       data += strlen ((char *) data) + 1;
-      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+      printf ("%s\t", dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
       data += bytes_read;
-      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+      printf ("%s\t", dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
       data += bytes_read;
-      printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
-      printf (_("%s\n\n"), name);
+      printf ("%s\t", dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
+      data += bytes_read;
+      printf ("%s", name);
+      if ((unsigned int) (data - orig_data) != len)
+        printf (_(" [Bad opcode length]"));
+      printf ("\n\n");
+      break;
+
+    case DW_LNE_set_discriminator:
+      printf (_("set Discriminator to %s\n"),
+             dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
       break;
 
     /* HP extensions.  */
     case DW_LNE_HP_negate_is_UV_update:
-      printf ("DW_LNE_HP_negate_is_UV_update");
+      printf ("DW_LNE_HP_negate_is_UV_update\n");
       break;
     case DW_LNE_HP_push_context:
-      printf ("DW_LNE_HP_push_context");
+      printf ("DW_LNE_HP_push_context\n");
       break;
     case DW_LNE_HP_pop_context:
-      printf ("DW_LNE_HP_pop_context");
+      printf ("DW_LNE_HP_pop_context\n");
       break;
     case DW_LNE_HP_set_file_line_column:
-      printf ("DW_LNE_HP_set_file_line_column");
+      printf ("DW_LNE_HP_set_file_line_column\n");
       break;
     case DW_LNE_HP_set_routine_name:
-      printf ("DW_LNE_HP_set_routine_name");
+      printf ("DW_LNE_HP_set_routine_name\n");
       break;
     case DW_LNE_HP_set_sequence:
-      printf ("DW_LNE_HP_set_sequence");
+      printf ("DW_LNE_HP_set_sequence\n");
       break;
     case DW_LNE_HP_negate_post_semantics:
-      printf ("DW_LNE_HP_negate_post_semantics");
+      printf ("DW_LNE_HP_negate_post_semantics\n");
       break;
     case DW_LNE_HP_negate_function_exit:
-      printf ("DW_LNE_HP_negate_function_exit");
+      printf ("DW_LNE_HP_negate_function_exit\n");
       break;
     case DW_LNE_HP_negate_front_end_logical:
-      printf ("DW_LNE_HP_negate_front_end_logical");
+      printf ("DW_LNE_HP_negate_front_end_logical\n");
       break;
     case DW_LNE_HP_define_proc:
-      printf ("DW_LNE_HP_define_proc");
+      printf ("DW_LNE_HP_define_proc\n");
+      break;
+    case DW_LNE_HP_source_file_correlation:
+      {
+        unsigned char *edata = data + len - bytes_read - 1;
+
+        printf ("DW_LNE_HP_source_file_correlation\n");
+
+        while (data < edata)
+          {
+            unsigned int opc;
+
+            opc = read_leb128 (data, & bytes_read, 0);
+            data += bytes_read;
+
+            switch (opc)
+              {
+              case DW_LNE_HP_SFC_formfeed:
+                printf ("    DW_LNE_HP_SFC_formfeed\n");
+                break;
+              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)));
+                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)));
+                data += bytes_read;
+                printf (",%s",
+                        dwarf_vmatoa ("u",
+                                      read_leb128 (data, & bytes_read, 0)));
+                data += bytes_read;
+                printf (",%s)\n",
+                        dwarf_vmatoa ("u",
+                                      read_leb128 (data, & bytes_read, 0)));
+                data += bytes_read;
+                break;
+              default:
+                printf (_("    UNKNOWN DW_LNE_HP_SFC opcode (%u)\n"), opc);
+                data = edata;
+                break;
+              }
+          }
+      }
       break;
-      
+
     default:
-      if (op_code >= DW_LNE_lo_user
-         /* The test against DW_LNW_hi_user is redundant due to
-            the limited range of the unsigned char data type used
-            for op_code.  */
-         /*&& op_code <= DW_LNE_hi_user*/)
-       printf (_("user defined: length %d\n"), len - bytes_read);
-      else
-       printf (_("UNKNOWN: length %d\n"), len - bytes_read);
+      {
+        unsigned int rlen = len - bytes_read - 1;
+
+        if (op_code >= DW_LNE_lo_user
+            /* The test against DW_LNW_hi_user is redundant due to
+               the limited range of the unsigned char data type used
+               for op_code.  */
+            /*&& op_code <= DW_LNE_hi_user*/)
+          printf (_("user defined: "));
+        else
+          printf (_("UNKNOWN: "));
+        printf (_("length %d ["), rlen);
+        for (; rlen; rlen--)
+          printf (" %02x", *data++);
+        printf ("]\n");
+      }
       break;
     }
 
@@ -321,7 +430,7 @@ process_extended_line_op (unsigned char *data, int is_stmt)
 }
 
 static const char *
-fetch_indirect_string (unsigned long offset)
+fetch_indirect_string (dwarf_vma offset)
 {
   struct dwarf_section *section = &debug_displays [str].section;
 
@@ -332,13 +441,72 @@ fetch_indirect_string (unsigned long offset)
   offset -= section->address;
   if (offset > section->size)
     {
-      warn (_("DW_FORM_strp offset too big: %lx\n"), offset);
+      warn (_("DW_FORM_strp offset too big: %s\n"),
+           dwarf_vmatoa ("x", offset));
       return _("<offset is too big>");
     }
 
   return (const char *) section->start + offset;
 }
 
+static const char *
+fetch_indexed_string (dwarf_vma idx, 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;
+  struct dwarf_section *index_section = &debug_displays [idx_sec_idx].section;
+  struct dwarf_section *str_section = &debug_displays [str_sec_idx].section;
+  dwarf_vma index_offset = idx * offset_size;
+  dwarf_vma str_offset;
+
+  if (index_section->start == NULL)
+    return (dwo ? _("<no .debug_str_offsets.dwo section>")
+               : _("<no .debug_str_offsets section>"));
+
+  /* DWARF sections under Mach-O have non-zero addresses.  */
+  index_offset -= index_section->address;
+  if (index_offset > index_section->size)
+    {
+      warn (_("DW_FORM_GNU_str_index offset too big: %s\n"),
+           dwarf_vmatoa ("x", index_offset));
+      return _("<index offset is too big>");
+    }
+
+  if (str_section->start == NULL)
+    return (dwo ? _("<no .debug_str.dwo section>")
+               : _("<no .debug_str section>"));
+
+  str_offset = byte_get (index_section->start + index_offset, offset_size);
+  str_offset -= str_section->address;
+  if (str_offset > str_section->size)
+    {
+      warn (_("DW_FORM_GNU_str_index indirect offset too big: %s\n"),
+           dwarf_vmatoa ("x", str_offset));
+      return _("<indirect index offset is too big>");
+    }
+
+  return (const char *) str_section->start + str_offset;
+}
+
+static const char *
+fetch_indexed_value (dwarf_vma offset, dwarf_vma bytes)
+{
+  struct dwarf_section *section = &debug_displays [debug_addr].section;
+
+  if (section->start == NULL)
+    return (_("<no .debug_addr section>"));
+
+  if (offset + bytes > section->size)
+    {
+      warn (_("Offset into section %s too big: %s\n"),
+            section->name, dwarf_vmatoa ("x", offset));
+      return "<offset too big>";
+    }
+
+  return dwarf_vmatoa ("x", byte_get (section->start + offset, bytes));
+}
+
+
 /* FIXME:  There are better and more efficient ways to handle
    these structures.  For now though, I just want something that
    is simple to implement.  */
@@ -367,23 +535,23 @@ static abbrev_entry *last_abbrev = NULL;
 static void
 free_abbrevs (void)
 {
-  abbrev_entry *abbrev;
+  abbrev_entry *abbrv;
 
-  for (abbrev = first_abbrev; abbrev;)
+  for (abbrv = first_abbrev; abbrv;)
     {
-      abbrev_entry *next = abbrev->next;
+      abbrev_entry *next_abbrev = abbrv->next;
       abbrev_attr *attr;
 
-      for (attr = abbrev->first_attr; attr;)
+      for (attr = abbrv->first_attr; attr;)
        {
-         abbrev_attr *next = attr->next;
+         abbrev_attr *next_attr = attr->next;
 
          free (attr);
-         attr = next;
+         attr = next_attr;
        }
 
-      free (abbrev);
-      abbrev = next;
+      free (abbrv);
+      abbrv = next_abbrev;
     }
 
   last_abbrev = first_abbrev = NULL;
@@ -394,8 +562,7 @@ add_abbrev (unsigned long number, unsigned long tag, int children)
 {
   abbrev_entry *entry;
 
-  entry = malloc (sizeof (*entry));
-
+  entry = (abbrev_entry *) malloc (sizeof (*entry));
   if (entry == NULL)
     /* ugg */
     return;
@@ -420,8 +587,7 @@ add_abbrev_attr (unsigned long attribute, unsigned long form)
 {
   abbrev_attr *attr;
 
-  attr = malloc (sizeof (*attr));
-
+  attr = (abbrev_attr *) malloc (sizeof (*attr));
   if (attr == NULL)
     /* ugg */
     return;
@@ -483,135 +649,57 @@ process_abbrev_section (unsigned char *start, unsigned char *end)
          form = read_leb128 (start, & bytes_read, 0);
          start += bytes_read;
 
-         if (attribute != 0)
-           add_abbrev_attr (attribute, form);
+         add_abbrev_attr (attribute, form);
        }
       while (attribute != 0);
     }
 
+  /* Report the missing single zero which ends the section.  */
+  error (_(".debug_abbrev section not zero terminated\n"));
+
   return NULL;
 }
 
-static char *
+static const char *
 get_TAG_name (unsigned long tag)
 {
-  switch (tag)
-    {
-    case DW_TAG_padding:               return "DW_TAG_padding";
-    case DW_TAG_array_type:            return "DW_TAG_array_type";
-    case DW_TAG_class_type:            return "DW_TAG_class_type";
-    case DW_TAG_entry_point:           return "DW_TAG_entry_point";
-    case DW_TAG_enumeration_type:      return "DW_TAG_enumeration_type";
-    case DW_TAG_formal_parameter:      return "DW_TAG_formal_parameter";
-    case DW_TAG_imported_declaration:  return "DW_TAG_imported_declaration";
-    case DW_TAG_label:                 return "DW_TAG_label";
-    case DW_TAG_lexical_block:         return "DW_TAG_lexical_block";
-    case DW_TAG_member:                        return "DW_TAG_member";
-    case DW_TAG_pointer_type:          return "DW_TAG_pointer_type";
-    case DW_TAG_reference_type:                return "DW_TAG_reference_type";
-    case DW_TAG_compile_unit:          return "DW_TAG_compile_unit";
-    case DW_TAG_string_type:           return "DW_TAG_string_type";
-    case DW_TAG_structure_type:                return "DW_TAG_structure_type";
-    case DW_TAG_subroutine_type:       return "DW_TAG_subroutine_type";
-    case DW_TAG_typedef:               return "DW_TAG_typedef";
-    case DW_TAG_union_type:            return "DW_TAG_union_type";
-    case DW_TAG_unspecified_parameters: return "DW_TAG_unspecified_parameters";
-    case DW_TAG_variant:               return "DW_TAG_variant";
-    case DW_TAG_common_block:          return "DW_TAG_common_block";
-    case DW_TAG_common_inclusion:      return "DW_TAG_common_inclusion";
-    case DW_TAG_inheritance:           return "DW_TAG_inheritance";
-    case DW_TAG_inlined_subroutine:    return "DW_TAG_inlined_subroutine";
-    case DW_TAG_module:                        return "DW_TAG_module";
-    case DW_TAG_ptr_to_member_type:    return "DW_TAG_ptr_to_member_type";
-    case DW_TAG_set_type:              return "DW_TAG_set_type";
-    case DW_TAG_subrange_type:         return "DW_TAG_subrange_type";
-    case DW_TAG_with_stmt:             return "DW_TAG_with_stmt";
-    case DW_TAG_access_declaration:    return "DW_TAG_access_declaration";
-    case DW_TAG_base_type:             return "DW_TAG_base_type";
-    case DW_TAG_catch_block:           return "DW_TAG_catch_block";
-    case DW_TAG_const_type:            return "DW_TAG_const_type";
-    case DW_TAG_constant:              return "DW_TAG_constant";
-    case DW_TAG_enumerator:            return "DW_TAG_enumerator";
-    case DW_TAG_file_type:             return "DW_TAG_file_type";
-    case DW_TAG_friend:                        return "DW_TAG_friend";
-    case DW_TAG_namelist:              return "DW_TAG_namelist";
-    case DW_TAG_namelist_item:         return "DW_TAG_namelist_item";
-    case DW_TAG_packed_type:           return "DW_TAG_packed_type";
-    case DW_TAG_subprogram:            return "DW_TAG_subprogram";
-    case DW_TAG_template_type_param:   return "DW_TAG_template_type_param";
-    case DW_TAG_template_value_param:  return "DW_TAG_template_value_param";
-    case DW_TAG_thrown_type:           return "DW_TAG_thrown_type";
-    case DW_TAG_try_block:             return "DW_TAG_try_block";
-    case DW_TAG_variant_part:          return "DW_TAG_variant_part";
-    case DW_TAG_variable:              return "DW_TAG_variable";
-    case DW_TAG_volatile_type:         return "DW_TAG_volatile_type";
-    case DW_TAG_MIPS_loop:             return "DW_TAG_MIPS_loop";
-    case DW_TAG_format_label:          return "DW_TAG_format_label";
-    case DW_TAG_function_template:     return "DW_TAG_function_template";
-    case DW_TAG_class_template:                return "DW_TAG_class_template";
-      /* DWARF 2.1 values.  */
-    case DW_TAG_dwarf_procedure:       return "DW_TAG_dwarf_procedure";
-    case DW_TAG_restrict_type:         return "DW_TAG_restrict_type";
-    case DW_TAG_interface_type:                return "DW_TAG_interface_type";
-    case DW_TAG_namespace:             return "DW_TAG_namespace";
-    case DW_TAG_imported_module:       return "DW_TAG_imported_module";
-    case DW_TAG_unspecified_type:      return "DW_TAG_unspecified_type";
-    case DW_TAG_partial_unit:          return "DW_TAG_partial_unit";
-    case DW_TAG_imported_unit:         return "DW_TAG_imported_unit";
-      /* UPC values.  */
-    case DW_TAG_upc_shared_type:       return "DW_TAG_upc_shared_type";
-    case DW_TAG_upc_strict_type:       return "DW_TAG_upc_strict_type";
-    case DW_TAG_upc_relaxed_type:      return "DW_TAG_upc_relaxed_type";
-    default:
-      {
-       static char buffer[100];
+  const char *name = get_DW_TAG_name ((unsigned int)tag);
 
-       snprintf (buffer, sizeof (buffer), _("Unknown TAG value: %lx"), tag);
-       return buffer;
-      }
+  if (name == NULL)
+    {
+      static char buffer[100];
+
+      snprintf (buffer, sizeof (buffer), _("Unknown TAG value: %lx"), tag);
+      return buffer;
     }
+
+  return name;
 }
 
-static char *
+static const char *
 get_FORM_name (unsigned long form)
 {
-  switch (form)
+  const char *name;
+  
+  if (form == 0)
+    return "DW_FORM value: 0";
+
+  name = get_DW_FORM_name (form);
+  if (name == NULL)
     {
-    case DW_FORM_addr:         return "DW_FORM_addr";
-    case DW_FORM_block2:       return "DW_FORM_block2";
-    case DW_FORM_block4:       return "DW_FORM_block4";
-    case DW_FORM_data2:                return "DW_FORM_data2";
-    case DW_FORM_data4:                return "DW_FORM_data4";
-    case DW_FORM_data8:                return "DW_FORM_data8";
-    case DW_FORM_string:       return "DW_FORM_string";
-    case DW_FORM_block:                return "DW_FORM_block";
-    case DW_FORM_block1:       return "DW_FORM_block1";
-    case DW_FORM_data1:                return "DW_FORM_data1";
-    case DW_FORM_flag:         return "DW_FORM_flag";
-    case DW_FORM_sdata:                return "DW_FORM_sdata";
-    case DW_FORM_strp:         return "DW_FORM_strp";
-    case DW_FORM_udata:                return "DW_FORM_udata";
-    case DW_FORM_ref_addr:     return "DW_FORM_ref_addr";
-    case DW_FORM_ref1:         return "DW_FORM_ref1";
-    case DW_FORM_ref2:         return "DW_FORM_ref2";
-    case DW_FORM_ref4:         return "DW_FORM_ref4";
-    case DW_FORM_ref8:         return "DW_FORM_ref8";
-    case DW_FORM_ref_udata:    return "DW_FORM_ref_udata";
-    case DW_FORM_indirect:     return "DW_FORM_indirect";
-    default:
-      {
-       static char buffer[100];
+      static char buffer[100];
 
-       snprintf (buffer, sizeof (buffer), _("Unknown FORM value: %lx"), form);
-       return buffer;
-      }
+      snprintf (buffer, sizeof (buffer), _("Unknown FORM value: %lx"), form);
+      return buffer;
     }
+
+  return name;
 }
 
 static unsigned char *
-display_block (unsigned char *data, unsigned long length)
+display_block (unsigned char *data, dwarf_vma length)
 {
-  printf (_(" %lu byte block: "), length);
+  printf (_(" %s byte block: "), dwarf_vmatoa ("u", length));
 
   while (length --)
     printf ("%lx ", (unsigned long) byte_get (data++, 1));
@@ -622,12 +710,15 @@ display_block (unsigned char *data, unsigned long length)
 static int
 decode_location_expression (unsigned char * data,
                            unsigned int pointer_size,
-                           unsigned long length,
-                           unsigned long cu_offset)
+                           unsigned int offset_size,
+                           int dwarf_version,
+                           dwarf_vma length,
+                           dwarf_vma cu_offset,
+                           struct dwarf_section * section)
 {
   unsigned op;
   unsigned int bytes_read;
-  unsigned long uvalue;
+  dwarf_vma uvalue;
   unsigned char *end = data + length;
   int need_frame_base = 0;
 
@@ -638,8 +729,8 @@ decode_location_expression (unsigned char * data,
       switch (op)
        {
        case DW_OP_addr:
-         printf ("DW_OP_addr: %lx",
-                 (unsigned long) byte_get (data, pointer_size));
+         printf ("DW_OP_addr: %s",
+                 dwarf_vmatoa ("x", byte_get (data, pointer_size)));
          data += pointer_size;
          break;
        case DW_OP_deref:
@@ -678,11 +769,13 @@ decode_location_expression (unsigned char * data,
          data += 8;
          break;
        case DW_OP_constu:
-         printf ("DW_OP_constu: %lu", read_leb128 (data, &bytes_read, 0));
+         printf ("DW_OP_constu: %s",
+                 dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
          data += bytes_read;
          break;
        case DW_OP_consts:
-         printf ("DW_OP_consts: %ld", read_leb128 (data, &bytes_read, 1));
+         printf ("DW_OP_consts: %s",
+                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read)));
          data += bytes_read;
          break;
        case DW_OP_dup:
@@ -737,8 +830,8 @@ decode_location_expression (unsigned char * data,
          printf ("DW_OP_plus");
          break;
        case DW_OP_plus_uconst:
-         printf ("DW_OP_plus_uconst: %lu",
-                 read_leb128 (data, &bytes_read, 0));
+         printf ("DW_OP_plus_uconst: %s",
+                 dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
          data += bytes_read;
          break;
        case DW_OP_shl:
@@ -847,7 +940,8 @@ decode_location_expression (unsigned char * data,
        case DW_OP_reg29:
        case DW_OP_reg30:
        case DW_OP_reg31:
-         printf ("DW_OP_reg%d", op - DW_OP_reg0);
+         printf ("DW_OP_reg%d (%s)", op - DW_OP_reg0,
+                 regname (op - DW_OP_reg0, 1));
          break;
 
        case DW_OP_breg0:
@@ -882,29 +976,37 @@ decode_location_expression (unsigned char * data,
        case DW_OP_breg29:
        case DW_OP_breg30:
        case DW_OP_breg31:
-         printf ("DW_OP_breg%d: %ld", op - DW_OP_breg0,
-                 read_leb128 (data, &bytes_read, 1));
+         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)));
          data += bytes_read;
          break;
 
        case DW_OP_regx:
-         printf ("DW_OP_regx: %lu", read_leb128 (data, &bytes_read, 0));
+         uvalue = read_leb128 (data, &bytes_read, 0);
          data += bytes_read;
+         printf ("DW_OP_regx: %s (%s)",
+                 dwarf_vmatoa ("u", uvalue), regname (uvalue, 1));
          break;
        case DW_OP_fbreg:
          need_frame_base = 1;
-         printf ("DW_OP_fbreg: %ld", read_leb128 (data, &bytes_read, 1));
+         printf ("DW_OP_fbreg: %s",
+                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read)));
          data += bytes_read;
          break;
        case DW_OP_bregx:
          uvalue = read_leb128 (data, &bytes_read, 0);
          data += bytes_read;
-         printf ("DW_OP_bregx: %lu %ld", uvalue,
-                 read_leb128 (data, &bytes_read, 1));
+         printf ("DW_OP_bregx: %s (%s) %s",
+                 dwarf_vmatoa ("u", uvalue), regname (uvalue, 1),
+                 dwarf_vmatoa ("d", read_sleb128 (data, &bytes_read)));
          data += bytes_read;
          break;
        case DW_OP_piece:
-         printf ("DW_OP_piece: %lu", read_leb128 (data, &bytes_read, 0));
+         printf ("DW_OP_piece: %s",
+                 dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
          data += bytes_read;
          break;
        case DW_OP_deref_size:
@@ -924,20 +1026,40 @@ 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.  */
-         printf ("DW_OP_call2: <%lx>", (long) byte_get (data, 2) + cu_offset);
+         printf ("DW_OP_call2: <0x%s>",
+                 dwarf_vmatoa ("x", (dwarf_signed_vma) byte_get (data, 2)
+                                    + cu_offset));
          data += 2;
          break;
        case DW_OP_call4:
          /* XXX: Strictly speaking for 64-bit DWARF3 files
             this ought to be an 8-byte wide computation.  */
-         printf ("DW_OP_call4: <%lx>", (long) byte_get (data, 4) + cu_offset);
+         printf ("DW_OP_call4: <0x%s>",
+                 dwarf_vmatoa ("x", (dwarf_signed_vma) byte_get (data, 4)
+                                    + cu_offset));
          data += 4;
          break;
        case DW_OP_call_ref:
          /* XXX: Strictly speaking for 64-bit DWARF3 files
             this ought to be an 8-byte wide computation.  */
-         printf ("DW_OP_call_ref: <%lx>", (long) byte_get (data, 4) + cu_offset);
-         data += 4;
+         if (dwarf_version == -1)
+           {
+             printf (_("(DW_OP_call_ref in frame info)"));
+             /* No way to tell where the next op is, so just bail.  */
+             return need_frame_base;
+           }
+         if (dwarf_version == 2)
+           {
+             printf ("DW_OP_call_ref: <0x%s>",
+                     dwarf_vmatoa ("x", byte_get (data, pointer_size)));
+             data += pointer_size;
+           }
+         else
+           {
+             printf ("DW_OP_call_ref: <0x%s>",
+                     dwarf_vmatoa ("x", byte_get (data, offset_size)));
+             data += offset_size;
+           }
          break;
        case DW_OP_form_tls_address:
          printf ("DW_OP_form_tls_address");
@@ -947,20 +1069,136 @@ decode_location_expression (unsigned char * data,
          break;
        case DW_OP_bit_piece:
          printf ("DW_OP_bit_piece: ");
-         printf ("size: %lu ", read_leb128 (data, &bytes_read, 0));
+         printf (_("size: %s "),
+                 dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
          data += bytes_read;
-         printf ("offset: %lu ", read_leb128 (data, &bytes_read, 0));
+         printf (_("offset: %s "),
+                 dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
          data += bytes_read;
          break;
 
+         /* DWARF 4 extensions.  */
+       case DW_OP_stack_value:
+         printf ("DW_OP_stack_value");
+         break;
+
+       case DW_OP_implicit_value:
+         printf ("DW_OP_implicit_value");
+         uvalue = read_leb128 (data, &bytes_read, 0);
+         data += bytes_read;
+         display_block (data, uvalue);
+         data += uvalue;
+         break;
+
          /* GNU extensions.  */
        case DW_OP_GNU_push_tls_address:
-         printf ("DW_OP_GNU_push_tls_address or DW_OP_HP_unknown");
+         printf (_("DW_OP_GNU_push_tls_address or DW_OP_HP_unknown"));
          break;
        case DW_OP_GNU_uninit:
          printf ("DW_OP_GNU_uninit");
          /* FIXME: Is there data associated with this OP ?  */
          break;
+       case DW_OP_GNU_encoded_addr:
+         {
+           int encoding;
+           dwarf_vma addr;
+
+           encoding = *data++;
+           addr = get_encoded_value (data, encoding, section);
+           data += size_of_encoded_value (encoding);
+
+           printf ("DW_OP_GNU_encoded_addr: fmt:%02x addr:", encoding);
+           print_dwarf_vma (addr, pointer_size);
+         }
+         break;
+       case DW_OP_GNU_implicit_pointer:
+         /* XXX: Strictly speaking for 64-bit DWARF3 files
+            this ought to be an 8-byte wide computation.  */
+         if (dwarf_version == -1)
+           {
+             printf (_("(DW_OP_GNU_implicit_pointer in frame info)"));
+             /* No way to tell where the next op is, so just bail.  */
+             return need_frame_base;
+           }
+         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;
+           }
+         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;
+           }
+         break;
+       case DW_OP_GNU_entry_value:
+         uvalue = read_leb128 (data, &bytes_read, 0);
+         data += bytes_read;
+         printf ("DW_OP_GNU_entry_value: (");
+         if (decode_location_expression (data, pointer_size, offset_size,
+                                         dwarf_version, uvalue,
+                                         cu_offset, section))
+           need_frame_base = 1;
+         putchar (')');
+         data += uvalue;
+         break;
+       case DW_OP_GNU_const_type:
+         uvalue = read_leb128 (data, &bytes_read, 0);
+         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);
+         data += uvalue;
+         break;
+       case DW_OP_GNU_regval_type:
+         uvalue = read_leb128 (data, &bytes_read, 0);
+         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);
+         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);
+         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);
+         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);
+         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:
+         printf ("DW_OP_GNU_parameter_ref: <0x%s>",
+                 dwarf_vmatoa ("x", cu_offset + byte_get (data, 4)));
+         data += 4;
+         break;
+        case DW_OP_GNU_addr_index:
+          uvalue = read_leb128 (data, &bytes_read, 0);
+          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);
+          data += bytes_read;
+          printf ("DW_OP_GNU_const_index <0x%s>", dwarf_vmatoa ("x", uvalue));
+          break;
 
          /* HP extensions.  */
        case DW_OP_HP_is_value:
@@ -988,6 +1226,15 @@ decode_location_expression (unsigned char * data,
          /* FIXME: Is there data associated with this OP ?  */
          break;
 
+         /* PGI (STMicroelectronics) extensions.  */
+       case DW_OP_PGI_omp_thread_num:
+         /* Pushes the thread number for the current thread as it would be
+            returned by the standard OpenMP library function:
+            omp_get_thread_num().  The "current thread" is the thread for
+            which the expression is being evaluated.  */
+         printf ("DW_OP_PGI_omp_thread_num");
+         break;
+
        default:
          if (op >= DW_OP_lo_user
              && op <= DW_OP_hi_user)
@@ -1007,19 +1254,20 @@ decode_location_expression (unsigned char * data,
 }
 
 static unsigned char *
-read_and_display_attr_value (unsigned long   attribute,
-                            unsigned long   form,
+read_and_display_attr_value (unsigned long attribute,
+                            unsigned long form,
                             unsigned char * data,
-                            unsigned long   cu_offset,
-                            unsigned long   pointer_size,
-                            unsigned long   offset_size,
-                            int             dwarf_version,
-                            debug_info *    debug_info_p,
-                            int             do_loc,
-                            unsigned char * section_start)
-{
-  unsigned long uvalue = 0;
+                            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)
+{
+  dwarf_vma uvalue = 0;
   unsigned char *block_start = NULL;
+  unsigned char * orig_data = data;
   unsigned int bytes_read;
 
   switch (form)
@@ -1033,15 +1281,14 @@ read_and_display_attr_value (unsigned long   attribute,
          uvalue = byte_get (data, pointer_size);
          data += pointer_size;
        }
-      else if (dwarf_version == 3)
+      else if (dwarf_version == 3 || dwarf_version == 4)
        {
          uvalue = byte_get (data, offset_size);
          data += offset_size;
        }
       else
-       {
-         error (_("Internal error: DWARF version is not 2 or 3.\n"));
-       }
+       error (_("Internal error: DWARF version is not 2, 3 or 4.\n"));
+
       break;
 
     case DW_FORM_addr:
@@ -1050,10 +1297,17 @@ read_and_display_attr_value (unsigned long   attribute,
       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;
       break;
 
+    case DW_FORM_flag_present:
+      uvalue = 1;
+      break;
+
     case DW_FORM_ref1:
     case DW_FORM_flag:
     case DW_FORM_data1:
@@ -1077,6 +1331,11 @@ read_and_display_attr_value (unsigned long   attribute,
       data += bytes_read;
       break;
 
+    case DW_FORM_GNU_str_index:
+      uvalue = read_leb128 (data, & bytes_read, 0);
+      data += bytes_read;
+      break;
+
     case DW_FORM_ref_udata:
     case DW_FORM_udata:
       uvalue = read_leb128 (data, & bytes_read, 0);
@@ -1092,14 +1351,23 @@ read_and_display_attr_value (unsigned long   attribute,
                                          cu_offset, pointer_size,
                                          offset_size, dwarf_version,
                                          debug_info_p, do_loc,
-                                         section_start);
+                                         section);
+    case DW_FORM_GNU_addr_index:
+      uvalue = read_leb128 (data, & bytes_read, 0);
+      data += bytes_read;
+      break;
     }
 
   switch (form)
     {
     case DW_FORM_ref_addr:
       if (!do_loc)
-       printf (" <0x%lx>", uvalue);
+       printf (" <0x%s>", dwarf_vmatoa ("x",uvalue));
+      break;
+
+    case DW_FORM_GNU_ref_alt:
+      if (!do_loc)
+       printf (" <alt 0x%s>", dwarf_vmatoa ("x",uvalue));
       break;
 
     case DW_FORM_ref1:
@@ -1107,31 +1375,36 @@ read_and_display_attr_value (unsigned long   attribute,
     case DW_FORM_ref4:
     case DW_FORM_ref_udata:
       if (!do_loc)
-       printf (" <0x%lx>", uvalue + cu_offset);
+       printf (" <0x%s>", dwarf_vmatoa ("x", uvalue + cu_offset));
       break;
 
     case DW_FORM_data4:
     case DW_FORM_addr:
+    case DW_FORM_sec_offset:
       if (!do_loc)
-       printf (" 0x%lx", uvalue);
+       printf (" 0x%s", dwarf_vmatoa ("x", uvalue));
       break;
 
+    case DW_FORM_flag_present:
     case DW_FORM_flag:
     case DW_FORM_data1:
     case DW_FORM_data2:
     case DW_FORM_sdata:
     case DW_FORM_udata:
       if (!do_loc)
-       printf (" %ld", uvalue);
+       printf (" %s", dwarf_vmatoa ("d", uvalue));
       break;
 
     case DW_FORM_ref8:
     case DW_FORM_data8:
       if (!do_loc)
        {
-         uvalue = byte_get (data, 4);
-         printf (" 0x%lx", uvalue);
-         printf (" 0x%lx", (unsigned long) byte_get (data + 4, 4));
+         dwarf_vma high_bits;
+         char buf[64];
+
+         byte_get_64 (data, &high_bits, &uvalue);
+         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)
@@ -1139,7 +1412,7 @@ read_and_display_attr_value (unsigned long   attribute,
          if (sizeof (uvalue) == 8)
            uvalue = byte_get (data, 8);
          else
-           error (_("DW_FORM_data8 is unsupported when sizeof (unsigned long) != 8\n"));
+           error (_("DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n"));
        }
       data += 8;
       break;
@@ -1151,6 +1424,7 @@ read_and_display_attr_value (unsigned long   attribute,
       break;
 
     case DW_FORM_block:
+    case DW_FORM_exprloc:
       uvalue = read_leb128 (data, & bytes_read, 0);
       block_start = data + bytes_read;
       if (do_loc)
@@ -1188,21 +1462,61 @@ read_and_display_attr_value (unsigned long   attribute,
 
     case DW_FORM_strp:
       if (!do_loc)
-       printf (_(" (indirect string, offset: 0x%lx): %s"),
-               uvalue, fetch_indirect_string (uvalue));
+       printf (_(" (indirect string, offset: 0x%s): %s"),
+               dwarf_vmatoa ("x", uvalue),
+               fetch_indirect_string (uvalue));
+      break;
+
+    case DW_FORM_GNU_str_index:
+      if (!do_loc)
+        {
+          const char *suffix = strrchr (section->name, '.');
+          int dwo = (suffix && strcmp (suffix, ".dwo") == 0) ? 1 : 0;
+
+          printf (_(" (indexed string: 0x%s): %s"),
+                  dwarf_vmatoa ("x", uvalue),
+                  fetch_indexed_string (uvalue, offset_size, dwo));
+        }
+      break;
+
+    case DW_FORM_GNU_strp_alt:
+      if (!do_loc)
+       printf (_(" (alt indirect string, offset: 0x%s)"),
+               dwarf_vmatoa ("x", uvalue));
       break;
 
     case DW_FORM_indirect:
       /* Handled above.  */
       break;
 
+    case DW_FORM_ref_sig8:
+      if (!do_loc)
+       {
+         dwarf_vma high_bits;
+         char buf[64];
+
+         byte_get_64 (data, &high_bits, &uvalue);
+         printf (" signature: 0x%s",
+                 dwarf_vmatoa64 (high_bits, uvalue, buf, sizeof (buf)));
+       }
+      data += 8;
+      break;
+
+    case DW_FORM_GNU_addr_index:
+      if (!do_loc)
+        printf (_(" (addr_index: 0x%s): %s"),
+                dwarf_vmatoa ("x", uvalue),
+                fetch_indexed_value (uvalue * pointer_size, pointer_size));
+      break;
+
     default:
       warn (_("Unrecognized form: %lu\n"), form);
       break;
     }
 
   if ((do_loc || do_debug_loc || do_debug_ranges)
-      && num_debug_info_entries == 0)
+      && num_debug_info_entries == 0
+      && debug_info_p != NULL)
     {
       switch (attribute)
        {
@@ -1216,22 +1530,28 @@ read_and_display_attr_value (unsigned long   attribute,
        case DW_AT_segment:
        case DW_AT_static_link:
        case DW_AT_use_location:
-         if (form == DW_FORM_data4 || form == DW_FORM_data8)
+       case DW_AT_GNU_call_site_value:
+       case DW_AT_GNU_call_site_data_value:
+       case DW_AT_GNU_call_site_target:
+       case DW_AT_GNU_call_site_target_clobbered:
+         if ((dwarf_version < 4
+              && (form == DW_FORM_data4 || form == DW_FORM_data8))
+             || form == DW_FORM_sec_offset)
            {
              /* Process location list.  */
-             unsigned int max = debug_info_p->max_loc_offsets;
+             unsigned int lmax = debug_info_p->max_loc_offsets;
              unsigned int num = debug_info_p->num_loc_offsets;
 
-             if (max == 0 || num >= max)
+             if (lmax == 0 || num >= lmax)
                {
-                 max += 1024;
-                 debug_info_p->loc_offsets
-                   = xcrealloc (debug_info_p->loc_offsets,
-                                max, sizeof (*debug_info_p->loc_offsets));
-                 debug_info_p->have_frame_base
-                   = xcrealloc (debug_info_p->have_frame_base,
-                                max, sizeof (*debug_info_p->have_frame_base));
-                 debug_info_p->max_loc_offsets = max;
+                 lmax += 1024;
+                 debug_info_p->loc_offsets = (dwarf_vma *)
+                      xcrealloc (debug_info_p->loc_offsets,
+                                lmax, sizeof (*debug_info_p->loc_offsets));
+                 debug_info_p->have_frame_base = (int *)
+                      xcrealloc (debug_info_p->have_frame_base,
+                                lmax, sizeof (*debug_info_p->have_frame_base));
+                 debug_info_p->max_loc_offsets = lmax;
                }
              debug_info_p->loc_offsets [num] = uvalue;
              debug_info_p->have_frame_base [num] = have_frame_base;
@@ -1244,20 +1564,30 @@ read_and_display_attr_value (unsigned long   attribute,
            debug_info_p->base_address = uvalue;
          break;
 
+       case DW_AT_GNU_addr_base:
+          debug_info_p->addr_base = uvalue;
+         break;
+
+       case DW_AT_GNU_ranges_base:
+          debug_info_p->ranges_base = uvalue;
+         break;
+
        case DW_AT_ranges:
-         if (form == DW_FORM_data4 || form == DW_FORM_data8)
+         if ((dwarf_version < 4
+              && (form == DW_FORM_data4 || form == DW_FORM_data8))
+             || form == DW_FORM_sec_offset)
            {
              /* Process range list.  */
-             unsigned int max = debug_info_p->max_range_lists;
+             unsigned int lmax = debug_info_p->max_range_lists;
              unsigned int num = debug_info_p->num_range_lists;
 
-             if (max == 0 || num >= max)
+             if (lmax == 0 || num >= lmax)
                {
-                 max += 1024;
-                 debug_info_p->range_lists
-                   = xcrealloc (debug_info_p->range_lists,
-                                max, sizeof (*debug_info_p->range_lists));
-                 debug_info_p->max_range_lists = max;
+                 lmax += 1024;
+                 debug_info_p->range_lists = (dwarf_vma *)
+                      xcrealloc (debug_info_p->range_lists,
+                                lmax, sizeof (*debug_info_p->range_lists));
+                 debug_info_p->max_range_lists = lmax;
                }
              debug_info_p->range_lists [num] = uvalue;
              debug_info_p->num_range_lists++;
@@ -1269,7 +1599,7 @@ read_and_display_attr_value (unsigned long   attribute,
        }
     }
 
-  if (do_loc)
+  if (do_loc || attribute == 0)
     return data;
 
   /* For some attributes we can display further information.  */
@@ -1293,7 +1623,8 @@ read_and_display_attr_value (unsigned long   attribute,
          printf (_("(declared as inline and inlined)"));
          break;
        default:
-         printf (_("  (Unknown inline attribute value: %lx)"), uvalue);
+         printf (_("  (Unknown inline attribute value: %s)"),
+                 dwarf_vmatoa ("x", uvalue));
          break;
        }
       break;
@@ -1323,15 +1654,20 @@ read_and_display_attr_value (unsigned long   attribute,
        case DW_LANG_ObjC_plus_plus:    printf ("(Objective C++)"); break;
        case DW_LANG_UPC:               printf ("(Unified Parallel C)"); break;
        case DW_LANG_D:                 printf ("(D)"); break;
+         /* DWARF 4 values.  */
+       case DW_LANG_Python:            printf ("(Python)"); break;
+         /* DWARF 5 values.  */
+       case DW_LANG_Go:                printf ("(Go)"); break;
          /* MIPS extension.  */
        case DW_LANG_Mips_Assembler:    printf ("(MIPS assembler)"); break;
          /* UPC extension.  */
        case DW_LANG_Upc:               printf ("(Unified Parallel C)"); break;
        default:
          if (uvalue >= DW_LANG_lo_user && uvalue <= DW_LANG_hi_user)
-           printf ("(implementation defined: %lx)", uvalue);
+           printf (_("(implementation defined: %s)"),
+                   dwarf_vmatoa ("x", uvalue));
          else
-           printf ("(Unknown: %lx)", uvalue);
+           printf (_("(Unknown: %s)"), dwarf_vmatoa ("x", uvalue));
          break;
        }
       break;
@@ -1369,9 +1705,9 @@ read_and_display_attr_value (unsigned long   attribute,
        default:
          if (uvalue >= DW_ATE_lo_user
              && uvalue <= DW_ATE_hi_user)
-           printf ("(user defined type)");
+           printf (_("(user defined type)"));
          else
-           printf ("(unknown type)");
+           printf (_("(unknown type)"));
          break;
        }
       break;
@@ -1383,7 +1719,7 @@ read_and_display_attr_value (unsigned long   attribute,
        case DW_ACCESS_protected:       printf ("(protected)"); break;
        case DW_ACCESS_private:         printf ("(private)"); break;
        default:
-         printf ("(unknown accessibility)");
+         printf (_("(unknown accessibility)"));
          break;
        }
       break;
@@ -1394,7 +1730,7 @@ read_and_display_attr_value (unsigned long   attribute,
        case DW_VIS_local:              printf ("(local)"); break;
        case DW_VIS_exported:           printf ("(exported)"); break;
        case DW_VIS_qualified:          printf ("(qualified)"); break;
-       default:                        printf ("(unknown visibility)"); break;
+       default:                        printf (_("(unknown visibility)")); break;
        }
       break;
 
@@ -1404,7 +1740,7 @@ read_and_display_attr_value (unsigned long   attribute,
        case DW_VIRTUALITY_none:        printf ("(none)"); break;
        case DW_VIRTUALITY_virtual:     printf ("(virtual)"); break;
        case DW_VIRTUALITY_pure_virtual:printf ("(pure_virtual)"); break;
-       default:                        printf ("(unknown virtuality)"); break;
+       default:                        printf (_("(unknown virtuality)")); break;
        }
       break;
 
@@ -1415,7 +1751,7 @@ read_and_display_attr_value (unsigned long   attribute,
        case DW_ID_up_case:             printf ("(up_case)"); break;
        case DW_ID_down_case:           printf ("(down_case)"); break;
        case DW_ID_case_insensitive:    printf ("(case_insensitive)"); break;
-       default:                        printf ("(unknown case)"); break;
+       default:                        printf (_("(unknown case)")); break;
        }
       break;
 
@@ -1428,16 +1764,16 @@ read_and_display_attr_value (unsigned long   attribute,
        default:
          if (uvalue >= DW_CC_lo_user
              && uvalue <= DW_CC_hi_user)
-           printf ("(user defined)");
+           printf (_("(user defined)"));
          else
-           printf ("(unknown convention)");
+           printf (_("(unknown convention)"));
        }
       break;
 
     case DW_AT_ordering:
       switch (uvalue)
        {
-       case -1: printf ("(undefined)"); break;
+       case -1: printf (_("(undefined)")); break;
        case 0:  printf ("(row major)"); break;
        case 1:  printf ("(column major)"); break;
        }
@@ -1453,7 +1789,13 @@ read_and_display_attr_value (unsigned long   attribute,
     case DW_AT_segment:
     case DW_AT_static_link:
     case DW_AT_use_location:
-      if (form == DW_FORM_data4 || form == DW_FORM_data8)
+    case DW_AT_GNU_call_site_value:
+    case DW_AT_GNU_call_site_data_value:
+    case DW_AT_GNU_call_site_target:
+    case DW_AT_GNU_call_site_target_clobbered:
+      if ((dwarf_version < 4
+           && (form == DW_FORM_data4 || form == DW_FORM_data8))
+         || form == DW_FORM_sec_offset)
        printf (_("(location list)"));
       /* Fall through.  */
     case DW_AT_allocated:
@@ -1461,7 +1803,7 @@ read_and_display_attr_value (unsigned long   attribute,
     case DW_AT_data_location:
     case DW_AT_stride:
     case DW_AT_upper_bound:
-    case DW_AT_lower_bound:      
+    case DW_AT_lower_bound:
       if (block_start)
        {
          int need_frame_base;
@@ -1469,8 +1811,10 @@ read_and_display_attr_value (unsigned long   attribute,
          printf ("(");
          need_frame_base = decode_location_expression (block_start,
                                                        pointer_size,
+                                                       offset_size,
+                                                       dwarf_version,
                                                        uvalue,
-                                                       cu_offset);
+                                                       cu_offset, section);
          printf (")");
          if (need_frame_base && !have_frame_base)
            printf (_(" [without DW_AT_frame_base]"));
@@ -1479,23 +1823,41 @@ read_and_display_attr_value (unsigned long   attribute,
 
     case DW_AT_import:
       {
-       unsigned long abbrev_number;
-       abbrev_entry * entry;
+       if (form == DW_FORM_ref_sig8
+           || form == DW_FORM_GNU_ref_alt)
+          break;
 
        if (form == DW_FORM_ref1
            || form == DW_FORM_ref2
-           || form == DW_FORM_ref4)
+           || form == DW_FORM_ref4
+           || form == DW_FORM_ref_udata)
          uvalue += cu_offset;
 
-       abbrev_number = read_leb128 (section_start + uvalue, NULL, 0);
-       
-       printf ("[Abbrev Number: %ld", abbrev_number);
-       for (entry = first_abbrev; entry != NULL; entry = entry->next)
-         if (entry->entry == abbrev_number)
-           break;
-       if (entry != NULL)
-         printf (" (%s)", get_TAG_name (entry->tag));
-       printf ("]");
+       if (uvalue >= section->size)
+         warn (_("Offset %s used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"),
+               dwarf_vmatoa ("x", uvalue),
+               (unsigned long) (orig_data - section->start));
+       else
+         {
+           unsigned long abbrev_number;
+           abbrev_entry * entry;
+
+           abbrev_number = read_leb128 (section->start + uvalue, NULL, 0);
+
+           printf (_("[Abbrev Number: %ld"), abbrev_number);
+           /* Don't look up abbrev for DW_FORM_ref_addr, as it very often will
+              use different abbrev table, and we don't track .debug_info chunks
+              yet.  */
+           if (form != DW_FORM_ref_addr)
+             {
+               for (entry = first_abbrev; entry != NULL; entry = entry->next)
+                 if (entry->entry == abbrev_number)
+                   break;
+               if (entry != NULL)
+                 printf (" (%s)", get_TAG_name (entry->tag));
+             }
+           printf ("]");
+         }
       }
       break;
 
@@ -1506,178 +1868,50 @@ read_and_display_attr_value (unsigned long   attribute,
   return data;
 }
 
-static char *
+static const char *
 get_AT_name (unsigned long attribute)
 {
-  switch (attribute)
-    {
-    case DW_AT_sibling:                        return "DW_AT_sibling";
-    case DW_AT_location:               return "DW_AT_location";
-    case DW_AT_name:                   return "DW_AT_name";
-    case DW_AT_ordering:               return "DW_AT_ordering";
-    case DW_AT_subscr_data:            return "DW_AT_subscr_data";
-    case DW_AT_byte_size:              return "DW_AT_byte_size";
-    case DW_AT_bit_offset:             return "DW_AT_bit_offset";
-    case DW_AT_bit_size:               return "DW_AT_bit_size";
-    case DW_AT_element_list:           return "DW_AT_element_list";
-    case DW_AT_stmt_list:              return "DW_AT_stmt_list";
-    case DW_AT_low_pc:                 return "DW_AT_low_pc";
-    case DW_AT_high_pc:                        return "DW_AT_high_pc";
-    case DW_AT_language:               return "DW_AT_language";
-    case DW_AT_member:                 return "DW_AT_member";
-    case DW_AT_discr:                  return "DW_AT_discr";
-    case DW_AT_discr_value:            return "DW_AT_discr_value";
-    case DW_AT_visibility:             return "DW_AT_visibility";
-    case DW_AT_import:                 return "DW_AT_import";
-    case DW_AT_string_length:          return "DW_AT_string_length";
-    case DW_AT_common_reference:       return "DW_AT_common_reference";
-    case DW_AT_comp_dir:               return "DW_AT_comp_dir";
-    case DW_AT_const_value:            return "DW_AT_const_value";
-    case DW_AT_containing_type:                return "DW_AT_containing_type";
-    case DW_AT_default_value:          return "DW_AT_default_value";
-    case DW_AT_inline:                 return "DW_AT_inline";
-    case DW_AT_is_optional:            return "DW_AT_is_optional";
-    case DW_AT_lower_bound:            return "DW_AT_lower_bound";
-    case DW_AT_producer:               return "DW_AT_producer";
-    case DW_AT_prototyped:             return "DW_AT_prototyped";
-    case DW_AT_return_addr:            return "DW_AT_return_addr";
-    case DW_AT_start_scope:            return "DW_AT_start_scope";
-    case DW_AT_stride_size:            return "DW_AT_stride_size";
-    case DW_AT_upper_bound:            return "DW_AT_upper_bound";
-    case DW_AT_abstract_origin:                return "DW_AT_abstract_origin";
-    case DW_AT_accessibility:          return "DW_AT_accessibility";
-    case DW_AT_address_class:          return "DW_AT_address_class";
-    case DW_AT_artificial:             return "DW_AT_artificial";
-    case DW_AT_base_types:             return "DW_AT_base_types";
-    case DW_AT_calling_convention:     return "DW_AT_calling_convention";
-    case DW_AT_count:                  return "DW_AT_count";
-    case DW_AT_data_member_location:   return "DW_AT_data_member_location";
-    case DW_AT_decl_column:            return "DW_AT_decl_column";
-    case DW_AT_decl_file:              return "DW_AT_decl_file";
-    case DW_AT_decl_line:              return "DW_AT_decl_line";
-    case DW_AT_declaration:            return "DW_AT_declaration";
-    case DW_AT_discr_list:             return "DW_AT_discr_list";
-    case DW_AT_encoding:               return "DW_AT_encoding";
-    case DW_AT_external:               return "DW_AT_external";
-    case DW_AT_frame_base:             return "DW_AT_frame_base";
-    case DW_AT_friend:                 return "DW_AT_friend";
-    case DW_AT_identifier_case:                return "DW_AT_identifier_case";
-    case DW_AT_macro_info:             return "DW_AT_macro_info";
-    case DW_AT_namelist_items:         return "DW_AT_namelist_items";
-    case DW_AT_priority:               return "DW_AT_priority";
-    case DW_AT_segment:                        return "DW_AT_segment";
-    case DW_AT_specification:          return "DW_AT_specification";
-    case DW_AT_static_link:            return "DW_AT_static_link";
-    case DW_AT_type:                   return "DW_AT_type";
-    case DW_AT_use_location:           return "DW_AT_use_location";
-    case DW_AT_variable_parameter:     return "DW_AT_variable_parameter";
-    case DW_AT_virtuality:             return "DW_AT_virtuality";
-    case DW_AT_vtable_elem_location:   return "DW_AT_vtable_elem_location";
-      /* DWARF 2.1 values.  */
-    case DW_AT_allocated:              return "DW_AT_allocated";
-    case DW_AT_associated:             return "DW_AT_associated";
-    case DW_AT_data_location:          return "DW_AT_data_location";
-    case DW_AT_stride:                 return "DW_AT_stride";
-    case DW_AT_entry_pc:               return "DW_AT_entry_pc";
-    case DW_AT_use_UTF8:               return "DW_AT_use_UTF8";
-    case DW_AT_extension:              return "DW_AT_extension";
-    case DW_AT_ranges:                 return "DW_AT_ranges";
-    case DW_AT_trampoline:             return "DW_AT_trampoline";
-    case DW_AT_call_column:            return "DW_AT_call_column";
-    case DW_AT_call_file:              return "DW_AT_call_file";
-    case DW_AT_call_line:              return "DW_AT_call_line";
-    case DW_AT_description:            return "DW_AT_description";
-    case DW_AT_binary_scale:           return "DW_AT_binary_scale";
-    case DW_AT_decimal_scale:          return "DW_AT_decimal_scale";
-    case DW_AT_small:                  return "DW_AT_small";
-    case DW_AT_decimal_sign:           return "DW_AT_decimal_sign";
-    case DW_AT_digit_count:            return "DW_AT_digit_count";
-    case DW_AT_picture_string:         return "DW_AT_picture_string";
-    case DW_AT_mutable:                        return "DW_AT_mutable";
-    case DW_AT_threads_scaled:         return "DW_AT_threads_scaled";
-    case DW_AT_explicit:               return "DW_AT_explicit";
-    case DW_AT_object_pointer:         return "DW_AT_object_pointer";
-    case DW_AT_endianity:              return "DW_AT_endianity";
-    case DW_AT_elemental:              return "DW_AT_elemental";
-    case DW_AT_pure:                   return "DW_AT_pure";
-    case DW_AT_recursive:              return "DW_AT_recursive";
-
-      /* HP and SGI/MIPS extensions.  */
-    case DW_AT_MIPS_loop_begin:                        return "DW_AT_MIPS_loop_begin";
-    case DW_AT_MIPS_tail_loop_begin:           return "DW_AT_MIPS_tail_loop_begin";
-    case DW_AT_MIPS_epilog_begin:              return "DW_AT_MIPS_epilog_begin";
-    case DW_AT_MIPS_loop_unroll_factor:        return "DW_AT_MIPS_loop_unroll_factor";
-    case DW_AT_MIPS_software_pipeline_depth:   return "DW_AT_MIPS_software_pipeline_depth";
-    case DW_AT_MIPS_linkage_name:              return "DW_AT_MIPS_linkage_name";
-    case DW_AT_MIPS_stride:                    return "DW_AT_MIPS_stride";
-    case DW_AT_MIPS_abstract_name:             return "DW_AT_MIPS_abstract_name";
-    case DW_AT_MIPS_clone_origin:              return "DW_AT_MIPS_clone_origin";
-    case DW_AT_MIPS_has_inlines:               return "DW_AT_MIPS_has_inlines";
-
-      /* HP Extensions.  */
-    case DW_AT_HP_block_index:                 return "DW_AT_HP_block_index";      
-    case DW_AT_HP_actuals_stmt_list:           return "DW_AT_HP_actuals_stmt_list";
-    case DW_AT_HP_proc_per_section:            return "DW_AT_HP_proc_per_section";
-    case DW_AT_HP_raw_data_ptr:                        return "DW_AT_HP_raw_data_ptr";
-    case DW_AT_HP_pass_by_reference:           return "DW_AT_HP_pass_by_reference";
-    case DW_AT_HP_opt_level:                   return "DW_AT_HP_opt_level";
-    case DW_AT_HP_prof_version_id:             return "DW_AT_HP_prof_version_id";
-    case DW_AT_HP_opt_flags:                   return "DW_AT_HP_opt_flags";
-    case DW_AT_HP_cold_region_low_pc:          return "DW_AT_HP_cold_region_low_pc";
-    case DW_AT_HP_cold_region_high_pc:         return "DW_AT_HP_cold_region_high_pc";
-    case DW_AT_HP_all_variables_modifiable:    return "DW_AT_HP_all_variables_modifiable";
-    case DW_AT_HP_linkage_name:                        return "DW_AT_HP_linkage_name";
-    case DW_AT_HP_prof_flags:                  return "DW_AT_HP_prof_flags";
-
-      /* One value is shared by the MIPS and HP extensions:  */
-    case DW_AT_MIPS_fde:                       return "DW_AT_MIPS_fde or DW_AT_HP_unmodifiable";
-      
-      /* GNU extensions.  */
-    case DW_AT_sf_names:               return "DW_AT_sf_names";
-    case DW_AT_src_info:               return "DW_AT_src_info";
-    case DW_AT_mac_info:               return "DW_AT_mac_info";
-    case DW_AT_src_coords:             return "DW_AT_src_coords";
-    case DW_AT_body_begin:             return "DW_AT_body_begin";
-    case DW_AT_body_end:               return "DW_AT_body_end";
-    case DW_AT_GNU_vector:             return "DW_AT_GNU_vector";
-
-      /* UPC extension.  */
-    case DW_AT_upc_threads_scaled:     return "DW_AT_upc_threads_scaled";
-
-    /* PGI (STMicroelectronics) extensions.  */
-    case DW_AT_PGI_lbase:              return "DW_AT_PGI_lbase";
-    case DW_AT_PGI_soffset:            return "DW_AT_PGI_soffset";
-    case DW_AT_PGI_lstride:            return "DW_AT_PGI_lstride";
+  const char *name;
 
-    default:
-      {
-       static char buffer[100];
+  if (attribute == 0)
+    return "DW_AT value: 0";
 
-       snprintf (buffer, sizeof (buffer), _("Unknown AT value: %lx"),
-                 attribute);
-       return buffer;
-      }
+  /* One value is shared by the MIPS and HP extensions:  */
+  if (attribute == DW_AT_MIPS_fde)
+    return "DW_AT_MIPS_fde or DW_AT_HP_unmodifiable";
+
+  name = get_DW_AT_name (attribute);
+
+  if (name == NULL)
+    {
+      static char buffer[100];
+
+      snprintf (buffer, sizeof (buffer), _("Unknown AT value: %lx"),
+               attribute);
+      return buffer;
     }
+
+  return name;
 }
 
 static unsigned char *
-read_and_display_attr (unsigned long   attribute,
-                      unsigned long   form,
+read_and_display_attr (unsigned long attribute,
+                      unsigned long form,
                       unsigned char * data,
-                      unsigned long   cu_offset,
-                      unsigned long   pointer_size,
-                      unsigned long   offset_size,
-                      int             dwarf_version,
-                      debug_info *    debug_info_p,
-                      int             do_loc,
-                      unsigned char * section_start)
+                      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)
 {
   if (!do_loc)
     printf ("   %-18s:", get_AT_name (attribute));
   data = read_and_display_attr_value (attribute, form, data, cu_offset,
                                      pointer_size, offset_size,
                                      dwarf_version, debug_info_p,
-                                     do_loc, section_start);
+                                     do_loc, section);
   if (!do_loc)
     printf ("\n");
   return data;
@@ -1686,11 +1920,15 @@ read_and_display_attr (unsigned long   attribute,
 
 /* 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.  */
+   anything to the user.  If do_types is non-zero, we are processing
+   a .debug_types section instead of a .debug_info section.  */
 
 static int
-process_debug_info (struct dwarf_section *section, void *file,
-                   int do_loc)
+process_debug_info (struct dwarf_section *section,
+                   void *file,
+                    enum dwarf_section_display_enum abbrev_sec,
+                   int do_loc,
+                   int do_types)
 {
   unsigned char *start = section->start;
   unsigned char *end = start + section->size;
@@ -1699,9 +1937,10 @@ process_debug_info (struct dwarf_section *section, void *file,
   unsigned int num_units = 0;
 
   if ((do_loc || do_debug_loc || do_debug_ranges)
-      && num_debug_info_entries == 0)
+      && num_debug_info_entries == 0
+      && ! do_types)
     {
-      unsigned long length;
+      dwarf_vma length;
 
       /* First scan the section to get the number of comp units.  */
       for (section_begin = start, num_units = 0; section_begin < end;
@@ -1719,7 +1958,8 @@ process_debug_info (struct dwarf_section *section, void *file,
            }
          else if (length >= 0xfffffff0 && length < 0xffffffff)
            {
-             warn (_("Reserved length value (%lx) found in section %s\n"), length, section->name);
+             warn (_("Reserved length value (0x%s) found in section %s\n"),
+                   dwarf_vmatoa ("x", length), section->name);
              return 0;
            }
          else
@@ -1730,7 +1970,8 @@ process_debug_info (struct dwarf_section *section, void *file,
             relocations to an object file.  */
          if ((signed long) length <= 0)
            {
-             warn (_("Corrupt unit length (%lx) found in section %s\n"), length, section->name);
+             warn (_("Corrupt unit length (0x%s) found in section %s\n"),
+                   dwarf_vmatoa ("x", length), section->name);
              return 0;
            }
        }
@@ -1742,8 +1983,8 @@ process_debug_info (struct dwarf_section *section, void *file,
        }
 
       /* Then allocate an array to hold the information.  */
-      debug_information = cmalloc (num_units,
-                                  sizeof (* debug_information));
+      debug_information = (debug_info *) cmalloc (num_units,
+                                                  sizeof (* debug_information));
       if (debug_information == NULL)
        {
          error (_("Not enough memory for a debug info array of %u entries"),
@@ -1754,16 +1995,21 @@ process_debug_info (struct dwarf_section *section, void *file,
 
   if (!do_loc)
     {
-      printf (_("The section %s contains:\n\n"), section->name);
+      if (dwarf_start_die == 0)
+       printf (_("Contents of the %s section:\n\n"), section->name);
 
       load_debug_section (str, file);
+      load_debug_section (str_dwo, file);
+      load_debug_section (str_index, file);
+      load_debug_section (str_index_dwo, file);
+      load_debug_section (debug_addr, file);
     }
 
-  load_debug_section (abbrev, file);
-  if (debug_displays [abbrev].section.start == NULL)
+  load_debug_section (abbrev_sec, file);
+  if (debug_displays [abbrev_sec].section.start == NULL)
     {
       warn (_("Unable to locate %s section!\n"),
-           debug_displays [abbrev].section.name);
+           debug_displays [abbrev_sec].section.name);
       return 0;
     }
 
@@ -1771,12 +2017,14 @@ process_debug_info (struct dwarf_section *section, void *file,
     {
       DWARF2_Internal_CompUnit compunit;
       unsigned char *hdrptr;
-      unsigned char *cu_abbrev_offset_ptr;
       unsigned char *tags;
-      int level;
-      unsigned long cu_offset;
+      int level, last_level, saved_level;
+      dwarf_vma cu_offset;
       int offset_size;
       int initial_length_size;
+      dwarf_vma signature_high = 0;
+      dwarf_vma signature_low = 0;
+      dwarf_vma type_offset = 0;
 
       hdrptr = start;
 
@@ -1801,19 +2049,32 @@ process_debug_info (struct dwarf_section *section, void *file,
 
       cu_offset = start - section_begin;
 
-      cu_abbrev_offset_ptr = hdrptr;
       compunit.cu_abbrev_offset = byte_get (hdrptr, offset_size);
       hdrptr += offset_size;
 
       compunit.cu_pointer_size = byte_get (hdrptr, 1);
       hdrptr += 1;
+
+      if (do_types)
+        {
+          byte_get_64 (hdrptr, &signature_high, &signature_low);
+          hdrptr += 8;
+          type_offset = byte_get (hdrptr, offset_size);
+          hdrptr += offset_size;
+        }
+
       if ((do_loc || do_debug_loc || do_debug_ranges)
-         && num_debug_info_entries == 0)
+         && num_debug_info_entries == 0
+         && ! do_types)
        {
          debug_information [unit].cu_offset = cu_offset;
          debug_information [unit].pointer_size
            = compunit.cu_pointer_size;
+         debug_information [unit].offset_size = offset_size;
+         debug_information [unit].dwarf_version = compunit.cu_version;
          debug_information [unit].base_address = 0;
+         debug_information [unit].addr_base = DEBUG_INFO_UNAVAILABLE;
+         debug_information [unit].ranges_base = DEBUG_INFO_UNAVAILABLE;
          debug_information [unit].loc_offsets = NULL;
          debug_information [unit].have_frame_base = NULL;
          debug_information [unit].max_loc_offsets = 0;
@@ -1823,30 +2084,48 @@ process_debug_info (struct dwarf_section *section, void *file,
          debug_information [unit].num_range_lists = 0;
        }
 
-      if (!do_loc)
+      if (!do_loc && dwarf_start_die == 0)
        {
-         printf (_("  Compilation Unit @ offset 0x%lx:\n"), cu_offset);
-         printf (_("   Length:        0x%lx (%s)\n"), compunit.cu_length,
-                 initial_length_size == 8 ? "64-bit" : "32-bit");
+         printf (_("  Compilation Unit @ offset 0x%s:\n"),
+                 dwarf_vmatoa ("x", cu_offset));
+         printf (_("   Length:        0x%s (%s)\n"),
+                 dwarf_vmatoa ("x", compunit.cu_length),
+                 offset_size == 8 ? "64-bit" : "32-bit");
          printf (_("   Version:       %d\n"), compunit.cu_version);
-         printf (_("   Abbrev Offset: %ld\n"), compunit.cu_abbrev_offset);
+         printf (_("   Abbrev Offset: 0x%s\n"),
+                 dwarf_vmatoa ("x", compunit.cu_abbrev_offset));
          printf (_("   Pointer Size:  %d\n"), compunit.cu_pointer_size);
+         if (do_types)
+           {
+             char buf[64];
+
+             printf (_("   Signature:     0x%s\n"),
+                     dwarf_vmatoa64 (signature_high, signature_low,
+                                     buf, sizeof (buf)));
+             printf (_("   Type Offset:   0x%s\n"),
+                     dwarf_vmatoa ("x", type_offset));
+           }
        }
 
       if (cu_offset + compunit.cu_length + initial_length_size
          > section->size)
        {
-         warn (_("Debug info is corrupted, length of CU at %lx extends beyond end of section (length = %lx)\n"),
-               cu_offset, compunit.cu_length);
+         warn (_("Debug info is corrupted, length of CU at %s"
+                 " extends beyond end of section (length = %s)\n"),
+               dwarf_vmatoa ("x", cu_offset),
+               dwarf_vmatoa ("x", compunit.cu_length));
          break;
        }
       tags = hdrptr;
       start += compunit.cu_length + initial_length_size;
 
-      if (compunit.cu_version != 2 && compunit.cu_version != 3)
+      if (compunit.cu_version != 2
+         && compunit.cu_version != 3
+         && compunit.cu_version != 4)
        {
-         warn (_("CU at offset %lx contains corrupt or unsupported version number: %d.\n"),
-               cu_offset, compunit.cu_version);
+         warn (_("CU at offset %s contains corrupt or "
+                 "unsupported version number: %d.\n"),
+               dwarf_vmatoa ("x", cu_offset), compunit.cu_version);
          continue;
        }
 
@@ -1854,18 +2133,20 @@ process_debug_info (struct dwarf_section *section, void *file,
 
       /* 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].section.size)
+      if (compunit.cu_abbrev_offset >= debug_displays [abbrev_sec].section.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].section.size);
+             (unsigned long) debug_displays [abbrev_sec].section.size);
       else
        process_abbrev_section
-         ((unsigned char *) debug_displays [abbrev].section.start
-          + compunit.cu_abbrev_offset - debug_displays [abbrev].section.address,
-          (unsigned char *) debug_displays [abbrev].section.start
-          + debug_displays [abbrev].section.size);
+         ((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);
 
       level = 0;
+      last_level = level;
+      saved_level = -1;
       while (tags < start)
        {
          unsigned int bytes_read;
@@ -1873,15 +2154,33 @@ process_debug_info (struct dwarf_section *section, void *file,
          unsigned long die_offset;
          abbrev_entry *entry;
          abbrev_attr *attr;
+         int do_printing = 1;
 
          die_offset = tags - section_begin;
 
          abbrev_number = read_leb128 (tags, & bytes_read, 0);
          tags += bytes_read;
 
-         /* A null DIE marks the end of a list of siblings.  */
+         /* A null DIE marks the end of a list of siblings or it may also be
+            a section padding.  */
          if (abbrev_number == 0)
            {
+             /* Check if it can be a section padding for the last CU.  */
+             if (level == 0 && start == end)
+               {
+                 unsigned char *chk;
+
+                 for (chk = tags; chk < start; chk++)
+                   if (*chk != 0)
+                     break;
+                 if (chk == start)
+                   break;
+               }
+
+             if (!do_loc && die_offset >= dwarf_start_die)
+               printf (_(" <%d><%lx>: Abbrev Number: 0\n"),
+                       level, die_offset);
+
              --level;
              if (level < 0)
                {
@@ -1889,20 +2188,38 @@ process_debug_info (struct dwarf_section *section, void *file,
 
                  if (num_bogus_warns < 3)
                    {
-                     warn (_("Bogus end-of-siblings marker detected at offset %lx in .debug_info section\n"),
-                           die_offset);
+                     warn (_("Bogus end-of-siblings marker detected at offset %lx in %s section\n"),
+                           die_offset, section->name);
                      num_bogus_warns ++;
                      if (num_bogus_warns == 3)
                        warn (_("Further warnings about bogus end-of-sibling markers suppressed\n"));
                    }
                }
+             if (dwarf_start_die != 0 && level < saved_level)
+               return 1;
              continue;
            }
 
          if (!do_loc)
-           printf (_(" <%d><%lx>: Abbrev Number: %lu"),
-                   level, die_offset, abbrev_number);
+           {
+             if (dwarf_start_die != 0 && die_offset < dwarf_start_die)
+               do_printing = 0;
+             else
+               {
+                 if (dwarf_start_die != 0 && die_offset == dwarf_start_die)
+                   saved_level = level;
+                 do_printing = (dwarf_cutoff_level == -1
+                                || level < dwarf_cutoff_level);
+                 if (do_printing)
+                   printf (_(" <%d><%lx>: Abbrev Number: %lu"),
+                           level, die_offset, abbrev_number);
+                 else if (dwarf_cutoff_level == -1
+                          || last_level < dwarf_cutoff_level)
+                   printf (_(" <%d><%lx>: ...\n"), level, die_offset);
+                 last_level = level;
+               }
+           }
+
          /* Scan through the abbreviation list until we reach the
             correct entry.  */
          for (entry = first_abbrev;
@@ -1912,7 +2229,7 @@ process_debug_info (struct dwarf_section *section, void *file,
 
          if (entry == NULL)
            {
-             if (!do_loc)
+             if (!do_loc && do_printing)
                {
                  printf ("\n");
                  fflush (stdout);
@@ -1922,9 +2239,9 @@ process_debug_info (struct dwarf_section *section, void *file,
              return 0;
            }
 
-         if (!do_loc)
-           printf (_(" (%s)\n"), get_TAG_name (entry->tag));
+         if (!do_loc && do_printing)
+           printf (" (%s)\n", get_TAG_name (entry->tag));
+
          switch (entry->tag)
            {
            default:
@@ -1941,11 +2258,19 @@ process_debug_info (struct dwarf_section *section, void *file,
              break;
            }
 
-         for (attr = entry->first_attr; attr; attr = attr->next)
+         for (attr = entry->first_attr;
+              attr && attr->attribute;
+              attr = attr->next)
            {
-             if (! do_loc)
+             debug_info *arg;
+
+             if (! do_loc && do_printing)
                /* Show the offset from where the tag was extracted.  */
-               printf ("    <%2lx>", (unsigned long)(tags - section_begin));
+               printf ("    <%lx>", (unsigned long)(tags - section_begin));
+
+             arg = debug_information;
+             if (debug_information)
+               arg += unit;
 
              tags = read_and_display_attr (attr->attribute,
                                            attr->form,
@@ -1953,26 +2278,25 @@ process_debug_info (struct dwarf_section *section, void *file,
                                            compunit.cu_pointer_size,
                                            offset_size,
                                            compunit.cu_version,
-                                           debug_information + unit,
-                                           do_loc, section->start);
+                                           arg,
+                                           do_loc || ! do_printing, section);
            }
+
          if (entry->children)
            ++level;
        }
     }
+
   /* Set num_debug_info_entries here so that it can be used to check if
      we need to process .debug_loc and .debug_ranges sections.  */
   if ((do_loc || do_debug_loc || do_debug_ranges)
-      && num_debug_info_entries == 0)
+      && num_debug_info_entries == 0
+      && ! do_types)
     num_debug_info_entries = num_units;
-      
+
   if (!do_loc)
-    {
-      printf ("\n");
-    }
+    printf ("\n");
+
   return 1;
 }
 
@@ -1991,7 +2315,7 @@ load_debug_info (void * file)
   warned_about_missing_comp_units = FALSE;
 
   /* If we have already tried and failed to load the .debug_info
-     section then do not bother to repear the task.  */
+     section then do not bother to repeat the task.  */
   if (num_debug_info_entries == DEBUG_INFO_UNAVAILABLE)
     return 0;
 
@@ -2000,7 +2324,11 @@ load_debug_info (void * file)
     return num_debug_info_entries;
 
   if (load_debug_section (info, file)
-      && process_debug_info (&debug_displays [info].section, file, 1))
+      && process_debug_info (&debug_displays [info].section, file, abbrev, 1, 0))
+    return num_debug_info_entries;
+  else if (load_debug_section (info_dwo, file)
+           && process_debug_info (&debug_displays [info_dwo].section, file,
+                                  abbrev_dwo, 1, 0))
     return num_debug_info_entries;
 
   num_debug_info_entries = DEBUG_INFO_UNAVAILABLE;
@@ -2008,25 +2336,18 @@ load_debug_info (void * file)
 }
 
 static int
-display_debug_lines (struct dwarf_section *section, void *file)
+display_debug_lines_raw (struct dwarf_section *section,
+                        unsigned char *data,
+                         unsigned char *end)
 {
   unsigned char *start = section->start;
-  unsigned char *data = start;
-  unsigned char *end = start + section->size;
 
-  printf (_("\nDump of debug contents of section %s:\n\n"),
-         section->name);
-
-  if (load_debug_info (file) == 0)
-    {
-      warn (_("Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"),
-           section->name);
-      return 0;
-    }
+  printf (_("Raw dump of debug contents of section %s:\n\n"),
+          section->name);
 
   while (data < end)
     {
-      DWARF2_Internal_LineInfo info;
+      DWARF2_Internal_LineInfo linfo;
       unsigned char *standard_opcodes;
       unsigned char *end_of_sequence;
       unsigned char *hdrptr;
@@ -2039,13 +2360,13 @@ display_debug_lines (struct dwarf_section *section, void *file)
       hdroff = hdrptr - start;
 
       /* Check the length of the block.  */
-      info.li_length = byte_get (hdrptr, 4);
+      linfo.li_length = byte_get (hdrptr, 4);
       hdrptr += 4;
 
-      if (info.li_length == 0xffffffff)
+      if (linfo.li_length == 0xffffffff)
        {
          /* This section is 64-bit DWARF 3.  */
-         info.li_length = byte_get (hdrptr, 8);
+         linfo.li_length = byte_get (hdrptr, 8);
          hdrptr += 8;
          offset_size = 8;
          initial_length_size = 12;
@@ -2056,63 +2377,80 @@ display_debug_lines (struct dwarf_section *section, void *file)
          initial_length_size = 4;
        }
 
-      if (info.li_length + initial_length_size > section->size)
+      if (linfo.li_length + initial_length_size > section->size)
        {
          warn
-           (_("The line info appears to be corrupt - the section is too small\n"));
+           (_("The information in section %s appears to be corrupt - the section is too small\n"),
+            section->name);
          return 0;
        }
 
       /* Check its version number.  */
-      info.li_version = byte_get (hdrptr, 2);
+      linfo.li_version = byte_get (hdrptr, 2);
       hdrptr += 2;
-      if (info.li_version != 2 && info.li_version != 3)
+      if (linfo.li_version != 2
+         && linfo.li_version != 3
+         && linfo.li_version != 4)
        {
-         warn (_("Only DWARF version 2 and 3 line info is currently supported.\n"));
+         warn (_("Only DWARF version 2, 3 and 4 line info is currently supported.\n"));
          return 0;
        }
 
-      info.li_prologue_length = byte_get (hdrptr, offset_size);
+      linfo.li_prologue_length = byte_get (hdrptr, offset_size);
       hdrptr += offset_size;
-      info.li_min_insn_length = byte_get (hdrptr, 1);
-      hdrptr++;
-      info.li_default_is_stmt = byte_get (hdrptr, 1);
+      linfo.li_min_insn_length = byte_get (hdrptr, 1);
       hdrptr++;
-      info.li_line_base = byte_get (hdrptr, 1);
-      hdrptr++;
-      info.li_line_range = byte_get (hdrptr, 1);
-      hdrptr++;
-      info.li_opcode_base = 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"));
+             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.  */
-      info.li_line_base <<= 24;
-      info.li_line_base >>= 24;
+      linfo.li_line_base <<= 24;
+      linfo.li_line_base >>= 24;
 
       printf (_("  Offset:                      0x%lx\n"), hdroff);
-      printf (_("  Length:                      %ld\n"), info.li_length);
-      printf (_("  DWARF Version:               %d\n"), info.li_version);
-      printf (_("  Prologue Length:             %d\n"), info.li_prologue_length);
-      printf (_("  Minimum Instruction Length:  %d\n"), info.li_min_insn_length);
-      printf (_("  Initial value of 'is_stmt':  %d\n"), info.li_default_is_stmt);
-      printf (_("  Line Base:                   %d\n"), info.li_line_base);
-      printf (_("  Line Range:                  %d\n"), info.li_line_range);
-      printf (_("  Opcode Base:                 %d\n"), info.li_opcode_base);
+      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);
 
-      end_of_sequence = data + info.li_length + initial_length_size;
+      end_of_sequence = data + linfo.li_length + initial_length_size;
 
-      reset_state_machine (info.li_default_is_stmt);
+      reset_state_machine (linfo.li_default_is_stmt);
 
       /* Display the contents of the Opcodes table.  */
       standard_opcodes = hdrptr;
 
       printf (_("\n Opcodes:\n"));
 
-      for (i = 1; i < info.li_opcode_base; i++)
+      for (i = 1; i < linfo.li_opcode_base; i++)
        printf (_("  Opcode %d has %d args\n"), i, standard_opcodes[i - 1]);
 
       /* Display the contents of the Directory table.  */
-      data = standard_opcodes + info.li_opcode_base - 1;
+      data = standard_opcodes + linfo.li_opcode_base - 1;
 
       if (*data == 0)
        printf (_("\n The Directory Table is empty.\n"));
@@ -2122,7 +2460,7 @@ display_debug_lines (struct dwarf_section *section, void *file)
 
          while (*data != 0)
            {
-             printf (_("  %s\n"), data);
+             printf ("  %s\n", data);
 
              data += strlen ((char *) data) + 1;
            }
@@ -2144,18 +2482,21 @@ display_debug_lines (struct dwarf_section *section, void *file)
              unsigned char *name;
              unsigned int bytes_read;
 
-             printf (_("  %d\t"), ++state_machine_regs.last_file_entry);
+             printf ("  %d\t", ++state_machine_regs.last_file_entry);
              name = data;
 
              data += strlen ((char *) data) + 1;
 
-             printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+             printf ("%s\t",
+                     dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
              data += bytes_read;
-             printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+             printf ("%s\t",
+                     dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
              data += bytes_read;
-             printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+             printf ("%s\t",
+                     dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
              data += bytes_read;
-             printf (_("%s\n"), name);
+             printf ("%s\n", name);
            }
        }
 
@@ -2168,28 +2509,49 @@ display_debug_lines (struct dwarf_section *section, void *file)
       while (data < end_of_sequence)
        {
          unsigned char op_code;
-         int adv;
-         unsigned long int uladv;
+         dwarf_signed_vma adv;
+         dwarf_vma uladv;
          unsigned int bytes_read;
 
          op_code = *data++;
 
-         if (op_code >= info.li_opcode_base)
+         if (op_code >= linfo.li_opcode_base)
            {
-             op_code -= info.li_opcode_base;
-             uladv = (op_code / info.li_line_range) * info.li_min_insn_length;
-             state_machine_regs.address += uladv;
-             printf (_("  Special opcode %d: advance Address by %lu to 0x%lx"),
-                     op_code, uladv, state_machine_regs.address);
-             adv = (op_code % info.li_line_range) + info.li_line_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 %d to %d\n"),
-                     adv, state_machine_regs.line);
+             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, info.li_default_is_stmt);
+             data += process_extended_line_op (data, linfo.li_default_is_stmt);
              break;
 
            case DW_LNS_copy:
@@ -2198,40 +2560,60 @@ display_debug_lines (struct dwarf_section *section, void *file)
 
            case DW_LNS_advance_pc:
              uladv = read_leb128 (data, & bytes_read, 0);
-             uladv *= info.li_min_insn_length;
              data += bytes_read;
-             state_machine_regs.address += uladv;
-             printf (_("  Advance PC by %lu to 0x%lx\n"), uladv,
-                     state_machine_regs.address);
+             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_leb128 (data, & bytes_read, 1);
+             adv = read_sleb128 (data, & bytes_read);
              data += bytes_read;
              state_machine_regs.line += adv;
-             printf (_("  Advance Line by %d to %d\n"), adv,
-                     state_machine_regs.line);
+             printf (_("  Advance Line by %s to %d\n"),
+                       dwarf_vmatoa ("d", adv),
+                       state_machine_regs.line);
              break;
 
            case DW_LNS_set_file:
              adv = read_leb128 (data, & bytes_read, 0);
              data += bytes_read;
-             printf (_("  Set File Name to entry %d in the File Name Table\n"),
-                     adv);
+             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_leb128 (data, & bytes_read, 0);
              data += bytes_read;
-             printf (_("  Set column to %lu\n"), uladv);
+             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 %d\n"), adv);
+             printf (_("  Set is_stmt to %s\n"), dwarf_vmatoa ("d", adv));
              state_machine_regs.is_stmt = adv;
              break;
 
@@ -2241,19 +2623,39 @@ display_debug_lines (struct dwarf_section *section, void *file)
              break;
 
            case DW_LNS_const_add_pc:
-             uladv = (((255 - info.li_opcode_base) / info.li_line_range)
-                     * info.li_min_insn_length);
-             state_machine_regs.address += uladv;
-             printf (_("  Advance PC by constant %lu to 0x%lx\n"), uladv,
-                     state_machine_regs.address);
+             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:
              uladv = byte_get (data, 2);
              data += 2;
              state_machine_regs.address += uladv;
-             printf (_("  Advance PC by fixed size amount %lu to 0x%lx\n"),
-                     uladv, state_machine_regs.address);
+             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:
@@ -2267,7 +2669,7 @@ display_debug_lines (struct dwarf_section *section, void *file)
            case DW_LNS_set_isa:
              uladv = read_leb128 (data, & bytes_read, 0);
              data += bytes_read;
-             printf (_("  Set ISA to %lu\n"), uladv);
+             printf (_("  Set ISA to %s\n"), dwarf_vmatoa ("u", uladv));
              break;
 
            default:
@@ -2275,7 +2677,8 @@ display_debug_lines (struct dwarf_section *section, void *file)
 
              for (i = standard_opcodes[op_code - 1]; i > 0 ; --i)
                {
-                 printf ("0x%lx%s", read_leb128 (data, &bytes_read, 0),
+                 printf ("0x%s%s", dwarf_vmatoa ("x", read_leb128 (data,
+                                                        &bytes_read, 0)),
                          i == 1 ? "" : ", ");
                  data += bytes_read;
                }
@@ -2289,14 +2692,545 @@ display_debug_lines (struct dwarf_section *section, void *file)
   return 1;
 }
 
+typedef struct
+{
+  unsigned char *name;
+  unsigned int directory_index;
+  unsigned int modification_date;
+  unsigned int length;
+} File_Entry;
+
+/* Output a decoded representation of the .debug_line section.  */
+
+static int
+display_debug_lines_decoded (struct dwarf_section *section,
+                            unsigned char *data,
+                            unsigned char *end)
+{
+  printf (_("Decoded dump of debug contents of section %s:\n\n"),
+          section->name);
+
+  while (data < end)
+    {
+      /* This loop amounts to one iteration per compilation unit.  */
+      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)
+        {
+          /* This section is 64-bit DWARF 3.  */
+          linfo.li_length = byte_get (hdrptr, 8);
+          hdrptr += 8;
+          offset_size = 8;
+          initial_length_size = 12;
+        }
+      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;
+        }
+
+      /* 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"));
+             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;
+
+      /* Find the end of this CU's Line Number Information Block.  */
+      end_of_sequence = data + linfo.li_length + initial_length_size;
+
+      reset_state_machine (linfo.li_default_is_stmt);
+
+      /* Save a pointer to the contents of the Opcodes table.  */
+      standard_opcodes = hdrptr;
+
+      /* 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;
+
+         while (*data != 0)
+           {
+             data += strlen ((char *) data) + 1;
+             n_directories++;
+           }
+
+          /* Go through the directory table again to save the directories.  */
+          directory_table = (unsigned char **)
+              xmalloc (n_directories * sizeof (unsigned char *));
+
+          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++;
+
+      /* Traverse the File Name table just to count the entries.  */
+      if (*data != 0)
+        {
+          unsigned char *ptr_file_name_table = data;
+
+          while (*data != 0)
+            {
+             unsigned int bytes_read;
+
+              /* 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));
+
+          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] : ".";
+              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"));
+            }
+        }
+
+      /* Skip the NUL at the end of the table.  */
+      data++;
+
+      /* This loop iterates through the Dwarf Line Number Program.  */
+      while (data < end_of_sequence)
+        {
+         unsigned char op_code;
+          int adv;
+          unsigned long int uladv;
+          unsigned int bytes_read;
+          int is_special_opcode = 0;
+
+          op_code = *data++;
+
+          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;
+               }
+             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;
+               }
+
+              adv = (op_code % linfo.li_line_range) + linfo.li_line_base;
+              state_machine_regs.line += adv;
+              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;
+            }
+
+          /* Only Special opcodes, DW_LNS_copy and DW_LNE_end_sequence adds a row
+             to the DWARF address/line matrix.  */
+          if ((is_special_opcode) || (op_code == DW_LNE_end_sequence)
+             || (op_code == DW_LNS_copy))
+            {
+              const unsigned int MAX_FILENAME_LENGTH = 35;
+              char *fileName = (char *)file_table[state_machine_regs.file - 1].name;
+              char *newFileName = NULL;
+              size_t fileNameLength = strlen (fileName);
+
+              if ((fileNameLength > MAX_FILENAME_LENGTH) && (!do_wide))
+                {
+                  newFileName = (char *) xmalloc (MAX_FILENAME_LENGTH + 1);
+                  /* Truncate file name */
+                  strncpy (newFileName,
+                           fileName + fileNameLength - MAX_FILENAME_LENGTH,
+                           MAX_FILENAME_LENGTH + 1);
+                }
+              else
+                {
+                  newFileName = (char *) xmalloc (fileNameLength + 1);
+                  strncpy (newFileName, fileName, fileNameLength + 1);
+                }
+
+              if (!do_wide || (fileNameLength <= MAX_FILENAME_LENGTH))
+                {
+                 if (linfo.li_max_ops_per_insn == 1)
+                   printf ("%-35s  %11d  %#18" DWARF_VMA_FMT "x\n",
+                           newFileName, state_machine_regs.line,
+                           state_machine_regs.address);
+                 else
+                   printf ("%-35s  %11d  %#18" DWARF_VMA_FMT "x[%d]\n",
+                           newFileName, state_machine_regs.line,
+                           state_machine_regs.address,
+                           state_machine_regs.op_index);
+                }
+              else
+                {
+                 if (linfo.li_max_ops_per_insn == 1)
+                   printf ("%s  %11d  %#18" DWARF_VMA_FMT "x\n",
+                           newFileName, state_machine_regs.line,
+                           state_machine_regs.address);
+                 else
+                   printf ("%s  %11d  %#18" DWARF_VMA_FMT "x[%d]\n",
+                           newFileName, state_machine_regs.line,
+                           state_machine_regs.address,
+                           state_machine_regs.op_index);
+                }
+
+              if (op_code == DW_LNE_end_sequence)
+               printf ("\n");
+
+              free (newFileName);
+            }
+        }
+      free (file_table);
+      file_table = NULL;
+      free (directory_table);
+      directory_table = NULL;
+      putchar ('\n');
+    }
+
+  return 1;
+}
+
+static int
+display_debug_lines (struct dwarf_section *section, void *file ATTRIBUTE_UNUSED)
+{
+  unsigned char *data = section->start;
+  unsigned char *end = data + section->size;
+  int retValRaw = 1;
+  int retValDecoded = 1;
+
+  if (do_debug_lines == 0)
+    do_debug_lines |= FLAG_DEBUG_LINES_RAW;
+
+  if (do_debug_lines & FLAG_DEBUG_LINES_RAW)
+    retValRaw = display_debug_lines_raw (section, data, end);
+
+  if (do_debug_lines & FLAG_DEBUG_LINES_DECODED)
+    retValDecoded = display_debug_lines_decoded (section, data, end);
+
+  if (!retValRaw || !retValDecoded)
+    return 0;
+
+  return 1;
+}
+
+static debug_info *
+find_debug_info_for_offset (unsigned long offset)
+{
+  unsigned int i;
+
+  if (num_debug_info_entries == DEBUG_INFO_UNAVAILABLE)
+    return NULL;
+
+  for (i = 0; i < num_debug_info_entries; i++)
+    if (debug_information[i].cu_offset == offset)
+      return debug_information + i;
+
+  return NULL;
+}
+
 static int
 display_debug_pubnames (struct dwarf_section *section,
                        void *file ATTRIBUTE_UNUSED)
 {
-  DWARF2_Internal_PubNames pubnames;
+  DWARF2_Internal_PubNames names;
   unsigned char *start = section->start;
   unsigned char *end = start + section->size;
 
+  /* It does not matter if this load fails,
+     we test for that later on.  */
+  load_debug_info (file);
+
   printf (_("Contents of the %s section:\n\n"), section->name);
 
   while (start < end)
@@ -2307,11 +3241,11 @@ display_debug_pubnames (struct dwarf_section *section,
 
       data = start;
 
-      pubnames.pn_length = byte_get (data, 4);
+      names.pn_length = byte_get (data, 4);
       data += 4;
-      if (pubnames.pn_length == 0xffffffff)
+      if (names.pn_length == 0xffffffff)
        {
-         pubnames.pn_length = byte_get (data, 8);
+         names.pn_length = byte_get (data, 8);
          data += 8;
          offset_size = 8;
          initial_length_size = 12;
@@ -2322,16 +3256,24 @@ display_debug_pubnames (struct dwarf_section *section,
          initial_length_size = 4;
        }
 
-      pubnames.pn_version = byte_get (data, 2);
+      names.pn_version = byte_get (data, 2);
       data += 2;
-      pubnames.pn_offset = byte_get (data, offset_size);
+
+      names.pn_offset = byte_get (data, offset_size);
       data += offset_size;
-      pubnames.pn_size = byte_get (data, offset_size);
+
+      if (num_debug_info_entries != DEBUG_INFO_UNAVAILABLE
+         && num_debug_info_entries > 0
+         && find_debug_info_for_offset (names.pn_offset) == NULL)
+       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;
 
-      start += pubnames.pn_length + initial_length_size;
+      start += names.pn_length + initial_length_size;
 
-      if (pubnames.pn_version != 2 && pubnames.pn_version != 3)
+      if (names.pn_version != 2 && names.pn_version != 3)
        {
          static int warned = 0;
 
@@ -2345,13 +3287,13 @@ display_debug_pubnames (struct dwarf_section *section,
        }
 
       printf (_("  Length:                              %ld\n"),
-             pubnames.pn_length);
+             (long) names.pn_length);
       printf (_("  Version:                             %d\n"),
-             pubnames.pn_version);
-      printf (_("  Offset into .debug_info section:     %ld\n"),
-             pubnames.pn_offset);
+             names.pn_version);
+      printf (_("  Offset into .debug_info section:     0x%lx\n"),
+             (unsigned long) names.pn_offset);
       printf (_("  Size of area in .debug_info section: %ld\n"),
-             pubnames.pn_size);
+             (long) names.pn_size);
 
       printf (_("\n    Offset\tName\n"));
 
@@ -2362,7 +3304,7 @@ display_debug_pubnames (struct dwarf_section *section,
          if (offset != 0)
            {
              data += offset_size;
-             printf ("    %-6ld\t\t%s\n", offset, data);
+             printf ("    %-6lx\t%s\n", offset, data);
              data += strlen ((char *) data) + 1;
            }
        }
@@ -2390,7 +3332,7 @@ display_debug_macinfo (struct dwarf_section *section,
       unsigned int lineno;
       const char *string;
 
-      op = *curr;
+      op = (enum dwarf_macinfo_record_type) *curr;
       curr++;
 
       switch (op)
@@ -2449,6 +3391,346 @@ display_debug_macinfo (struct dwarf_section *section,
   return 1;
 }
 
+/* Given LINE_OFFSET into the .debug_line section, attempt to return
+   filename and dirname corresponding to file name table entry with index
+   FILEIDX.  Return NULL on failure.  */
+
+static unsigned char *
+get_line_filename_and_dirname (dwarf_vma line_offset, dwarf_vma fileidx,
+                              unsigned char **dir_name)
+{
+  struct dwarf_section *section = &debug_displays [line].section;
+  unsigned char *hdrptr, *dirtable, *file_name;
+  unsigned int offset_size, initial_length_size;
+  unsigned int version, opcode_base, bytes_read;
+  dwarf_vma length, diridx;
+
+  *dir_name = NULL;
+  if (section->start == NULL
+      || line_offset >= section->size
+      || fileidx == 0)
+    return NULL;
+
+  hdrptr = section->start + line_offset;
+  length = byte_get (hdrptr, 4);
+  hdrptr += 4;
+  if (length == 0xffffffff)
+    {
+      /* This section is 64-bit DWARF 3.  */
+      length = byte_get (hdrptr, 8);
+      hdrptr += 8;
+      offset_size = 8;
+      initial_length_size = 12;
+    }
+  else
+    {
+      offset_size = 4;
+      initial_length_size = 4;
+    }
+  if (length + initial_length_size > section->size)
+    return NULL;
+  version = byte_get (hdrptr, 2);
+  hdrptr += 2;
+  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);
+  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++;                /* 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 += bytes_read;
+      read_leb128 (hdrptr, &bytes_read, 0);
+      hdrptr += bytes_read;
+      read_leb128 (hdrptr, &bytes_read, 0);
+      hdrptr += bytes_read;
+    }
+  if (*hdrptr == '\0')
+    return NULL;
+  file_name = hdrptr;
+  hdrptr += strlen ((char *) hdrptr) + 1;
+  diridx = read_leb128 (hdrptr, &bytes_read, 0);
+  if (diridx == 0)
+    return file_name;
+  for (; *dirtable != '\0' && diridx > 1; diridx--)
+    dirtable += strlen ((char *) dirtable) + 1;
+  if (*dirtable == '\0')
+    return NULL;
+  *dir_name = dirtable;
+  return file_name;
+}
+
+static int
+display_debug_macro (struct dwarf_section *section,
+                    void *file)
+{
+  unsigned char *start = section->start;
+  unsigned char *end = start + section->size;
+  unsigned char *curr = start;
+  unsigned char *extended_op_buf[256];
+  unsigned int bytes_read;
+
+  load_debug_section (str, file);
+  load_debug_section (line, file);
+
+  printf (_("Contents of the %s section:\n\n"), section->name);
+
+  while (curr < end)
+    {
+      unsigned int lineno, version, flags;
+      unsigned int offset_size = 4;
+      const char *string;
+      dwarf_vma line_offset = 0, sec_offset = curr - start, offset;
+      unsigned char **extended_ops = NULL;
+
+      version = byte_get (curr, 2);
+      curr += 2;
+
+      if (version != 4)
+       {
+         error (_("Only GNU extension to DWARF 4 of %s is currently supported.\n"),
+                section->name);
+         return 0;
+       }
+
+      flags = byte_get (curr++, 1);
+      if (flags & 1)
+       offset_size = 8;
+      printf (_("  Offset:                      0x%lx\n"),
+             (unsigned long) sec_offset);
+      printf (_("  Version:                     %d\n"), version);
+      printf (_("  Offset size:                 %d\n"), offset_size);
+      if (flags & 2)
+       {
+         line_offset = byte_get (curr, offset_size);
+         curr += offset_size;
+         printf (_("  Offset into .debug_line:     0x%lx\n"),
+                 (unsigned long) line_offset);
+       }
+      if (flags & 4)
+       {
+         unsigned int i, count = byte_get (curr++, 1), op;
+         dwarf_vma nargs, n;
+         memset (extended_op_buf, 0, sizeof (extended_op_buf));
+         extended_ops = extended_op_buf;
+         if (count)
+           {
+             printf (_("  Extension opcode arguments:\n"));
+             for (i = 0; i < count; i++)
+               {
+                 op = byte_get (curr++, 1);
+                 extended_ops[op] = curr;
+                 nargs = read_leb128 (curr, &bytes_read, 0);
+                 curr += bytes_read;
+                 if (nargs == 0)
+                   printf (_("    DW_MACRO_GNU_%02x has no arguments\n"), op);
+                 else
+                   {
+                     printf (_("    DW_MACRO_GNU_%02x arguments: "), op);
+                     for (n = 0; n < nargs; n++)
+                       {
+                         unsigned int form = byte_get (curr++, 1);
+                         printf ("%s%s", get_FORM_name (form),
+                                 n == nargs - 1 ? "\n" : ", ");
+                         switch (form)
+                           {
+                           case DW_FORM_data1:
+                           case DW_FORM_data2:
+                           case DW_FORM_data4:
+                           case DW_FORM_data8:
+                           case DW_FORM_sdata:
+                           case DW_FORM_udata:
+                           case DW_FORM_block:
+                           case DW_FORM_block1:
+                           case DW_FORM_block2:
+                           case DW_FORM_block4:
+                           case DW_FORM_flag:
+                           case DW_FORM_string:
+                           case DW_FORM_strp:
+                           case DW_FORM_sec_offset:
+                             break;
+                           default:
+                             error (_("Invalid extension opcode form %s\n"),
+                                    get_FORM_name (form));
+                             return 0;
+                           }
+                       }
+                   }
+               }
+           }
+       }
+      printf ("\n");
+
+      while (1)
+       {
+         unsigned int op;
+
+         if (curr >= end)
+           {
+             error (_(".debug_macro section not zero terminated\n"));
+             return 0;
+           }
+
+         op = byte_get (curr++, 1);
+         if (op == 0)
+           break;
+
+         switch (op)
+           {
+           case DW_MACRO_GNU_start_file:
+             {
+               unsigned int filenum;
+               unsigned char *file_name = NULL, *dir_name = NULL;
+
+               lineno = read_leb128 (curr, &bytes_read, 0);
+               curr += bytes_read;
+               filenum = read_leb128 (curr, &bytes_read, 0);
+               curr += bytes_read;
+
+               if ((flags & 2) == 0)
+                 error (_("DW_MACRO_GNU_start_file used, but no .debug_line offset provided.\n"));
+               else
+                 file_name
+                   = get_line_filename_and_dirname (line_offset, filenum,
+                                                    &dir_name);
+               if (file_name == NULL)
+                 printf (_(" DW_MACRO_GNU_start_file - lineno: %d filenum: %d\n"),
+                         lineno, filenum);
+               else
+                 printf (_(" DW_MACRO_GNU_start_file - lineno: %d filenum: %d filename: %s%s%s\n"),
+                         lineno, filenum,
+                         dir_name != NULL ? (const char *) dir_name : "",
+                         dir_name != NULL ? "/" : "", file_name);
+             }
+             break;
+
+           case DW_MACRO_GNU_end_file:
+             printf (_(" DW_MACRO_GNU_end_file\n"));
+             break;
+
+           case DW_MACRO_GNU_define:
+             lineno = read_leb128 (curr, &bytes_read, 0);
+             curr += bytes_read;
+             string = (char *) curr;
+             curr += strlen (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);
+             curr += bytes_read;
+             string = (char *) curr;
+             curr += strlen (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);
+             curr += bytes_read;
+             offset = byte_get (curr, offset_size);
+             curr += offset_size;
+             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);
+             curr += bytes_read;
+             offset = byte_get (curr, offset_size);
+             curr += offset_size;
+             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;
+             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);
+             curr += bytes_read;
+             offset = byte_get (curr, offset_size);
+             curr += offset_size;
+             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);
+             curr += bytes_read;
+             offset = byte_get (curr, offset_size);
+             curr += offset_size;
+             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;
+             printf (_(" DW_MACRO_GNU_transparent_include_alt - offset : 0x%lx\n"),
+                     (unsigned long) offset);
+             break;
+
+           default:
+             if (extended_ops == NULL || extended_ops[op] == NULL)
+               {
+                 error (_(" Unknown macro opcode %02x seen\n"), op);
+                 return 0;
+               }
+             else
+               {
+                 /* Skip over unhandled opcodes.  */
+                 dwarf_vma nargs, n;
+                 unsigned char *desc = extended_ops[op];
+                 nargs = read_leb128 (desc, &bytes_read, 0);
+                 desc += bytes_read;
+                 if (nargs == 0)
+                   {
+                     printf (_(" DW_MACRO_GNU_%02x\n"), op);
+                     break;
+                   }
+                 printf (_(" DW_MACRO_GNU_%02x -"), op);
+                 for (n = 0; n < nargs; n++)
+                   {
+                     curr
+                       = read_and_display_attr_value (0, byte_get (desc++, 1),
+                                                      curr, 0, 0, offset_size,
+                                                      version, NULL, 0, NULL);
+                     if (n != nargs - 1)
+                       printf (",");
+                   }
+                 printf ("\n");
+               }
+             break;
+           }
+       }
+
+      printf ("\n");
+    }  
+
+  return 1;
+}
+
 static int
 display_debug_abbrev (struct dwarf_section *section,
                      void *file ATTRIBUTE_UNUSED)
@@ -2461,42 +3743,287 @@ display_debug_abbrev (struct dwarf_section *section,
 
   do
     {
+      unsigned char *last;
+
       free_abbrevs ();
 
+      last = start;
       start = process_abbrev_section (start, end);
 
       if (first_abbrev == NULL)
        continue;
 
-      printf (_("  Number TAG\n"));
+      printf (_("  Number TAG (0x%lx)\n"), (long) (last - section->start));
 
       for (entry = first_abbrev; entry; entry = entry->next)
        {
          abbrev_attr *attr;
 
-         printf (_("   %ld      %s    [%s]\n"),
+         printf ("   %ld      %s    [%s]\n",
                  entry->entry,
                  get_TAG_name (entry->tag),
                  entry->children ? _("has children") : _("no children"));
 
          for (attr = entry->first_attr; attr; attr = attr->next)
-           printf (_("    %-18s %s\n"),
+           printf ("    %-18s %s\n",
                    get_AT_name (attr->attribute),
                    get_FORM_name (attr->form));
        }
     }
   while (start);
 
-  printf ("\n");
+  printf ("\n");
+
+  return 1;
+}
+
+/* Display a location list from a normal (ie, non-dwo) .debug_loc section.  */
+
+static void
+display_loc_list (struct dwarf_section *section,
+                  unsigned char **start_ptr,
+                  int debug_info_entry,
+                  unsigned long offset,
+                  unsigned long base_address,
+                  int has_frame_base)
+{
+  unsigned char *start = *start_ptr;
+  unsigned char *section_end = section->start + section->size;
+  unsigned long cu_offset = debug_information [debug_info_entry].cu_offset;
+  unsigned int pointer_size = debug_information [debug_info_entry].pointer_size;
+  unsigned int offset_size = debug_information [debug_info_entry].offset_size;
+  int dwarf_version = debug_information [debug_info_entry].dwarf_version;
+
+  dwarf_vma begin;
+  dwarf_vma end;
+  unsigned short length;
+  int need_frame_base;
+
+  while (1)
+    {
+      if (start + 2 * pointer_size > section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
+
+      printf ("    %8.8lx ", offset + (start - *start_ptr));
+
+      /* Note: we use sign extension here in order to be sure that we can detect
+         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;
+
+      if (begin == 0 && end == 0)
+        {
+          printf (_("<End of list>\n"));
+          break;
+        }
+
+      /* Check base address specifiers.  */
+      if (begin == (dwarf_vma) -1 && end != (dwarf_vma) -1)
+        {
+          base_address = end;
+          print_dwarf_vma (begin, pointer_size);
+          print_dwarf_vma (end, pointer_size);
+          printf (_("(base address)\n"));
+          continue;
+        }
+
+      if (start + 2 > section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
+
+      length = byte_get (start, 2);
+      start += 2;
+
+      if (start + length > section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
+
+      print_dwarf_vma (begin + base_address, pointer_size);
+      print_dwarf_vma (end + base_address, pointer_size);
+
+      putchar ('(');
+      need_frame_base = decode_location_expression (start,
+                                                    pointer_size,
+                                                    offset_size,
+                                                    dwarf_version,
+                                                    length,
+                                                    cu_offset, section);
+      putchar (')');
+
+      if (need_frame_base && !has_frame_base)
+        printf (_(" [without DW_AT_frame_base]"));
+
+      if (begin == end)
+        fputs (_(" (start == end)"), stdout);
+      else if (begin > end)
+        fputs (_(" (start > end)"), stdout);
+
+      putchar ('\n');
+
+      start += length;
+    }
+
+  *start_ptr = start;
+}
+
+/* Print a .debug_addr table index in decimal, surrounded by square brackets,
+   right-adjusted in a field of length LEN, and followed by a space.  */
+
+static void
+print_addr_index (unsigned int idx, unsigned int len)
+{
+  static char buf[15];
+  snprintf (buf, sizeof (buf), "[%d]", idx);
+  printf("%*s ", len, buf);
+}
+
+/* Display a location list from a .dwo section. It uses address indexes rather
+   than embedded addresses.  This code closely follows display_loc_list, but the
+   two are sufficiently different that combining things is very ugly.  */
+
+static void
+display_loc_list_dwo (struct dwarf_section *section,
+                      unsigned char **start_ptr,
+                      int debug_info_entry,
+                      unsigned long offset,
+                      int has_frame_base)
+{
+  unsigned char *start = *start_ptr;
+  unsigned char *section_end = section->start + section->size;
+  unsigned long cu_offset = debug_information [debug_info_entry].cu_offset;
+  unsigned int pointer_size = debug_information [debug_info_entry].pointer_size;
+  unsigned int offset_size = debug_information [debug_info_entry].offset_size;
+  int dwarf_version = debug_information [debug_info_entry].dwarf_version;
+  int entry_type;
+  unsigned short length;
+  int need_frame_base;
+  unsigned int idx;
+  unsigned int bytes_read;
+
+  while (1)
+    {
+      printf ("    %8.8lx ", offset + (start - *start_ptr));
+
+      if (start >= section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
+
+      entry_type = byte_get (start, 1);
+      start++;
+      switch (entry_type)
+        {
+          case 0: /* A terminating entry.  */
+            *start_ptr = start;
+           printf (_("<End of list>\n"));
+            return;
+          case 1: /* A base-address entry.  */
+            idx = read_leb128 (start, &bytes_read, 0);
+            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);
+            start += bytes_read;
+            print_addr_index (idx, 8);
+            idx = read_leb128 (start, &bytes_read, 0);
+            start += bytes_read;
+            print_addr_index (idx, 8);
+            break;
+          case 3: /* A start/length entry.  */
+            idx = read_leb128 (start, &bytes_read, 0);
+            start += bytes_read;
+            print_addr_index (idx, 8);
+            idx = byte_get (start, 4);
+            start += 4;
+            printf ("%08x ", idx);
+            break;
+          case 4: /* An offset pair entry.  */
+            idx = byte_get (start, 4);
+            start += 4;
+            printf ("%08x ", idx);
+            idx = byte_get (start, 4);
+            start += 4;
+            printf ("%08x ", idx);
+            break;
+          default:
+            warn (_("Unknown location list entry type 0x%x.\n"), entry_type);
+            *start_ptr = start;
+            return;
+        }
+
+      if (start + 2 > section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
+
+      length = byte_get (start, 2);
+      start += 2;
+
+      if (start + length > section_end)
+        {
+          warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
+                offset);
+          break;
+        }
+
+      putchar ('(');
+      need_frame_base = decode_location_expression (start,
+                                                    pointer_size,
+                                                    offset_size,
+                                                    dwarf_version,
+                                                    length,
+                                                    cu_offset, section);
+      putchar (')');
+
+      if (need_frame_base && !has_frame_base)
+        printf (_(" [without DW_AT_frame_base]"));
+
+      putchar ('\n');
+
+      start += length;
+    }
+
+  *start_ptr = start;
+}
+
+/* Sort array of indexes in ascending order of loc_offsets[idx].  */
 
-  return 1;
+static dwarf_vma *loc_offsets;
+
+static int
+loc_offsets_compar (const void *ap, const void *bp)
+{
+  dwarf_vma a = loc_offsets[*(const unsigned int *) ap];
+  dwarf_vma b = loc_offsets[*(const unsigned int *) bp];
+
+  return (a > b) - (b > a);
 }
 
 static int
 display_debug_loc (struct dwarf_section *section, void *file)
 {
   unsigned char *start = section->start;
-  unsigned char *section_end;
   unsigned long bytes;
   unsigned char *section_begin = start;
   unsigned int num_loc_list = 0;
@@ -2504,12 +4031,18 @@ display_debug_loc (struct dwarf_section *section, void *file)
   unsigned int first = 0;
   unsigned int i;
   unsigned int j;
+  unsigned int k;
   int seen_first_offset = 0;
-  int use_debug_info = 1;
+  int locs_sorted = 1;
   unsigned char *next;
+  unsigned int *array = NULL;
+  const char *suffix = strrchr (section->name, '.');
+  int is_dwo = 0;
+
+  if (suffix && strcmp (suffix, ".dwo") == 0)
+    is_dwo = 1;
 
   bytes = section->size;
-  section_end = start + bytes;
 
   if (bytes == 0)
     {
@@ -2532,10 +4065,11 @@ display_debug_loc (struct dwarf_section *section, void *file)
       unsigned int num;
 
       num = debug_information [i].num_loc_offsets;
-      num_loc_list += num;
+      if (num > num_loc_list)
+       num_loc_list = num;
 
       /* Check if we can use `debug_information' directly.  */
-      if (use_debug_info && num != 0)
+      if (locs_sorted && num != 0)
        {
          if (!seen_first_offset)
            {
@@ -2553,7 +4087,7 @@ display_debug_loc (struct dwarf_section *section, void *file)
              if (last_offset >
                  debug_information [i].loc_offsets [j])
                {
-                 use_debug_info = 0;
+                 locs_sorted = 0;
                  break;
                }
              last_offset = debug_information [i].loc_offsets [j];
@@ -2561,43 +4095,48 @@ display_debug_loc (struct dwarf_section *section, void *file)
        }
     }
 
-  if (!use_debug_info)
-    /* FIXME: Should we handle this case?  */
-    error (_("Location lists in .debug_info section aren't in ascending order!\n"));
-
   if (!seen_first_offset)
     error (_("No location lists in .debug_info section!\n"));
 
   /* DWARF sections under Mach-O have non-zero addresses.  */
   if (debug_information [first].num_loc_offsets > 0
       && debug_information [first].loc_offsets [0] != section->address)
-    warn (_("Location lists in %s section start at 0x%lx\n"),
-         section->name, debug_information [first].loc_offsets [0]);
+    warn (_("Location lists in %s section start at 0x%s\n"),
+         section->name,
+         dwarf_vmatoa ("x", debug_information [first].loc_offsets [0]));
 
+  if (!locs_sorted)
+    array = (unsigned int *) xcmalloc (num_loc_list, sizeof (unsigned int));
   printf (_("Contents of the %s section:\n\n"), section->name);
   printf (_("    Offset   Begin    End      Expression\n"));
 
   seen_first_offset = 0;
   for (i = first; i < num_debug_info_entries; i++)
     {
-      unsigned long begin;
-      unsigned long end;
-      unsigned short length;
       unsigned long offset;
-      unsigned int pointer_size;
-      unsigned long cu_offset;
       unsigned long base_address;
-      int need_frame_base;
       int has_frame_base;
 
-      pointer_size = debug_information [i].pointer_size;
-      cu_offset = debug_information [i].cu_offset;
+      if (!locs_sorted)
+       {
+         for (k = 0; k < debug_information [i].num_loc_offsets; k++)
+           array[k] = k;
+         loc_offsets = debug_information [i].loc_offsets;
+         qsort (array, debug_information [i].num_loc_offsets,
+                sizeof (*array), loc_offsets_compar);
+       }
 
-      for (j = 0; j < debug_information [i].num_loc_offsets; j++)
+      for (k = 0; k < debug_information [i].num_loc_offsets; k++)
        {
+         j = locs_sorted ? k : array[k];
+         if (k
+             && debug_information [i].loc_offsets [locs_sorted
+                                                   ? k - 1 : array [k - 1]]
+                == debug_information [i].loc_offsets [j])
+           continue;
          has_frame_base = debug_information [i].have_frame_base [j];
          /* DWARF sections under Mach-O have non-zero addresses.  */
-         offset = debug_information [i].loc_offsets [j] - section->address; 
+         offset = debug_information [i].loc_offsets [j] - section->address;
          next = section_begin + offset;
          base_address = debug_information [i].base_address;
 
@@ -2607,10 +4146,12 @@ display_debug_loc (struct dwarf_section *section, void *file)
            {
              if (start < next)
                warn (_("There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n"),
-                     (long)(start - section_begin), (long)(next - section_begin));
+                     (unsigned long) (start - section_begin),
+                     (unsigned long) (next - section_begin));
              else if (start > next)
                warn (_("There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n"),
-                     (long)(start - section_begin), (long)(next - section_begin));
+                     (unsigned long) (start - section_begin),
+                     (unsigned long) (next - section_begin));
            }
          start = next;
 
@@ -2621,78 +4162,19 @@ display_debug_loc (struct dwarf_section *section, void *file)
              continue;
            }
 
-         while (1)
-           {
-             if (start + 2 * pointer_size > section_end)
-               {
-                 warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                       offset);
-                 break;
-               }
-
-             begin = byte_get (start, pointer_size);
-             start += pointer_size;
-             end = byte_get (start, pointer_size);
-             start += pointer_size;
-
-             if (begin == 0 && end == 0)
-               {
-                 printf (_("    %8.8lx <End of list>\n"), offset);
-                 break;
-               }
-
-             /* Check base address specifiers.  */
-             if (begin == -1UL && end != -1UL)
-               {
-                 base_address = end;
-                 printf (_("    %8.8lx %8.8lx %8.8lx (base address)\n"),
-                         offset, begin, end);
-                 continue;
-               }
-
-             if (start + 2 > section_end)
-               {
-                 warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                       offset);
-                 break;
-               }
-
-             length = byte_get (start, 2);
-             start += 2;
-
-             if (start + length > section_end)
-               {
-                 warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
-                       offset);
-                 break;
-               }
-
-             printf ("    %8.8lx %8.8lx %8.8lx (",
-                     offset, begin + base_address, end + base_address);
-             need_frame_base = decode_location_expression (start,
-                                                           pointer_size,
-                                                           length,
-                                                           cu_offset);
-             putchar (')');
-
-             if (need_frame_base && !has_frame_base)
-               printf (_(" [without DW_AT_frame_base]"));
-
-             if (begin == end)
-               fputs (_(" (start == end)"), stdout);
-             else if (begin > end)
-               fputs (_(" (start > end)"), stdout);
-
-             putchar ('\n');
-
-             start += length;
-           }
+          if (is_dwo)
+            display_loc_list_dwo (section, &start, i, offset, has_frame_base);
+          else
+            display_loc_list (section, &start, i, offset, base_address,
+                              has_frame_base);
        }
     }
 
-  if (start < section_end)
+  if (start < section->start + section->size)
     warn (_("There are %ld unused bytes at the end of section %s\n"),
-         (long) (section_end - start), section->name);
+         (long) (section->start + section->size - start), section->name);
+  putchar ('\n');
+  free (array);
   return 1;
 }
 
@@ -2757,9 +4239,20 @@ display_debug_str (struct dwarf_section *section,
 static int
 display_debug_info (struct dwarf_section *section, void *file)
 {
-  return process_debug_info (section, file, 0);
+  return process_debug_info (section, file, section->abbrev_sec, 0, 0);
+}
+
+static int
+display_debug_types (struct dwarf_section *section, void *file)
+{
+  return process_debug_info (section, file, section->abbrev_sec, 0, 1);
 }
 
+static int
+display_trace_info (struct dwarf_section *section, void *file)
+{
+  return process_debug_info (section, file, section->abbrev_sec, 0, 0);
+}
 
 static int
 display_debug_aranges (struct dwarf_section *section,
@@ -2768,15 +4261,19 @@ display_debug_aranges (struct dwarf_section *section,
   unsigned char *start = section->start;
   unsigned char *end = start + section->size;
 
-  printf (_("The section %s contains:\n\n"), section->name);
+  printf (_("Contents of the %s section:\n\n"), section->name);
+
+  /* It does not matter if this load fails,
+     we test for that later on.  */
+  load_debug_info (file);
 
   while (start < end)
     {
       unsigned char *hdrptr;
       DWARF2_Internal_ARange arange;
-      unsigned char *ranges;
-      unsigned long length;
-      unsigned long address;
+      unsigned char *addr_ranges;
+      dwarf_vma length;
+      dwarf_vma address;
       unsigned char address_size;
       int excess;
       int offset_size;
@@ -2806,6 +4303,12 @@ display_debug_aranges (struct dwarf_section *section,
       arange.ar_info_offset = byte_get (hdrptr, offset_size);
       hdrptr += offset_size;
 
+      if (num_debug_info_entries != DEBUG_INFO_UNAVAILABLE
+         && num_debug_info_entries > 0
+         && find_debug_info_for_offset (arange.ar_info_offset) == NULL)
+       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;
 
@@ -2818,14 +4321,23 @@ display_debug_aranges (struct dwarf_section *section,
          break;
        }
 
-      printf (_("  Length:                   %ld\n"), arange.ar_length);
+      printf (_("  Length:                   %ld\n"),
+             (long) arange.ar_length);
       printf (_("  Version:                  %d\n"), arange.ar_version);
-      printf (_("  Offset into .debug_info:  %lx\n"), arange.ar_info_offset);
+      printf (_("  Offset into .debug_info:  0x%lx\n"),
+             (unsigned long) arange.ar_info_offset);
       printf (_("  Pointer Size:             %d\n"), arange.ar_pointer_size);
       printf (_("  Segment Size:             %d\n"), arange.ar_segment_size);
 
       address_size = arange.ar_pointer_size + arange.ar_segment_size;
 
+      if (address_size == 0)
+       {
+         error (_("Invalid address size in %s section!\n"),
+                section->name);
+         break;
+       }
+
       /* The DWARF spec does not require that the address size be a power
         of two, but we do.  This will have to change if we ever encounter
         an uneven architecture.  */
@@ -2834,35 +4346,35 @@ display_debug_aranges (struct dwarf_section *section,
          warn (_("Pointer size + Segment size is not a power of two.\n"));
          break;
        }
-      
+
       if (address_size > 4)
        printf (_("\n    Address            Length\n"));
       else
        printf (_("\n    Address    Length\n"));
 
-      ranges = hdrptr;
+      addr_ranges = hdrptr;
 
       /* Must pad to an alignment boundary that is twice the address size.  */
       excess = (hdrptr - start) % (2 * address_size);
       if (excess)
-       ranges += (2 * address_size) - excess;
+       addr_ranges += (2 * address_size) - excess;
 
       start += arange.ar_length + initial_length_size;
 
-      while (ranges + 2 * address_size <= start)
+      while (addr_ranges + 2 * address_size <= start)
        {
-         address = byte_get (ranges, address_size);
+         address = byte_get (addr_ranges, address_size);
 
-         ranges += address_size;
+         addr_ranges += address_size;
 
-         length  = byte_get (ranges, address_size);
+         length  = byte_get (addr_ranges, address_size);
 
-         ranges += address_size;
+         addr_ranges += address_size;
 
-         if (address_size > 4)
-           printf ("    0x%16.16lx 0x%lx\n", address, length);
-         else
-           printf ("    0x%8.8lx 0x%lx\n", address, length);       
+         printf ("    ");
+         print_dwarf_vma (address, address_size);
+         print_dwarf_vma (length, address_size);
+         putchar ('\n');
        }
     }
 
@@ -2871,25 +4383,136 @@ display_debug_aranges (struct dwarf_section *section,
   return 1;
 }
 
+/* Comparison function for qsort.  */
+static int
+comp_addr_base (const void * v0, const void * v1)
+{
+  debug_info * info0 = (debug_info *) v0;
+  debug_info * info1 = (debug_info *) v1;
+  return info0->addr_base - info1->addr_base;
+}
+
+/* Display the debug_addr section.  */
+static int
+display_debug_addr (struct dwarf_section *section,
+                    void *file)
+{
+  debug_info **debug_addr_info;
+  unsigned char *entry;
+  unsigned char *end;
+  unsigned int i;
+  unsigned int count;
+
+  if (section->size == 0)
+    {
+      printf (_("\nThe %s section is empty.\n"), section->name);
+      return 0;
+    }
+
+  if (load_debug_info (file) == 0)
+    {
+      warn (_("Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"),
+           section->name);
+      return 0;
+    }
+
+  printf (_("Contents of the %s section:\n\n"), section->name);
+
+  debug_addr_info = (debug_info **) xmalloc ((num_debug_info_entries + 1)
+                                             * sizeof (debug_info *));
+
+  count = 0;
+  for (i = 0; i < num_debug_info_entries; i++)
+    {
+      if (debug_information [i].addr_base != DEBUG_INFO_UNAVAILABLE)
+        debug_addr_info [count++] = &debug_information [i];
+    }
+
+  /* Add a sentinel to make iteration convenient.  */
+  debug_addr_info [count] = (debug_info *) xmalloc (sizeof (debug_info));
+  debug_addr_info [count]->addr_base = section->size;
+
+  qsort (debug_addr_info, count, sizeof (debug_info *), comp_addr_base);
+  for (i = 0; i < count; i++)
+    {
+      unsigned int idx;
+      unsigned int address_size = debug_addr_info [i]->pointer_size;
+
+      printf (_("  For compilation unit at offset 0x%s:\n"),
+              dwarf_vmatoa ("x", debug_addr_info [i]->cu_offset));
+
+      printf (_("\tIndex\tAddress\n"));
+      entry = section->start + debug_addr_info [i]->addr_base;
+      end = section->start + debug_addr_info [i + 1]->addr_base;
+      idx = 0;
+      while (entry < end)
+        {
+          dwarf_vma base = byte_get (entry, address_size);
+          printf (_("\t%d:\t"), idx);
+          print_dwarf_vma (base, address_size);
+          printf ("\n");
+          entry += address_size;
+          idx++;
+        }
+    }
+  printf ("\n");
+
+  free (debug_addr_info);
+  return 1;
+}
+
+/* Display the .debug_str_offsets and .debug_str_offsets.dwo sections.  */
+static int
+display_debug_str_offsets (struct dwarf_section *section,
+                           void *file ATTRIBUTE_UNUSED)
+{
+  if (section->size == 0)
+    {
+      printf (_("\nThe %s section is empty.\n"), section->name);
+      return 0;
+    }
+  /* TODO: Dump the contents.  This is made somewhat difficult by not knowing
+     what the offset size is for this section.  */
+  return 1;
+}
+
+/* Each debug_information[x].range_lists[y] gets this representation for
+   sorting purposes.  */
+
+struct range_entry
+{
+  /* The debug_information[x].range_lists[y] value.  */
+  unsigned long ranges_offset;
+
+  /* Original debug_information to find parameters of the data.  */
+  debug_info *debug_info_p;
+};
+
+/* Sort struct range_entry in ascending order of its RANGES_OFFSET.  */
+
+static int
+range_entry_compar (const void *ap, const void *bp)
+{
+  const struct range_entry *a_re = (const struct range_entry *) ap;
+  const struct range_entry *b_re = (const struct range_entry *) bp;
+  const unsigned long a = a_re->ranges_offset;
+  const unsigned long b = b_re->ranges_offset;
+
+  return (a > b) - (b > a);
+}
+
 static int
 display_debug_ranges (struct dwarf_section *section,
                      void *file ATTRIBUTE_UNUSED)
 {
   unsigned char *start = section->start;
-  unsigned char *section_end;
+  unsigned char *last_start = start;
   unsigned long bytes;
   unsigned char *section_begin = start;
-  unsigned int num_range_list = 0;
-  unsigned long last_offset = 0;
-  unsigned int first = 0;
-  unsigned int i;
-  unsigned int j;
-  int seen_first_offset = 0;
-  int use_debug_info = 1;
-  unsigned char *next;
+  unsigned int num_range_list, i;
+  struct range_entry *range_entries, *range_entry_fill;
 
   bytes = section->size;
-  section_end = start + bytes;
 
   if (bytes == 0)
     {
@@ -2904,127 +4527,128 @@ display_debug_ranges (struct dwarf_section *section,
       return 0;
     }
 
-  /* Check the order of range list in .debug_info section. If
-     offsets of range lists are in the ascending order, we can
-     use `debug_information' directly.  */
+  num_range_list = 0;
   for (i = 0; i < num_debug_info_entries; i++)
+    num_range_list += debug_information [i].num_range_lists;
+
+  if (num_range_list == 0)
     {
-      unsigned int num;
+      /* This can happen when the file was compiled with -gsplit-debug
+         which removes references to range lists from the primary .o file.  */
+      printf (_("No range lists in .debug_info section.\n"));
+      return 1;
+    }
 
-      num = debug_information [i].num_range_lists;
-      num_range_list += num;
+  range_entries = (struct range_entry *)
+      xmalloc (sizeof (*range_entries) * num_range_list);
+  range_entry_fill = range_entries;
 
-      /* Check if we can use `debug_information' directly.  */
-      if (use_debug_info && num != 0)
-       {
-         if (!seen_first_offset)
-           {
-             /* This is the first range list.  */
-             last_offset = debug_information [i].range_lists [0];
-             first = i;
-             seen_first_offset = 1;
-             j = 1;
-           }
-         else
-           j = 0;
+  for (i = 0; i < num_debug_info_entries; i++)
+    {
+      debug_info *debug_info_p = &debug_information[i];
+      unsigned int j;
 
-         for (; j < num; j++)
-           {
-             if (last_offset >
-                 debug_information [i].range_lists [j])
-               {
-                 use_debug_info = 0;
-                 break;
-               }
-             last_offset = debug_information [i].range_lists [j];
-           }
+      for (j = 0; j < debug_info_p->num_range_lists; j++)
+       {
+         range_entry_fill->ranges_offset = debug_info_p->range_lists[j];
+         range_entry_fill->debug_info_p = debug_info_p;
+         range_entry_fill++;
        }
     }
 
-  if (!use_debug_info)
-    /* FIXME: Should we handle this case?  */
-    error (_("Range lists in .debug_info section aren't in ascending order!\n"));
-
-  if (!seen_first_offset)
-    error (_("No range lists in .debug_info section!\n"));
+  qsort (range_entries, num_range_list, sizeof (*range_entries),
+        range_entry_compar);
 
   /* DWARF sections under Mach-O have non-zero addresses.  */
-  if (debug_information [first].num_range_lists > 0
-      && debug_information [first].range_lists [0] != section->address)
+  if (dwarf_check != 0 && range_entries[0].ranges_offset != section->address)
     warn (_("Range lists in %s section start at 0x%lx\n"),
-         section->name, debug_information [first].range_lists [0]);
+         section->name, range_entries[0].ranges_offset);
 
   printf (_("Contents of the %s section:\n\n"), section->name);
   printf (_("    Offset   Begin    End\n"));
 
-  seen_first_offset = 0;
-  for (i = first; i < num_debug_info_entries; i++)
+  for (i = 0; i < num_range_list; i++)
     {
-      unsigned long begin;
-      unsigned long end;
-      unsigned long offset;
+      struct range_entry *range_entry = &range_entries[i];
+      debug_info *debug_info_p = range_entry->debug_info_p;
       unsigned int pointer_size;
+      unsigned long offset;
+      unsigned char *next;
       unsigned long base_address;
 
-      pointer_size = debug_information [i].pointer_size;
+      pointer_size = debug_info_p->pointer_size;
 
-      for (j = 0; j < debug_information [i].num_range_lists; j++)
-       {
-         /* DWARF sections under Mach-O have non-zero addresses.  */
-         offset = debug_information [i].range_lists [j] - section->address;
-         next = section_begin + offset;
-         base_address = debug_information [i].base_address;
+      /* DWARF sections under Mach-O have non-zero addresses.  */
+      offset = range_entry->ranges_offset - section->address;
+      next = section_begin + offset;
+      base_address = debug_info_p->base_address;
 
-         if (!seen_first_offset)
-           seen_first_offset = 1;
-         else
+      if (dwarf_check != 0 && i > 0)
+       {
+         if (start < next)
+           warn (_("There is a hole [0x%lx - 0x%lx] in %s section.\n"),
+                 (unsigned long) (start - section_begin),
+                 (unsigned long) (next - section_begin), section->name);
+         else if (start > next)
            {
-             if (start < next)
-               warn (_("There is a hole [0x%lx - 0x%lx] in %s section.\n"),
-                     (long)(start - section_begin),
-                     (long)(next - section_begin), section->name);
-             else if (start > next)
-               warn (_("There is an overlap [0x%lx - 0x%lx] in %s section.\n"),
-                     (long)(start - section_begin),
-                     (long)(next - section_begin), section->name);
+             if (next == last_start)
+               continue;
+             warn (_("There is an overlap [0x%lx - 0x%lx] in %s section.\n"),
+                   (unsigned long) (start - section_begin),
+                   (unsigned long) (next - section_begin), section->name);
            }
-         start = next;
+       }
+      start = next;
+      last_start = next;
 
-         while (1)
+      while (1)
+       {
+         dwarf_vma begin;
+         dwarf_vma end;
+
+         /* Note: we use sign extension here in order to be sure that
+            we can detect 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;
+
+         printf ("    %8.8lx ", offset);
+
+         if (begin == 0 && end == 0)
            {
-             begin = byte_get (start, pointer_size);
-             start += pointer_size;
-             end = byte_get (start, pointer_size);
-             start += pointer_size;
-
-             if (begin == 0 && end == 0)
-               {
-                 printf (_("    %8.8lx <End of list>\n"), offset);
-                 break;
-               }
+             printf (_("<End of list>\n"));
+             break;
+           }
 
-             /* Check base address specifiers.  */
-             if (begin == -1UL && end != -1UL)
-               {
-                 base_address = end;
-                 printf ("    %8.8lx %8.8lx %8.8lx (base address)\n",
-                         offset, begin, end);
-                 continue;
-               }
+         /* Check base address specifiers.  */
+         if (begin == (dwarf_vma) -1 && end != (dwarf_vma) -1)
+           {
+             base_address = end;
+             print_dwarf_vma (begin, pointer_size);
+             print_dwarf_vma (end, pointer_size);
+             printf ("(base address)\n");
+             continue;
+           }
 
-             printf ("    %8.8lx %8.8lx %8.8lx",
-                     offset, begin + base_address, end + base_address);
+         print_dwarf_vma (begin + base_address, pointer_size);
+         print_dwarf_vma (end + base_address, pointer_size);
 
-             if (begin == end)
-               fputs (_(" (start == end)"), stdout);
-             else if (begin > end)
-               fputs (_(" (start > end)"), stdout);
+         if (begin == end)
+           fputs (_("(start == end)"), stdout);
+         else if (begin > end)
+           fputs (_("(start > end)"), stdout);
 
-             putchar ('\n');
-           }
+         putchar ('\n');
        }
     }
   putchar ('\n');
+
+  free (range_entries);
+
   return 1;
 }
 
@@ -3046,24 +4670,37 @@ typedef struct Frame_Chunk
   int ra;
   unsigned char fde_encoding;
   unsigned char cfa_exp;
+  unsigned char ptr_size;
+  unsigned char segment_size;
 }
 Frame_Chunk;
 
+static const char *const *dwarf_regnames;
+static unsigned int dwarf_regnames_count;
+
 /* A marker for a col_type that means this column was never referenced
    in the frame info.  */
 #define DW_CFA_unreferenced (-1)
 
-static void
-frame_need_space (Frame_Chunk *fc, int reg)
+/* Return 0 if not more space is needed, 1 if more space is needed,
+   -1 for invalid reg.  */
+
+static int
+frame_need_space (Frame_Chunk *fc, unsigned int reg)
 {
   int prev = fc->ncols;
 
-  if (reg < fc->ncols)
-    return;
+  if (reg < (unsigned int) fc->ncols)
+    return 0;
+
+  if (dwarf_regnames_count
+      && reg > dwarf_regnames_count)
+    return -1;
 
   fc->ncols = reg + 1;
-  fc->col_type = xcrealloc (fc->col_type, fc->ncols, sizeof (short int));
-  fc->col_offset = xcrealloc (fc->col_offset, fc->ncols, sizeof (int));
+  fc->col_type = (short int *) xcrealloc (fc->col_type, fc->ncols,
+                                          sizeof (short int));
+  fc->col_offset = (int *) xcrealloc (fc->col_offset, fc->ncols, sizeof (int));
 
   while (prev < fc->ncols)
     {
@@ -3071,6 +4708,99 @@ frame_need_space (Frame_Chunk *fc, int reg)
       fc->col_offset[prev] = 0;
       prev++;
     }
+  return 1;
+}
+
+static const char *const dwarf_regnames_i386[] =
+{
+  "eax", "ecx", "edx", "ebx",
+  "esp", "ebp", "esi", "edi",
+  "eip", "eflags", NULL,
+  "st0", "st1", "st2", "st3",
+  "st4", "st5", "st6", "st7",
+  NULL, NULL,
+  "xmm0", "xmm1", "xmm2", "xmm3",
+  "xmm4", "xmm5", "xmm6", "xmm7",
+  "mm0", "mm1", "mm2", "mm3",
+  "mm4", "mm5", "mm6", "mm7",
+  "fcw", "fsw", "mxcsr",
+  "es", "cs", "ss", "ds", "fs", "gs", NULL, NULL,
+  "tr", "ldtr"
+};
+
+void
+init_dwarf_regnames_i386 (void)
+{
+  dwarf_regnames = dwarf_regnames_i386;
+  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_i386);
+}
+
+static const char *const dwarf_regnames_x86_64[] =
+{
+  "rax", "rdx", "rcx", "rbx",
+  "rsi", "rdi", "rbp", "rsp",
+  "r8",  "r9",  "r10", "r11",
+  "r12", "r13", "r14", "r15",
+  "rip",
+  "xmm0",  "xmm1",  "xmm2",  "xmm3",
+  "xmm4",  "xmm5",  "xmm6",  "xmm7",
+  "xmm8",  "xmm9",  "xmm10", "xmm11",
+  "xmm12", "xmm13", "xmm14", "xmm15",
+  "st0", "st1", "st2", "st3",
+  "st4", "st5", "st6", "st7",
+  "mm0", "mm1", "mm2", "mm3",
+  "mm4", "mm5", "mm6", "mm7",
+  "rflags",
+  "es", "cs", "ss", "ds", "fs", "gs", NULL, NULL,
+  "fs.base", "gs.base", NULL, NULL,
+  "tr", "ldtr",
+  "mxcsr", "fcw", "fsw"
+};
+
+void
+init_dwarf_regnames_x86_64 (void)
+{
+  dwarf_regnames = dwarf_regnames_x86_64;
+  dwarf_regnames_count = ARRAY_SIZE (dwarf_regnames_x86_64);
+}
+
+void
+init_dwarf_regnames (unsigned int e_machine)
+{
+  switch (e_machine)
+    {
+    case EM_386:
+    case EM_486:
+      init_dwarf_regnames_i386 ();
+      break;
+
+    case EM_X86_64:
+    case EM_L1OM:
+    case EM_K1OM:
+      init_dwarf_regnames_x86_64 ();
+      break;
+
+    default:
+      break;
+    }
+}
+
+static const char *
+regname (unsigned int regno, int row)
+{
+  static char reg[64];
+  if (dwarf_regnames
+      && regno < dwarf_regnames_count
+      && dwarf_regnames [regno] != NULL)
+    {
+      if (row)
+       return dwarf_regnames [regno];
+      snprintf (reg, sizeof (reg), "r%d (%s)", regno,
+               dwarf_regnames [regno]);
+    }
+  else
+    snprintf (reg, sizeof (reg), "r%d", regno);
+  return reg;
 }
 
 static void
@@ -3084,27 +4814,29 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, int *max_regs)
 
   if (*need_col_headers)
     {
+      static const char *sloc = "   LOC";
+
       *need_col_headers = 0;
 
-      printf ("   LOC   CFA      ");
+      printf ("%-*s CFA      ", eh_addr_size * 2, sloc);
 
       for (r = 0; r < *max_regs; r++)
        if (fc->col_type[r] != DW_CFA_unreferenced)
          {
            if (r == fc->ra)
-             printf ("ra   ");
+             printf ("ra      ");
            else
-             printf ("r%-4d", r);
+             printf ("%-5s ", regname (r, 1));
          }
 
       printf ("\n");
     }
 
-  printf ("%08lx ", fc->pc_begin);
+  printf ("%0*lx ", eh_addr_size * 2, fc->pc_begin);
   if (fc->cfa_exp)
     strcpy (tmp, "exp");
   else
-    sprintf (tmp, "r%d%+d", fc->cfa_reg, fc->cfa_offset);
+    sprintf (tmp, "%s%+d", regname (fc->cfa_reg, 1), fc->cfa_offset);
   printf ("%-8s ", tmp);
 
   for (r = 0; r < fc->ncols; r++)
@@ -3126,7 +4858,7 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, int *max_regs)
              sprintf (tmp, "v%+d", fc->col_offset[r]);
              break;
            case DW_CFA_register:
-             sprintf (tmp, "r%d", fc->col_offset[r]);
+             sprintf (tmp, "%s", regname (fc->col_offset[r], 0));
              break;
            case DW_CFA_expression:
              strcpy (tmp, "exp");
@@ -3138,39 +4870,15 @@ frame_display_row (Frame_Chunk *fc, int *need_col_headers, int *max_regs)
              strcpy (tmp, "n/a");
              break;
            }
-         printf ("%-5s", tmp);
+         printf ("%-5s ", tmp);
        }
     }
   printf ("\n");
 }
 
-static int
-size_of_encoded_value (int encoding)
-{
-  switch (encoding & 0x7)
-    {
-    default:   /* ??? */
-    case 0:    return eh_addr_size;
-    case 2:    return 2;
-    case 3:    return 4;
-    case 4:    return 8;
-    }
-}
-
-static dwarf_vma
-get_encoded_value (unsigned char *data, int encoding)
-{
-  int size = size_of_encoded_value (encoding);
-
-  if (encoding & DW_EH_PE_signed)
-    return byte_get_signed (data, size);
-  else
-    return byte_get (data, size);
-}
-
 #define GET(N) byte_get (start, N); start += N
 #define LEB()  read_leb128 (start, & length_return, 0); start += length_return
-#define SLEB() read_leb128 (start, & length_return, 1); start += length_return
+#define SLEB() read_sleb128 (start, & length_return); start += length_return
 
 static int
 display_debug_frames (struct dwarf_section *section,
@@ -3185,8 +4893,10 @@ display_debug_frames (struct dwarf_section *section,
   int is_eh = strcmp (section->name, ".eh_frame") == 0;
   unsigned int length_return;
   int max_regs = 0;
+  const char *bad_reg = _("bad register: ");
+  int saved_eh_addr_size = eh_addr_size;
 
-  printf (_("The section %s contains:\n"), section->name);
+  printf (_("Contents of the %s section:\n"), section->name);
 
   while (start < end)
     {
@@ -3199,7 +4909,7 @@ display_debug_frames (struct dwarf_section *section,
       int need_col_headers = 1;
       unsigned char *augmentation_data = NULL;
       unsigned long augmentation_data_len = 0;
-      int encoded_ptr_size = eh_addr_size;
+      int encoded_ptr_size = saved_eh_addr_size;
       int offset_size;
       int initial_length_size;
 
@@ -3239,15 +4949,15 @@ display_debug_frames (struct dwarf_section *section,
        {
          int version;
 
-         fc = xmalloc (sizeof (Frame_Chunk));
+         fc = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
          memset (fc, 0, sizeof (Frame_Chunk));
 
          fc->next = chunks;
          chunks = fc;
          fc->chunk_start = saved_start;
          fc->ncols = 0;
-         fc->col_type = xmalloc (sizeof (short int));
-         fc->col_offset = xmalloc (sizeof (int));
+         fc->col_type = (short int *) xmalloc (sizeof (short int));
+         fc->col_offset = (int *) xmalloc (sizeof (int));
          frame_need_space (fc, max_regs - 1);
 
          version = *start++;
@@ -3255,48 +4965,36 @@ display_debug_frames (struct dwarf_section *section,
          fc->augmentation = (char *) start;
          start = (unsigned char *) strchr ((char *) start, '\0') + 1;
 
-         if (fc->augmentation[0] == 'z')
+         if (strcmp (fc->augmentation, "eh") == 0)
+           start += eh_addr_size;
+
+         if (version >= 4)
            {
-             fc->code_factor = LEB ();
-             fc->data_factor = SLEB ();
-             if (version == 1)
-               {
-                 fc->ra = GET (1);
-               }
-             else
-               {
-                 fc->ra = LEB ();
-               }
-             augmentation_data_len = LEB ();
-             augmentation_data = start;
-             start += augmentation_data_len;
+             fc->ptr_size = GET (1);
+             fc->segment_size = GET (1);
+             eh_addr_size = fc->ptr_size;
            }
-         else if (strcmp (fc->augmentation, "eh") == 0)
-           {
-             start += eh_addr_size;
-             fc->code_factor = LEB ();
-             fc->data_factor = SLEB ();
-             if (version == 1)
-               {
-                 fc->ra = GET (1);
-               }
-             else
-               {
-                 fc->ra = LEB ();
-               }
+         else
+           {
+             fc->ptr_size = eh_addr_size;
+             fc->segment_size = 0;
+           }
+         fc->code_factor = LEB ();
+         fc->data_factor = SLEB ();
+         if (version == 1)
+           {
+             fc->ra = GET (1);
            }
          else
            {
-             fc->code_factor = LEB ();
-             fc->data_factor = SLEB ();
-             if (version == 1)
-               {
-                 fc->ra = GET (1);
-               }
-             else
-               {
-                 fc->ra = LEB ();
-               }
+             fc->ra = LEB ();
+           }
+
+         if (fc->augmentation[0] == 'z')
+           {
+             augmentation_data_len = LEB ();
+             augmentation_data = start;
+             start += augmentation_data_len;
            }
          cie = fc;
 
@@ -3311,6 +5009,11 @@ display_debug_frames (struct dwarf_section *section,
                      (unsigned long)(saved_start - section_start), length, cie_id);
              printf ("  Version:               %d\n", version);
              printf ("  Augmentation:          \"%s\"\n", fc->augmentation);
+             if (version >= 4)
+               {
+                 printf ("  Pointer Size:          %u\n", fc->ptr_size);
+                 printf ("  Segment Size:          %u\n", fc->segment_size);
+               }
              printf ("  Code alignment factor: %u\n", fc->code_factor);
              printf ("  Data alignment factor: %d\n", fc->data_factor);
              printf ("  Return address column: %d\n", fc->ra);
@@ -3340,6 +5043,8 @@ display_debug_frames (struct dwarf_section *section,
                    q += 1 + size_of_encoded_value (*q);
                  else if (*p == 'R')
                    fc->fde_encoding = *q++;
+                 else if (*p == 'S')
+                   ;
                  else
                    break;
                  p++;
@@ -3355,6 +5060,7 @@ display_debug_frames (struct dwarf_section *section,
        {
          unsigned char *look_for;
          static Frame_Chunk fde_fc;
+         unsigned long segment_selector;
 
          fc = & fde_fc;
          memset (fc, 0, sizeof (Frame_Chunk));
@@ -3370,21 +5076,26 @@ display_debug_frames (struct dwarf_section *section,
              warn ("Invalid CIE pointer %#08lx in FDE at %#08lx\n",
                    cie_id, (unsigned long)(saved_start - section_start));
              fc->ncols = 0;
-             fc->col_type = xmalloc (sizeof (short int));
-             fc->col_offset = xmalloc (sizeof (int));
+             fc->col_type = (short int *) xmalloc (sizeof (short int));
+             fc->col_offset = (int *) xmalloc (sizeof (int));
              frame_need_space (fc, max_regs - 1);
              cie = fc;
              fc->augmentation = "";
              fc->fde_encoding = 0;
+             fc->ptr_size = eh_addr_size;
+             fc->segment_size = 0;
            }
          else
            {
              fc->ncols = cie->ncols;
-             fc->col_type = xcmalloc (fc->ncols, sizeof (short int));
-             fc->col_offset = xcmalloc (fc->ncols, sizeof (int));
+             fc->col_type = (short int *) xcmalloc (fc->ncols, sizeof (short int));
+             fc->col_offset =  (int *) xcmalloc (fc->ncols, sizeof (int));
              memcpy (fc->col_type, cie->col_type, fc->ncols * sizeof (short int));
              memcpy (fc->col_offset, cie->col_offset, fc->ncols * sizeof (int));
              fc->augmentation = cie->augmentation;
+             fc->ptr_size = cie->ptr_size;
+             eh_addr_size = cie->ptr_size;
+             fc->segment_size = cie->segment_size;
              fc->code_factor = cie->code_factor;
              fc->data_factor = cie->data_factor;
              fc->cfa_reg = cie->cfa_reg;
@@ -3397,9 +5108,13 @@ display_debug_frames (struct dwarf_section *section,
          if (fc->fde_encoding)
            encoded_ptr_size = size_of_encoded_value (fc->fde_encoding);
 
-         fc->pc_begin = get_encoded_value (start, fc->fde_encoding);
-         if ((fc->fde_encoding & 0x70) == DW_EH_PE_pcrel)
-           fc->pc_begin += section->address + (start - section_start);
+         segment_selector = 0;
+         if (fc->segment_size)
+           {
+             segment_selector = byte_get (start, fc->segment_size);
+             start += fc->segment_size;
+           }
+         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;
@@ -3411,10 +5126,12 @@ display_debug_frames (struct dwarf_section *section,
              start += augmentation_data_len;
            }
 
-         printf ("\n%08lx %08lx %08lx FDE cie=%08lx pc=%08lx..%08lx\n",
+         printf ("\n%08lx %08lx %08lx FDE cie=%08lx pc=",
                  (unsigned long)(saved_start - section_start), length, cie_id,
-                 (unsigned long)(cie->chunk_start - section_start),
-                 fc->pc_begin, fc->pc_begin + fc->pc_range);
+                 (unsigned long)(cie->chunk_start - section_start));
+         if (fc->segment_size)
+           printf ("%04lx:", segment_selector);
+         printf ("%08lx..%08lx\n", fc->pc_begin, fc->pc_begin + fc->pc_range);
          if (! do_debug_frames_interp && augmentation_data_len)
            {
              unsigned long i;
@@ -3443,7 +5160,7 @@ display_debug_frames (struct dwarf_section *section,
          while (start < block_end)
            {
              unsigned op, opa;
-             unsigned long reg, tmp;
+             unsigned long reg, temp;
 
              op = *start++;
              opa = op & 0x3f;
@@ -3458,12 +5175,12 @@ display_debug_frames (struct dwarf_section *section,
                  break;
                case DW_CFA_offset:
                  LEB ();
-                 frame_need_space (fc, opa);
-                 fc->col_type[opa] = DW_CFA_undefined;
+                 if (frame_need_space (fc, opa) >= 0)
+                   fc->col_type[opa] = DW_CFA_undefined;
                  break;
                case DW_CFA_restore:
-                 frame_need_space (fc, opa);
-                 fc->col_type[opa] = DW_CFA_undefined;
+                 if (frame_need_space (fc, opa) >= 0)
+                   fc->col_type[opa] = DW_CFA_undefined;
                  break;
                case DW_CFA_set_loc:
                  start += encoded_ptr_size;
@@ -3480,28 +5197,29 @@ display_debug_frames (struct dwarf_section *section,
                case DW_CFA_offset_extended:
                case DW_CFA_val_offset:
                  reg = LEB (); LEB ();
-                 frame_need_space (fc, reg);
-                 fc->col_type[reg] = DW_CFA_undefined;
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
                  break;
                case DW_CFA_restore_extended:
                  reg = LEB ();
                  frame_need_space (fc, reg);
-                 fc->col_type[reg] = DW_CFA_undefined;
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
                  break;
                case DW_CFA_undefined:
                  reg = LEB ();
-                 frame_need_space (fc, reg);
-                 fc->col_type[reg] = DW_CFA_undefined;
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
                  break;
                case DW_CFA_same_value:
                  reg = LEB ();
-                 frame_need_space (fc, reg);
-                 fc->col_type[reg] = DW_CFA_undefined;
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
                  break;
                case DW_CFA_register:
                  reg = LEB (); LEB ();
-                 frame_need_space (fc, reg);
-                 fc->col_type[reg] = DW_CFA_undefined;
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
                  break;
                case DW_CFA_def_cfa:
                  LEB (); LEB ();
@@ -3513,22 +5231,22 @@ display_debug_frames (struct dwarf_section *section,
                  LEB ();
                  break;
                case DW_CFA_def_cfa_expression:
-                 tmp = LEB ();
-                 start += tmp;
+                 temp = LEB ();
+                 start += temp;
                  break;
                case DW_CFA_expression:
                case DW_CFA_val_expression:
                  reg = LEB ();
-                 tmp = LEB ();
-                 start += tmp;
-                 frame_need_space (fc, reg);
-                 fc->col_type[reg] = DW_CFA_undefined;
+                 temp = LEB ();
+                 start += temp;
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
                  break;
                case DW_CFA_offset_extended_sf:
                case DW_CFA_val_offset_sf:
                  reg = LEB (); SLEB ();
-                 frame_need_space (fc, reg);
-                 fc->col_type[reg] = DW_CFA_undefined;
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
                  break;
                case DW_CFA_def_cfa_sf:
                  LEB (); SLEB ();
@@ -3544,9 +5262,9 @@ display_debug_frames (struct dwarf_section *section,
                  break;
                case DW_CFA_GNU_negative_offset_extended:
                  reg = LEB (); LEB ();
-                 frame_need_space (fc, reg);
-                 fc->col_type[reg] = DW_CFA_undefined;
-
+                 if (frame_need_space (fc, reg) >= 0)
+                   fc->col_type[reg] = DW_CFA_undefined;
+                 break;
                default:
                  break;
                }
@@ -3563,6 +5281,7 @@ display_debug_frames (struct dwarf_section *section,
          unsigned long ul, reg, roffs;
          long l, ofs;
          dwarf_vma vma;
+         const char *reg_prefix = "";
 
          op = *start++;
          opa = op & 0x3f;
@@ -3585,24 +5304,38 @@ display_debug_frames (struct dwarf_section *section,
 
            case DW_CFA_offset:
              roffs = LEB ();
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_offset: r%d at cfa%+ld\n",
-                       opa, roffs * fc->data_factor);
-             fc->col_type[opa] = DW_CFA_offset;
-             fc->col_offset[opa] = roffs * fc->data_factor;
+             if (opa >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_offset: %s%s at cfa%+ld\n",
+                       reg_prefix, regname (opa, 0),
+                       roffs * fc->data_factor);
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[opa] = DW_CFA_offset;
+                 fc->col_offset[opa] = roffs * fc->data_factor;
+               }
              break;
 
            case DW_CFA_restore:
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_restore: r%d\n", opa);
-             fc->col_type[opa] = cie->col_type[opa];
-             fc->col_offset[opa] = cie->col_offset[opa];
+             if (opa >= (unsigned int) cie->ncols
+                 || opa >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_restore: %s%s\n",
+                       reg_prefix, regname (opa, 0));
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[opa] = cie->col_type[opa];
+                 fc->col_offset[opa] = cie->col_offset[opa];
+                 if (do_debug_frames_interp
+                     && fc->col_type[opa] == DW_CFA_unreferenced)
+                   fc->col_type[opa] = DW_CFA_undefined;
+               }
              break;
 
            case DW_CFA_set_loc:
-             vma = get_encoded_value (start, fc->fde_encoding);
-             if ((fc->fde_encoding & 0x70) == DW_EH_PE_pcrel)
-               vma += section->address + (start - section_start);
+             vma = get_encoded_value (start, fc->fde_encoding, section);
              start += encoded_ptr_size;
              if (do_debug_frames_interp)
                frame_display_row (fc, &need_col_headers, &max_regs);
@@ -3647,63 +5380,104 @@ display_debug_frames (struct dwarf_section *section,
            case DW_CFA_offset_extended:
              reg = LEB ();
              roffs = LEB ();
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_offset_extended: r%ld at cfa%+ld\n",
-                       reg, roffs * fc->data_factor);
-             fc->col_type[reg] = DW_CFA_offset;
-             fc->col_offset[reg] = roffs * fc->data_factor;
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_offset_extended: %s%s at cfa%+ld\n",
+                       reg_prefix, regname (reg, 0),
+                       roffs * fc->data_factor);
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_offset;
+                 fc->col_offset[reg] = roffs * fc->data_factor;
+               }
              break;
 
            case DW_CFA_val_offset:
              reg = LEB ();
              roffs = LEB ();
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_val_offset: r%ld at cfa%+ld\n",
-                       reg, roffs * fc->data_factor);
-             fc->col_type[reg] = DW_CFA_val_offset;
-             fc->col_offset[reg] = roffs * fc->data_factor;
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_val_offset: %s%s at cfa%+ld\n",
+                       reg_prefix, regname (reg, 0),
+                       roffs * fc->data_factor);
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_val_offset;
+                 fc->col_offset[reg] = roffs * fc->data_factor;
+               }
              break;
 
            case DW_CFA_restore_extended:
              reg = LEB ();
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_restore_extended: r%ld\n", reg);
-             fc->col_type[reg] = cie->col_type[reg];
-             fc->col_offset[reg] = cie->col_offset[reg];
+             if (reg >= (unsigned int) cie->ncols
+                 || reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_restore_extended: %s%s\n",
+                       reg_prefix, regname (reg, 0));
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = cie->col_type[reg];
+                 fc->col_offset[reg] = cie->col_offset[reg];
+               }
              break;
 
            case DW_CFA_undefined:
              reg = LEB ();
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_undefined: r%ld\n", reg);
-             fc->col_type[reg] = DW_CFA_undefined;
-             fc->col_offset[reg] = 0;
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_undefined: %s%s\n",
+                       reg_prefix, regname (reg, 0));
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_undefined;
+                 fc->col_offset[reg] = 0;
+               }
              break;
 
            case DW_CFA_same_value:
              reg = LEB ();
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_same_value: r%ld\n", reg);
-             fc->col_type[reg] = DW_CFA_same_value;
-             fc->col_offset[reg] = 0;
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_same_value: %s%s\n",
+                       reg_prefix, regname (reg, 0));
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_same_value;
+                 fc->col_offset[reg] = 0;
+               }
              break;
 
            case DW_CFA_register:
              reg = LEB ();
              roffs = LEB ();
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_register: r%ld in r%ld\n", reg, roffs);
-             fc->col_type[reg] = DW_CFA_register;
-             fc->col_offset[reg] = roffs;
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               {
+                 printf ("  DW_CFA_register: %s%s in ",
+                         reg_prefix, regname (reg, 0));
+                 puts (regname (roffs, 0));
+               }
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_register;
+                 fc->col_offset[reg] = roffs;
+               }
              break;
 
            case DW_CFA_remember_state:
              if (! do_debug_frames_interp)
                printf ("  DW_CFA_remember_state\n");
-             rs = xmalloc (sizeof (Frame_Chunk));
+             rs = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
              rs->ncols = fc->ncols;
-             rs->col_type = xcmalloc (rs->ncols, sizeof (short int));
-             rs->col_offset = xcmalloc (rs->ncols, sizeof (int));
+             rs->col_type = (short int *) xcmalloc (rs->ncols,
+                                                     sizeof (short int));
+             rs->col_offset = (int *) xcmalloc (rs->ncols, sizeof (int));
              memcpy (rs->col_type, fc->col_type, rs->ncols);
              memcpy (rs->col_offset, fc->col_offset, rs->ncols * sizeof (int));
              rs->next = remembered_state;
@@ -3734,15 +5508,16 @@ display_debug_frames (struct dwarf_section *section,
              fc->cfa_offset = LEB ();
              fc->cfa_exp = 0;
              if (! do_debug_frames_interp)
-               printf ("  DW_CFA_def_cfa: r%d ofs %d\n",
-                       fc->cfa_reg, fc->cfa_offset);
+               printf ("  DW_CFA_def_cfa: %s ofs %d\n",
+                       regname (fc->cfa_reg, 0), fc->cfa_offset);
              break;
 
            case DW_CFA_def_cfa_register:
              fc->cfa_reg = LEB ();
              fc->cfa_exp = 0;
              if (! do_debug_frames_interp)
-               printf ("  DW_CFA_def_cfa_reg: r%d\n", fc->cfa_reg);
+               printf ("  DW_CFA_def_cfa_register: %s\n",
+                       regname (fc->cfa_reg, 0));
              break;
 
            case DW_CFA_def_cfa_offset:
@@ -3761,7 +5536,8 @@ display_debug_frames (struct dwarf_section *section,
              if (! do_debug_frames_interp)
                {
                  printf ("  DW_CFA_def_cfa_expression (");
-                 decode_location_expression (start, eh_addr_size, ul, 0);
+                 decode_location_expression (start, eh_addr_size, 0, -1,
+                                             ul, 0, section);
                  printf (")\n");
                }
              fc->cfa_exp = 1;
@@ -3771,49 +5547,69 @@ display_debug_frames (struct dwarf_section *section,
            case DW_CFA_expression:
              reg = LEB ();
              ul = LEB ();
-             if (! do_debug_frames_interp)
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
                {
-                 printf ("  DW_CFA_expression: r%ld (", reg);
-                 decode_location_expression (start, eh_addr_size, ul, 0);
+                 printf ("  DW_CFA_expression: %s%s (",
+                         reg_prefix, regname (reg, 0));
+                 decode_location_expression (start, eh_addr_size, 0, -1,
+                                             ul, 0, section);
                  printf (")\n");
                }
-             fc->col_type[reg] = DW_CFA_expression;
+             if (*reg_prefix == '\0')
+               fc->col_type[reg] = DW_CFA_expression;
              start += ul;
              break;
 
            case DW_CFA_val_expression:
              reg = LEB ();
              ul = LEB ();
-             if (! do_debug_frames_interp)
+             if (reg >= (unsigned int) fc->ncols)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
                {
-                 printf ("  DW_CFA_val_expression: r%ld (", reg);
-                 decode_location_expression (start, eh_addr_size, ul, 0);
+                 printf ("  DW_CFA_val_expression: %s%s (",
+                         reg_prefix, regname (reg, 0));
+                 decode_location_expression (start, eh_addr_size, 0, -1,
+                                             ul, 0, section);
                  printf (")\n");
                }
-             fc->col_type[reg] = DW_CFA_val_expression;
+             if (*reg_prefix == '\0')
+               fc->col_type[reg] = DW_CFA_val_expression;
              start += ul;
              break;
 
            case DW_CFA_offset_extended_sf:
              reg = LEB ();
              l = SLEB ();
-             frame_need_space (fc, reg);
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_offset_extended_sf: r%ld at cfa%+ld\n",
-                       reg, l * fc->data_factor);
-             fc->col_type[reg] = DW_CFA_offset;
-             fc->col_offset[reg] = l * fc->data_factor;
+             if (frame_need_space (fc, reg) < 0)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_offset_extended_sf: %s%s at cfa%+ld\n",
+                       reg_prefix, regname (reg, 0),
+                       l * fc->data_factor);
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_offset;
+                 fc->col_offset[reg] = l * fc->data_factor;
+               }
              break;
 
            case DW_CFA_val_offset_sf:
              reg = LEB ();
              l = SLEB ();
-             frame_need_space (fc, reg);
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_val_offset_sf: r%ld at cfa%+ld\n",
-                       reg, l * fc->data_factor);
-             fc->col_type[reg] = DW_CFA_val_offset;
-             fc->col_offset[reg] = l * fc->data_factor;
+             if (frame_need_space (fc, reg) < 0)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_val_offset_sf: %s%s at cfa%+ld\n",
+                       reg_prefix, regname (reg, 0),
+                       l * fc->data_factor);
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_val_offset;
+                 fc->col_offset[reg] = l * fc->data_factor;
+               }
              break;
 
            case DW_CFA_def_cfa_sf:
@@ -3822,8 +5618,8 @@ display_debug_frames (struct dwarf_section *section,
              fc->cfa_offset = fc->cfa_offset * fc->data_factor;
              fc->cfa_exp = 0;
              if (! do_debug_frames_interp)
-               printf ("  DW_CFA_def_cfa_sf: r%d ofs %d\n",
-                       fc->cfa_reg, fc->cfa_offset);
+               printf ("  DW_CFA_def_cfa_sf: %s ofs %d\n",
+                       regname (fc->cfa_reg, 0), fc->cfa_offset);
              break;
 
            case DW_CFA_def_cfa_offset_sf:
@@ -3858,19 +5654,24 @@ display_debug_frames (struct dwarf_section *section,
            case DW_CFA_GNU_negative_offset_extended:
              reg = LEB ();
              l = - LEB ();
-             frame_need_space (fc, reg);
-             if (! do_debug_frames_interp)
-               printf ("  DW_CFA_GNU_negative_offset_extended: r%ld at cfa%+ld\n",
-                       reg, l * fc->data_factor);
-             fc->col_type[reg] = DW_CFA_offset;
-             fc->col_offset[reg] = l * fc->data_factor;
+             if (frame_need_space (fc, reg) < 0)
+               reg_prefix = bad_reg;
+             if (! do_debug_frames_interp || *reg_prefix != '\0')
+               printf ("  DW_CFA_GNU_negative_offset_extended: %s%s at cfa%+ld\n",
+                       reg_prefix, regname (reg, 0),
+                       l * fc->data_factor);
+             if (*reg_prefix == '\0')
+               {
+                 fc->col_type[reg] = DW_CFA_offset;
+                 fc->col_offset[reg] = l * fc->data_factor;
+               }
              break;
 
            default:
              if (op >= DW_CFA_lo_user && op <= DW_CFA_hi_user)
                printf (_("  DW_CFA_??? (User defined call frame op: %#x)\n"), op);
              else
-               warn (_("unsupported or unknown Dwarf Call Frame Instruction number: %#x\n"), op);              
+               warn (_("unsupported or unknown Dwarf Call Frame Instruction number: %#x\n"), op);
              start = block_end;
            }
        }
@@ -3879,6 +5680,7 @@ display_debug_frames (struct dwarf_section *section,
        frame_display_row (fc, &need_col_headers, &max_regs);
 
       start = block_end;
+      eh_addr_size = saved_eh_addr_size;
     }
 
   printf ("\n");
@@ -3890,6 +5692,386 @@ display_debug_frames (struct dwarf_section *section,
 #undef LEB
 #undef SLEB
 
+static int
+display_gdb_index (struct dwarf_section *section,
+                  void *file ATTRIBUTE_UNUSED)
+{
+  unsigned char *start = section->start;
+  uint32_t version;
+  uint32_t cu_list_offset, tu_list_offset;
+  uint32_t address_table_offset, symbol_table_offset, constant_pool_offset;
+  unsigned int cu_list_elements, tu_list_elements;
+  unsigned int address_table_size, symbol_table_slots;
+  unsigned char *cu_list, *tu_list;
+  unsigned char *address_table, *symbol_table, *constant_pool;
+  unsigned int i;
+
+  /* The documentation for the format of this file is in gdb/dwarf2read.c.  */
+
+  printf (_("Contents of the %s section:\n"), section->name);
+
+  if (section->size < 6 * sizeof (uint32_t))
+    {
+      warn (_("Truncated header in the %s section.\n"), section->name);
+      return 0;
+    }
+
+  version = byte_get_little_endian (start, 4);
+  printf (_("Version %ld\n"), (long) version);
+
+  /* Prior versions are obsolete, and future versions may not be
+     backwards compatible.  */
+  if (version < 3 || version > 8)
+    {
+      warn (_("Unsupported version %lu.\n"), (unsigned long) version);
+      return 0;
+    }
+  if (version < 4)
+    warn (_("The address table data in version 3 may be wrong.\n"));
+  if (version < 5)
+    warn (_("Version 4 does not support case insensitive lookups.\n"));
+  if (version < 6)
+    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);
+  address_table_offset = byte_get_little_endian (start + 12, 4);
+  symbol_table_offset = byte_get_little_endian (start + 16, 4);
+  constant_pool_offset = byte_get_little_endian (start + 20, 4);
+
+  if (cu_list_offset > section->size
+      || tu_list_offset > section->size
+      || address_table_offset > section->size
+      || symbol_table_offset > section->size
+      || constant_pool_offset > section->size)
+    {
+      warn (_("Corrupt header in the %s section.\n"), section->name);
+      return 0;
+    }
+
+  cu_list_elements = (tu_list_offset - cu_list_offset) / 8;
+  tu_list_elements = (address_table_offset - tu_list_offset) / 8;
+  address_table_size = symbol_table_offset - address_table_offset;
+  symbol_table_slots = (constant_pool_offset - symbol_table_offset) / 8;
+
+  cu_list = start + cu_list_offset;
+  tu_list = start + tu_list_offset;
+  address_table = start + address_table_offset;
+  symbol_table = start + symbol_table_offset;
+  constant_pool = start + constant_pool_offset;
+
+  printf (_("\nCU table:\n"));
+  for (i = 0; i < cu_list_elements; i += 2)
+    {
+      uint64_t cu_offset = byte_get_little_endian (cu_list + i * 8, 8);
+      uint64_t cu_length = byte_get_little_endian (cu_list + i * 8 + 8, 8);
+
+      printf (_("[%3u] 0x%lx - 0x%lx\n"), i / 2,
+             (unsigned long) cu_offset,
+             (unsigned long) (cu_offset + cu_length - 1));
+    }
+
+  printf (_("\nTU table:\n"));
+  for (i = 0; i < tu_list_elements; i += 3)
+    {
+      uint64_t tu_offset = byte_get_little_endian (tu_list + i * 8, 8);
+      uint64_t type_offset = byte_get_little_endian (tu_list + i * 8 + 8, 8);
+      uint64_t signature = byte_get_little_endian (tu_list + i * 8 + 16, 8);
+
+      printf (_("[%3u] 0x%lx 0x%lx "), i / 3,
+             (unsigned long) tu_offset,
+             (unsigned long) type_offset);
+      print_dwarf_vma (signature, 8);
+      printf ("\n");
+    }
+
+  printf (_("\nAddress table:\n"));
+  for (i = 0; i < address_table_size; i += 2 * 8 + 4)
+    {
+      uint64_t low = byte_get_little_endian (address_table + i, 8);
+      uint64_t high = byte_get_little_endian (address_table + i + 8, 8);
+      uint32_t cu_index = byte_get_little_endian (address_table + i + 16, 4);
+
+      print_dwarf_vma (low, 8);
+      print_dwarf_vma (high, 8);
+      printf (_("%lu\n"), (unsigned long) cu_index);
+    }
+
+  printf (_("\nSymbol table:\n"));
+  for (i = 0; i < symbol_table_slots; ++i)
+    {
+      uint32_t name_offset = byte_get_little_endian (symbol_table + i * 8, 4);
+      uint32_t cu_vector_offset = byte_get_little_endian (symbol_table + i * 8 + 4, 4);
+      uint32_t num_cus, cu;
+
+      if (name_offset != 0
+         || cu_vector_offset != 0)
+       {
+         unsigned int j;
+
+         printf ("[%3u] %s:", i, constant_pool + name_offset);
+         num_cus = byte_get_little_endian (constant_pool + cu_vector_offset, 4);
+         if (num_cus > 1)
+           printf ("\n");
+         for (j = 0; j < num_cus; ++j)
+           {
+             int is_static;
+             gdb_index_symbol_kind kind;
+
+             cu = byte_get_little_endian (constant_pool + cu_vector_offset + 4 + j * 4, 4);
+             is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (cu);
+             kind = GDB_INDEX_SYMBOL_KIND_VALUE (cu);
+             cu = GDB_INDEX_CU_VALUE (cu);
+             /* Convert to TU number if it's for a type unit.  */
+             if (cu >= cu_list_elements / 2)
+               printf ("%cT%lu", num_cus > 1 ? '\t' : ' ',
+                       (unsigned long) (cu - cu_list_elements / 2));
+             else
+               printf ("%c%lu", num_cus > 1 ? '\t' : ' ', (unsigned long) cu);
+
+             switch (kind)
+               {
+               case GDB_INDEX_SYMBOL_KIND_NONE:
+                 printf (_(" [no symbol information]"));
+                 break;
+               case GDB_INDEX_SYMBOL_KIND_TYPE:
+                 printf (is_static
+                         ? _(" [static type]")
+                         : _(" [global type]"));
+                 break;
+               case GDB_INDEX_SYMBOL_KIND_VARIABLE:
+                 printf (is_static
+                         ? _(" [static variable]")
+                         : _(" [global variable]"));
+                 break;
+               case GDB_INDEX_SYMBOL_KIND_FUNCTION:
+                 printf (is_static
+                         ? _(" [static function]")
+                         : _(" [global function]"));
+                 break;
+               case GDB_INDEX_SYMBOL_KIND_OTHER:
+                 printf (is_static
+                         ? _(" [static other]")
+                         : _(" [global other]"));
+                 break;
+               default:
+                 printf (is_static
+                         ? _(" [static unknown: %d]")
+                         : _(" [global unknown: %d]"),
+                         kind);
+                 break;
+               }
+             if (num_cus > 1)
+               printf ("\n");
+           }
+         if (num_cus <= 1)
+           printf ("\n");
+       }
+    }
+
+  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
+prealloc_cu_tu_list (unsigned int nshndx)
+{
+  if (shndx_pool == NULL)
+    {
+      shndx_pool_size = nshndx;
+      shndx_pool_used = 0;
+      shndx_pool = (unsigned int *) xcmalloc (shndx_pool_size,
+                                             sizeof (unsigned int));
+    }
+  else
+    {
+      shndx_pool_size = shndx_pool_used + nshndx;
+      shndx_pool = (unsigned int *) xcrealloc (shndx_pool, shndx_pool_size,
+                                              sizeof (unsigned int));
+    }
+}
+
+static void
+add_shndx_to_cu_tu_entry (unsigned int shndx)
+{
+  if (shndx_pool_used >= shndx_pool_size)
+    {
+      error (_("Internal error: out of space in the shndx pool.\n"));
+      return;
+    }
+  shndx_pool [shndx_pool_used++] = shndx;
+}
+
+static void
+end_cu_tu_entry (void)
+{
+  if (shndx_pool_used >= shndx_pool_size)
+    {
+      error (_("Internal error: out of space in the shndx pool.\n"));
+      return;
+    }
+  shndx_pool [shndx_pool_used++] = 0;
+}
+
+/* Process a CU or TU index.  If DO_DISPLAY is true, print the contents.  */
+
+static int
+process_cu_tu_index (struct dwarf_section *section, int do_display)
+{
+  unsigned char *phdr = section->start;
+  unsigned char *limit = phdr + section->size;
+  unsigned char *phash;
+  unsigned char *pindex;
+  unsigned char *ppool;
+  unsigned int version;
+  unsigned int nused;
+  unsigned int nslots;
+  unsigned int i;
+
+  version = byte_get (phdr, 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);
+      printf (_("  Number of used entries:  %d\n"), nused);
+      printf (_("  Number of slots:         %d\n\n"), nslots);
+    }
+
+  if (ppool > limit)
+    {
+      warn (_("Section %s too small for %d hash table entries\n"),
+           section->name, nslots);
+      return 0;
+    }
+
+  for (i = 0; i < nslots; i++)
+    {
+      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)
+       {
+         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 (;;)
+           {
+             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;
+           }
+         if (do_display)
+           printf ("\n");
+         else
+           end_cu_tu_entry ();
+       }
+      phash += 8;
+      pindex += 4;
+    }
+
+  if (do_display)
+      printf ("\n");
+
+  return 1;
+}
+
+/* Load the CU and TU indexes if present.  This will build a list of
+   section sets that we can use to associate a .debug_info.dwo section
+   with its associated .debug_abbrev.dwo section in a .dwp file.  */
+
+static void
+load_cu_tu_indexes (void *file)
+{
+  /* If we have already loaded (or tried to load) the CU and TU indexes
+     then do not bother to repeat the task.  */
+  if (cu_tu_indexes_read)
+    return;
+
+  if (load_debug_section (dwp_cu_index, file))
+    process_cu_tu_index (&debug_displays [dwp_cu_index].section, 0);
+
+  if (load_debug_section (dwp_tu_index, file))
+    process_cu_tu_index (&debug_displays [dwp_tu_index].section, 0);
+
+  cu_tu_indexes_read = 1;
+}
+
+/* Find the set of sections that includes section SHNDX.  */
+
+unsigned int *
+find_cu_tu_set (void *file, unsigned int shndx)
+{
+  unsigned int i;
+
+  load_cu_tu_indexes (file);
+
+  /* Find SHNDX in the shndx pool.  */
+  for (i = 0; i < shndx_pool_used; i++)
+    if (shndx_pool [i] == shndx)
+      break;
+
+  if (i >= shndx_pool_used)
+    return NULL;
+
+  /* Now backup to find the first entry in the set.  */
+  while (i > 0 && shndx_pool [i - 1] != 0)
+    i--;
+
+  return shndx_pool + i;
+}
+
+/* Display a .debug_cu_index or .debug_tu_index section.  */
+
+static int
+display_cu_index (struct dwarf_section *section, void *file ATTRIBUTE_UNUSED)
+{
+  return process_cu_tu_index (section, 1);
+}
+
 static int
 display_debug_not_supported (struct dwarf_section *section,
                             void *file ATTRIBUTE_UNUSED)
@@ -3930,37 +6112,15 @@ xcrealloc (void *ptr, size_t nmemb, size_t size)
     return xrealloc (ptr, nmemb * size);
 }
 
-void
-error (const char *message, ...)
-{
-  va_list args;
-
-  va_start (args, message);
-  fprintf (stderr, _("%s: Error: "), program_name);
-  vfprintf (stderr, message, args);
-  va_end (args);
-}
-
-void
-warn (const char *message, ...)
-{
-  va_list args;
-
-  va_start (args, message);
-  fprintf (stderr, _("%s: Warning: "), program_name);
-  vfprintf (stderr, message, args);
-  va_end (args);
-}
-
 void
 free_debug_memory (void)
 {
-  enum dwarf_section_display_enum i;
+  unsigned int i;
 
   free_abbrevs ();
 
   for (i = 0; i < max; i++)
-    free_debug_section (i);
+    free_debug_section ((enum dwarf_section_display_enum) i);
 
   if (debug_information != NULL)
     {
@@ -3984,38 +6144,241 @@ free_debug_memory (void)
     }
 }
 
+void
+dwarf_select_sections_by_names (const char *names)
+{
+  typedef struct
+  {
+    const char * option;
+    int *        variable;
+    int          val;
+  }
+  debug_dump_long_opts;
+
+  static const debug_dump_long_opts opts_table [] =
+    {
+      /* Please keep this table alpha- sorted.  */
+      { "Ranges", & do_debug_ranges, 1 },
+      { "abbrev", & do_debug_abbrevs, 1 },
+      { "addr", & do_debug_addr, 1 },
+      { "aranges", & do_debug_aranges, 1 },
+      { "cu_index", & do_debug_cu_index, 1 },
+      { "decodedline", & do_debug_lines, FLAG_DEBUG_LINES_DECODED },
+      { "frames", & do_debug_frames, 1 },
+      { "frames-interp", & do_debug_frames_interp, 1 },
+      /* The special .gdb_index section.  */
+      { "gdb_index", & do_gdb_index, 1 },
+      { "info", & do_debug_info, 1 },
+      { "line", & do_debug_lines, FLAG_DEBUG_LINES_RAW }, /* For backwards compatibility.  */
+      { "loc",  & do_debug_loc, 1 },
+      { "macro", & do_debug_macinfo, 1 },
+      { "pubnames", & do_debug_pubnames, 1 },
+      { "pubtypes", & do_debug_pubtypes, 1 },
+      /* This entry is for compatability
+        with earlier versions of readelf.  */
+      { "ranges", & do_debug_aranges, 1 },
+      { "rawline", & do_debug_lines, FLAG_DEBUG_LINES_RAW },
+      { "str", & do_debug_str, 1 },
+      /* These trace_* sections are used by Itanium VMS.  */
+      { "trace_abbrev", & do_trace_abbrevs, 1 },
+      { "trace_aranges", & do_trace_aranges, 1 },
+      { "trace_info", & do_trace_info, 1 },
+      { NULL, NULL, 0 }
+    };
+
+  const char *p;
+
+  p = names;
+  while (*p)
+    {
+      const debug_dump_long_opts * entry;
+
+      for (entry = opts_table; entry->option; entry++)
+       {
+         size_t len = strlen (entry->option);
+
+         if (strncmp (p, entry->option, len) == 0
+             && (p[len] == ',' || p[len] == '\0'))
+           {
+             * entry->variable |= entry->val;
+
+             /* The --debug-dump=frames-interp option also
+                enables the --debug-dump=frames option.  */
+             if (do_debug_frames_interp)
+               do_debug_frames = 1;
+
+             p += len;
+             break;
+           }
+       }
+
+      if (entry->option == NULL)
+       {
+         warn (_("Unrecognized debug option '%s'\n"), p);
+         p = strchr (p, ',');
+         if (p == NULL)
+           break;
+       }
+
+      if (*p == ',')
+       p++;
+    }
+}
+
+void
+dwarf_select_sections_by_letters (const char *letters)
+{
+  unsigned int lindex = 0;
+
+  while (letters[lindex])
+    switch (letters[lindex++])
+      {
+      case 'i':
+       do_debug_info = 1;
+       break;
+
+      case 'a':
+       do_debug_abbrevs = 1;
+       break;
+
+      case 'l':
+       do_debug_lines |= FLAG_DEBUG_LINES_RAW;
+       break;
+
+      case 'L':
+       do_debug_lines |= FLAG_DEBUG_LINES_DECODED;
+       break;
+
+      case 'p':
+       do_debug_pubnames = 1;
+       break;
+
+      case 't':
+       do_debug_pubtypes = 1;
+       break;
+
+      case 'r':
+       do_debug_aranges = 1;
+       break;
+
+      case 'R':
+       do_debug_ranges = 1;
+       break;
+
+      case 'F':
+       do_debug_frames_interp = 1;
+      case 'f':
+       do_debug_frames = 1;
+       break;
+
+      case 'm':
+       do_debug_macinfo = 1;
+       break;
+
+      case 's':
+       do_debug_str = 1;
+       break;
+
+      case 'o':
+       do_debug_loc = 1;
+       break;
+
+      default:
+       warn (_("Unrecognized debug option '%s'\n"), optarg);
+       break;
+      }
+}
+
+void
+dwarf_select_sections_all (void)
+{
+  do_debug_info = 1;
+  do_debug_abbrevs = 1;
+  do_debug_lines = FLAG_DEBUG_LINES_RAW;
+  do_debug_pubnames = 1;
+  do_debug_pubtypes = 1;
+  do_debug_aranges = 1;
+  do_debug_ranges = 1;
+  do_debug_frames = 1;
+  do_debug_macinfo = 1;
+  do_debug_str = 1;
+  do_debug_loc = 1;
+  do_gdb_index = 1;
+  do_trace_info = 1;
+  do_trace_abbrevs = 1;
+  do_trace_aranges = 1;
+  do_debug_addr = 1;
+  do_debug_cu_index = 1;
+}
+
 struct dwarf_section_display debug_displays[] =
 {
-  { { ".debug_abbrev",         NULL,   0,      0 },
-    display_debug_abbrev,              0,      0 },
-  { { ".debug_aranges",                NULL,   0,      0 },
-    display_debug_aranges,             0,      0 },
-  { { ".debug_frame",          NULL,   0,      0 },
-    display_debug_frames,              1,      0 },
-  { { ".debug_info",           NULL,   0,      0 },
-    display_debug_info,                        1,      0 },
-  { { ".debug_line",           NULL,   0,      0 },
-    display_debug_lines,               0,      0 },
-  { { ".debug_pubnames",       NULL,   0,      0 },
-    display_debug_pubnames,            0,      0 },
-  { { ".eh_frame",             NULL,   0,      0 },
-    display_debug_frames,              1,      1 },
-  { { ".debug_macinfo",                NULL,   0,      0 },
-    display_debug_macinfo,             0,      0 },
-  { { ".debug_str",            NULL,   0,      0 },
-    display_debug_str,                 0,      0 },
-  { { ".debug_loc",            NULL,   0,      0 },
-    display_debug_loc,                 0,      0 },
-  { { ".debug_pubtypes",       NULL,   0,      0 },
-    display_debug_pubnames,            0,      0 },
-  { { ".debug_ranges",         NULL,   0,      0 },
-    display_debug_ranges,              0,      0 },
-  { { ".debug_static_func",    NULL,   0,      0 },
-    display_debug_not_supported,       0,      0 },
-  { { ".debug_static_vars",    NULL,   0,      0 },
-    display_debug_not_supported,       0,      0 },
-  { { ".debug_types",          NULL,   0,      0 },
-    display_debug_not_supported,       0,      0 },
-  { { ".debug_weaknames",      NULL,   0,      0 },
-    display_debug_not_supported,       0,      0 }
+  { { ".debug_abbrev",     ".zdebug_abbrev",   NULL, NULL, 0, 0, 0 },
+    display_debug_abbrev,   &do_debug_abbrevs, 0 },
+  { { ".debug_aranges",            ".zdebug_aranges",  NULL, NULL, 0, 0, 0 },
+    display_debug_aranges,  &do_debug_aranges, 1 },
+  { { ".debug_frame",       ".zdebug_frame",   NULL, NULL, 0, 0, 0 },
+    display_debug_frames,   &do_debug_frames,  1 },
+  { { ".debug_info",       ".zdebug_info",     NULL, NULL, 0, 0, abbrev },
+    display_debug_info,            &do_debug_info,     1 },
+  { { ".debug_line",       ".zdebug_line",     NULL, NULL, 0, 0, 0 },
+    display_debug_lines,    &do_debug_lines,   1 },
+  { { ".debug_pubnames",    ".zdebug_pubnames",        NULL, NULL, 0, 0, 0 },
+    display_debug_pubnames, &do_debug_pubnames,        0 },
+  { { ".eh_frame",         "",                 NULL, NULL, 0, 0, 0 },
+    display_debug_frames,   &do_debug_frames,  1 },
+  { { ".debug_macinfo",            ".zdebug_macinfo",  NULL, NULL, 0, 0, 0 },
+    display_debug_macinfo,  &do_debug_macinfo, 0 },
+  { { ".debug_macro",      ".zdebug_macro",    NULL, NULL, 0, 0, 0 },
+    display_debug_macro,    &do_debug_macinfo, 1 },
+  { { ".debug_str",        ".zdebug_str",      NULL, NULL, 0, 0, 0 },
+    display_debug_str,     &do_debug_str,      0 },
+  { { ".debug_loc",        ".zdebug_loc",      NULL, NULL, 0, 0, 0 },
+    display_debug_loc,     &do_debug_loc,      1 },
+  { { ".debug_pubtypes",    ".zdebug_pubtypes",        NULL, NULL, 0, 0, 0 },
+    display_debug_pubnames, &do_debug_pubtypes,        0 },
+  { { ".debug_ranges",     ".zdebug_ranges",   NULL, NULL, 0, 0, 0 },
+    display_debug_ranges,   &do_debug_ranges,  1 },
+  { { ".debug_static_func", ".zdebug_static_func", NULL, NULL, 0, 0, 0 },
+    display_debug_not_supported, NULL,         0 },
+  { { ".debug_static_vars", ".zdebug_static_vars", NULL, NULL, 0, 0, 0 },
+    display_debug_not_supported, NULL,         0 },
+  { { ".debug_types",      ".zdebug_types",    NULL, NULL, 0, 0, abbrev },
+    display_debug_types,    &do_debug_info,    1 },
+  { { ".debug_weaknames",   ".zdebug_weaknames", NULL, NULL, 0, 0, 0 },
+    display_debug_not_supported, NULL,         0 },
+  { { ".gdb_index",        "",                 NULL, NULL, 0, 0, 0 },
+    display_gdb_index,      &do_gdb_index,     0 },
+  { { ".trace_info",       "",                 NULL, NULL, 0, 0, trace_abbrev },
+    display_trace_info,            &do_trace_info,     1 },
+  { { ".trace_abbrev",     "",                 NULL, NULL, 0, 0, 0 },
+    display_debug_abbrev,   &do_trace_abbrevs, 0 },
+  { { ".trace_aranges",            "",                 NULL, NULL, 0, 0, 0 },
+    display_debug_aranges,  &do_trace_aranges, 0 },
+  { { ".debug_info.dwo",    ".zdebug_info.dwo",        NULL, NULL, 0, 0, abbrev_dwo },
+    display_debug_info,            &do_debug_info,     1 },
+  { { ".debug_abbrev.dwo",  ".zdebug_abbrev.dwo", NULL, NULL, 0, 0, 0 },
+    display_debug_abbrev,   &do_debug_abbrevs, 0 },
+  { { ".debug_types.dwo",   ".zdebug_types.dwo", NULL, NULL, 0, 0, abbrev_dwo },
+    display_debug_types,    &do_debug_info,    1 },
+  { { ".debug_line.dwo",    ".zdebug_line.dwo", NULL, NULL, 0, 0, 0 },
+    display_debug_lines,    &do_debug_lines,   1 },
+  { { ".debug_loc.dwo",            ".zdebug_loc.dwo",  NULL, NULL, 0, 0, 0 },
+    display_debug_loc,     &do_debug_loc,      1 },
+  { { ".debug_macro.dwo",   ".zdebug_macro.dwo", NULL, NULL, 0, 0, 0 },
+    display_debug_macro,    &do_debug_macinfo, 1 },
+  { { ".debug_macinfo.dwo", ".zdebug_macinfo.dwo", NULL, NULL, 0, 0, 0 },
+    display_debug_macinfo,  &do_debug_macinfo, 0 },
+  { { ".debug_str.dwo",     ".zdebug_str.dwo",  NULL, NULL, 0, 0, 0 },
+    display_debug_str,      &do_debug_str,     1 },
+  { { ".debug_str_offsets", ".zdebug_str_offsets", NULL, NULL, 0, 0, 0 },
+    display_debug_str_offsets, NULL,           0 },
+  { { ".debug_str_offsets.dwo", ".zdebug_str_offsets.dwo", NULL, NULL, 0, 0, 0 },
+    display_debug_str_offsets, NULL,           0 },
+  { { ".debug_addr",       ".zdebug_addr",     NULL, NULL, 0, 0, 0 },
+    display_debug_addr,     &do_debug_addr,    1 },
+  { { ".debug_cu_index",    "",                        NULL, NULL, 0, 0, 0 },
+    display_cu_index,       &do_debug_cu_index,        0 },
+  { { ".debug_tu_index",    "",                        NULL, NULL, 0, 0, 0 },
+    display_cu_index,       &do_debug_cu_index,        0 },
 };
This page took 0.098409 seconds and 4 git commands to generate.