Add support for reading Aarch64 core dumps.

[binutils-gdb.git] / binutils / dwarf.c

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 387504fc6303b1f17c872b4d06380fcd02f01c8c..a6986ad4045d8ef9cecb30808e8d637cc840d637 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -1,5 +1,5 @@
 /* dwarf.c -- display DWARF contents of a BFD binary file
-   Copyright 2005-2013 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -29,10 +29,6 @@
 #include "dwarf.h"
 #include "gdb/gdb-index.h"
 
-#if !HAVE_DECL_STRNLEN
-size_t strnlen (const char *, size_t);
-#endif
-
 static const char *regname (unsigned int regno, int row);
 
 static int have_frame_base;
@@ -5833,12 +5829,16 @@ display_debug_frames (struct dwarf_section *section,
              if (! do_debug_frames_interp)
                printf ("  DW_CFA_remember_state\n");
              rs = (Frame_Chunk *) xmalloc (sizeof (Frame_Chunk));
+              rs->cfa_offset = fc->cfa_offset;
+             rs->cfa_reg = fc->cfa_reg;
+             rs->ra = fc->ra;
+             rs->cfa_exp = fc->cfa_exp;
              rs->ncols = fc->ncols;
              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));
+                                                     sizeof (* rs->col_type));
+             rs->col_offset = (int *) xcmalloc (rs->ncols, sizeof (* rs->col_offset));
+             memcpy (rs->col_type, fc->col_type, rs->ncols * sizeof (* fc->col_type));
+             memcpy (rs->col_offset, fc->col_offset, rs->ncols * sizeof (* fc->col_offset));
              rs->next = remembered_state;
              remembered_state = rs;
              break;
@@ -5850,10 +5850,14 @@ display_debug_frames (struct dwarf_section *section,
              if (rs)
                {
                  remembered_state = rs->next;
+                 fc->cfa_offset = rs->cfa_offset;
+                 fc->cfa_reg = rs->cfa_reg;
+                 fc->ra = rs->ra;
+                 fc->cfa_exp = rs->cfa_exp;
                  frame_need_space (fc, rs->ncols - 1);
-                 memcpy (fc->col_type, rs->col_type, rs->ncols);
+                 memcpy (fc->col_type, rs->col_type, rs->ncols * sizeof (* rs->col_type));
                  memcpy (fc->col_offset, rs->col_offset,
-                         rs->ncols * sizeof (int));
+                         rs->ncols * sizeof (* rs->col_offset));
                  free (rs->col_type);
                  free (rs->col_offset);
                  free (rs);