unwinder: ppc and ppc64

Signed-off-by: Jan Kratochvil <jan.kratochvil@redhat.com>

diff --git a/backends/ChangeLog b/backends/ChangeLog
index 787223d..dc96048 100644 (file)
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,14 @@
+2013-12-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       unwinder: ppc and ppc64
+       * Makefile.am (ppc_SRCS, ppc64_SRCS): Add ppc_initreg.c.
+       * ppc64_init.c (ppc64_init): Initialize also frame_nregs,
+       set_initial_registers_tid and dwarf_to_regno.
+       * ppc_corenote.c (PRSTATUS_REGSET_ITEMS) <nip>: Set PC_REGISTER.
+       * ppc_init.c (ppc64_init): Initialize also frame_nregs,
+       set_initial_registers_tid and dwarf_to_regno.
+       * ppc_initreg.c: New file.
+
 2013-11-25  Petr Machata  <pmachata@redhat.com>
 
        * Makefile.am (modules): Add aarch64.

diff --git a/backends/Makefile.am b/backends/Makefile.am
index 9bca994..4752a64 100644 (file)
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -95,13 +95,13 @@ am_libebl_sparc_pic_a_OBJECTS = $(sparc_SRCS:.c=.os)
 
 ppc_SRCS = ppc_init.c ppc_symbol.c ppc_retval.c ppc_regs.c \
           ppc_corenote.c ppc_auxv.c ppc_attrs.c ppc_syscall.c \
-          ppc_cfi.c
+          ppc_cfi.c ppc_initreg.c
 libebl_ppc_pic_a_SOURCES = $(ppc_SRCS)
 am_libebl_ppc_pic_a_OBJECTS = $(ppc_SRCS:.c=.os)
 
 ppc64_SRCS = ppc64_init.c ppc64_symbol.c ppc64_retval.c \
             ppc64_corenote.c ppc_regs.c ppc_auxv.c ppc_attrs.c ppc_syscall.c \
-            ppc_cfi.c
+            ppc_cfi.c ppc_initreg.c
 libebl_ppc64_pic_a_SOURCES = $(ppc64_SRCS)
 am_libebl_ppc64_pic_a_OBJECTS = $(ppc64_SRCS:.c=.os)
 

diff --git a/backends/ppc64_init.c b/backends/ppc64_init.c
index 1435875..05f8898 100644 (file)
--- a/backends/ppc64_init.c
+++ b/backends/ppc64_init.c
@@ -65,6 +65,10 @@ ppc64_init (elf, machine, eh, ehlen)
   HOOK (eh, core_note);
   HOOK (eh, auxv_info);
   HOOK (eh, abi_cfi);
+  /* gcc/config/ #define DWARF_FRAME_REGISTERS.  */
+  eh->frame_nregs = (114 - 1) + 32;
+  HOOK (eh, set_initial_registers_tid);
+  HOOK (eh, dwarf_to_regno);
 
   return MODVERSION;
 }

diff --git a/backends/ppc_corenote.c b/backends/ppc_corenote.c
index 707a395..9ac8871 100644 (file)
--- a/backends/ppc_corenote.c
+++ b/backends/ppc_corenote.c
@@ -123,7 +123,7 @@ static const Ebl_Register_Location spe_regs[] =
   {                                                                          \
     .name = "nip", .type = ELF_T_ADDR, .format = 'x',                        \
     .offset = offsetof (struct EBLHOOK(prstatus), pr_reg[32]),               \
-    .group = "register"                                                              \
+    .group = "register", .pc_register = true                                 \
   },                                                                         \
   {                                                                          \
     .name = "orig_gpr3", .type = TYPE_LONG, .format = 'd',                   \

diff --git a/backends/ppc_init.c b/backends/ppc_init.c
index 004c601..ad92765 100644 (file)
--- a/backends/ppc_init.c
+++ b/backends/ppc_init.c
@@ -65,6 +65,10 @@ ppc_init (elf, machine, eh, ehlen)
   HOOK (eh, auxv_info);
   HOOK (eh, check_object_attribute);
   HOOK (eh, abi_cfi);
+  /* gcc/config/ #define DWARF_FRAME_REGISTERS.  */
+  eh->frame_nregs = (114 - 1) + 32;
+  HOOK (eh, set_initial_registers_tid);
+  HOOK (eh, dwarf_to_regno);
 
   return MODVERSION;
 }

diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c
new file mode 100644 (file)
index 0000000..64f5379
--- /dev/null
+++ b/backends/ppc_initreg.c
@@ -0,0 +1,114 @@
+/* Fetch live process registers from TID.
+   Copyright (C) 2013 Red Hat, Inc.
+   This file is part of elfutils.
+
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of either
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version
+
+   or both in parallel, as here.
+
+   elfutils is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "system.h"
+#include <stdlib.h>
+#ifdef __powerpc__
+# include <sys/user.h>
+# include <sys/ptrace.h>
+#endif
+
+#define BACKEND ppc_
+#include "libebl_CPU.h"
+
+bool
+ppc_dwarf_to_regno (Ebl *ebl __attribute__ ((unused)), unsigned *regno)
+{
+  switch (*regno)
+  {
+    case 108:
+      // LR uses both 65 and 108 numbers, there is no consistency for it.
+      *regno = 65;
+      return true;
+    case 0 ... 107:
+    case 109 ... (114 - 1) -1:
+      return true;
+    case 1200 ... 1231:
+      *regno = *regno - 1200 + (114 - 1);
+      return true;
+    default:
+      return false;
+  }
+  abort ();
+}
+
+__typeof (ppc_dwarf_to_regno)
+     ppc64_dwarf_to_regno
+     __attribute__ ((alias ("ppc_dwarf_to_regno")));
+
+bool
+ppc_set_initial_registers_tid (pid_t tid __attribute__ ((unused)),
+                         ebl_tid_registers_t *setfunc __attribute__ ((unused)),
+                              void *arg __attribute__ ((unused)))
+{
+#ifndef __powerpc__
+  return false;
+#else /* __powerpc__ */
+  union
+    {
+      struct pt_regs r;
+      long l[sizeof (struct pt_regs) / sizeof (long)];
+    }
+  user_regs;
+  eu_static_assert (sizeof (struct pt_regs) % sizeof (long) == 0);
+  /* PTRACE_GETREGS is EIO on kernel-2.6.18-308.el5.ppc64.  */
+  errno = 0;
+  for (unsigned regno = 0; regno < sizeof (user_regs) / sizeof (long);
+       regno++)
+    {
+      user_regs.l[regno] = ptrace (PTRACE_PEEKUSER, tid,
+                                  (void *) (uintptr_t) (regno
+                                                        * sizeof (long)),
+                                  NULL);
+      if (errno != 0)
+       return false;
+    }
+  const size_t gprs = sizeof (user_regs.r.gpr) / sizeof (*user_regs.r.gpr);
+  Dwarf_Word dwarf_regs[gprs];
+  for (unsigned gpr = 0; gpr < gprs; gpr++)
+    dwarf_regs[gpr] = user_regs.r.gpr[gpr];
+  if (! setfunc (0, gprs, dwarf_regs, arg))
+    return false;
+  dwarf_regs[0] = user_regs.r.link;
+  // LR uses both 65 and 108 numbers, there is no consistency for it.
+  if (! setfunc (65, 1, dwarf_regs, arg))
+    return false;
+  /* Registers like msr, ctr, xer, dar, dsisr etc. are probably irrelevant
+     for CFI.  */
+  dwarf_regs[0] = user_regs.r.nip;
+  return setfunc (-1, 1, dwarf_regs, arg);
+#endif /* __powerpc__ */
+}
+
+__typeof (ppc_set_initial_registers_tid)
+     ppc64_set_initial_registers_tid
+     __attribute__ ((alias ("ppc_set_initial_registers_tid")));

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 7e87e17..ff38108 100644 (file)
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,13 @@
+2013-12-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       unwinder: ppc and ppc64
+       * frame_unwind.c (__libdwfl_frame_reg_get, __libdwfl_frame_reg_set):
+       Call ebl_dwarf_to_regno.
+       * linux-core-attach.c (core_set_initial_registers): Implement
+       pc_register support.
+       * linux-pid-attach.c (pid_thread_state_registers_cb): Implement
+       FIRSTREG -1.
+
 2013-11-30  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        Introduce process_attach_error.

diff --git a/libdwfl/frame_unwind.c b/libdwfl/frame_unwind.c
index 1aed8cb..2973f95 100644 (file)
--- a/libdwfl/frame_unwind.c
+++ b/libdwfl/frame_unwind.c
@@ -52,6 +52,8 @@ internal_function
 __libdwfl_frame_reg_get (Dwfl_Frame *state, unsigned regno, Dwarf_Addr *val)
 {
   Ebl *ebl = state->thread->process->ebl;
+  if (! ebl_dwarf_to_regno (ebl, &regno))
+    return false;
   if (regno >= ebl_frame_nregs (ebl))
     return false;
   if ((state->regs_set[regno / sizeof (*state->regs_set) / 8]
@@ -67,6 +69,8 @@ internal_function
 __libdwfl_frame_reg_set (Dwfl_Frame *state, unsigned regno, Dwarf_Addr val)
 {
   Ebl *ebl = state->thread->process->ebl;
+  if (! ebl_dwarf_to_regno (ebl, &regno))
+    return false;
   if (regno >= ebl_frame_nregs (ebl))
     return false;
   /* For example i386 user_regs_struct has signed fields.  */

diff --git a/libdwfl/linux-core-attach.c b/libdwfl/linux-core-attach.c
index 237c6f3..11379ba 100644 (file)
--- a/libdwfl/linux-core-attach.c
+++ b/libdwfl/linux-core-attach.c
@@ -198,6 +198,32 @@ core_set_initial_registers (Dwfl_Thread *thread, void *thread_arg_voidp)
   }
   /* core_next_thread already found this TID there.  */
   assert (tid == INTUSE(dwfl_thread_tid) (thread));
+  for (item = items; item < items + nitems; item++)
+    if (item->pc_register)
+      break;
+  if (item < items + nitems)
+    {
+      Dwarf_Word pc;
+      switch (gelf_getclass (core) == ELFCLASS32 ? 32 : 64)
+      {
+       case 32:;
+         uint32_t val32 = *(const uint32_t *) (desc + item->offset);
+         val32 = (elf_getident (core, NULL)[EI_DATA] == ELFDATA2MSB
+                  ? be32toh (val32) : le32toh (val32));
+         /* Do a host width conversion.  */
+         pc = val32;
+         break;
+       case 64:;
+         uint64_t val64 = *(const uint64_t *) (desc + item->offset);
+         val64 = (elf_getident (core, NULL)[EI_DATA] == ELFDATA2MSB
+                  ? be64toh (val64) : le64toh (val64));
+         pc = val64;
+         break;
+       default:
+         abort ();
+      }
+      INTUSE(dwfl_thread_state_register_pc) (thread, pc);
+    }
   desc += regs_offset;
   for (size_t regloci = 0; regloci < nregloc; regloci++)
     {

diff --git a/libdwfl/linux-pid-attach.c b/libdwfl/linux-pid-attach.c
index e4eb621..45a0732 100644 (file)
--- a/libdwfl/linux-pid-attach.c
+++ b/libdwfl/linux-pid-attach.c
@@ -205,6 +205,14 @@ pid_thread_state_registers_cb (int firstreg, unsigned nregs,
                               const Dwarf_Word *regs, void *arg)
 {
   Dwfl_Thread *thread = (Dwfl_Thread *) arg;
+  if (firstreg < 0)
+    {
+      assert (firstreg == -1);
+      assert (nregs == 1);
+      INTUSE(dwfl_thread_state_register_pc) (thread, *regs);
+      return true;
+    }
+  assert (nregs > 0);
   return INTUSE(dwfl_thread_state_registers) (thread, firstreg, nregs, regs);
 }
 

diff --git a/libebl/ChangeLog b/libebl/ChangeLog
index a5c9dae..a27de82 100644 (file)
--- a/libebl/ChangeLog
+++ b/libebl/ChangeLog
@@ -1,3 +1,13 @@
+2013-12-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       unwinder: ppc and ppc64
+       * Makefile.am (gen_SOURCES): Add ebldwarftoregno.c.
+       * ebl-hooks.h (dwarf_to_regno): New.
+       * ebldwarftoregno.c: New file.
+       * libebl.h (Ebl_Core_Item): New field pc_register.
+       (ebl_tid_registers_t): Add FIRSTREG -1 to the comment.
+       (ebl_dwarf_to_regno): New.
+
 2013-11-25  Petr Machata  <pmachata@redhat.com>
 
        * eblopenbackend.c (machines): Add entry for AArch64.

diff --git a/libebl/Makefile.am b/libebl/Makefile.am
index 4487c5f..2f3b730 100644 (file)
--- a/libebl/Makefile.am
+++ b/libebl/Makefile.am
@@ -54,7 +54,7 @@ gen_SOURCES = eblopenbackend.c eblclosebackend.c eblstrtab.c \
              eblreginfo.c eblnonerelocp.c eblrelativerelocp.c \
              eblsysvhashentrysize.c eblauxvinfo.c eblcheckobjattr.c \
              ebl_check_special_section.c ebl_syscall_abi.c eblabicfi.c \
-             eblstother.c eblinitreg.c
+             eblstother.c eblinitreg.c ebldwarftoregno.c
 
 libebl_a_SOURCES = $(gen_SOURCES)
 

diff --git a/libebl/ebl-hooks.h b/libebl/ebl-hooks.h
index cb52fee..f721bc4 100644 (file)
--- a/libebl/ebl-hooks.h
+++ b/libebl/ebl-hooks.h
@@ -162,5 +162,9 @@ bool EBLHOOK(set_initial_registers_tid) (pid_t tid,
                                         ebl_tid_registers_t *setfunc,
                                         void *arg);
 
+/* Convert *REGNO as is in DWARF to a lower range suitable for
+   Dwarf_Frame->REGS indexing.  */
+bool EBLHOOK(dwarf_to_regno) (Ebl *ebl, unsigned *regno);
+
 /* Destructor for ELF backend handle.  */
 void EBLHOOK(destr) (struct ebl *);

diff --git a/libebl/ebldwarftoregno.c b/libebl/ebldwarftoregno.c
new file mode 100644 (file)
index 0000000..8fb8540
--- /dev/null
+++ b/libebl/ebldwarftoregno.c
@@ -0,0 +1,41 @@
+/* Convert *REGNO as is in DWARF to a lower range.
+   Copyright (C) 2013 Red Hat, Inc.
+   This file is part of elfutils.
+
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of either
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version
+
+   or both in parallel, as here.
+
+   elfutils is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <libeblP.h>
+
+bool
+ebl_dwarf_to_regno (Ebl *ebl, unsigned *regno)
+{
+  if (ebl == NULL)
+    return false;
+  return ebl->dwarf_to_regno == NULL ? true : ebl->dwarf_to_regno (ebl, regno);
+}

diff --git a/libebl/libebl.h b/libebl/libebl.h
index 045a198..7080b4a 100644 (file)
--- a/libebl/libebl.h
+++ b/libebl/libebl.h
@@ -368,6 +368,7 @@ typedef struct
   Elf_Type type;
   char format;
   bool thread_identifier;
+  bool pc_register;
 } Ebl_Core_Item;
 
 /* Describe the format of a core file note with the given header and NAME.
@@ -383,7 +384,9 @@ extern int ebl_auxv_info (Ebl *ebl, GElf_Xword a_type,
                          const char **name, const char **format)
   __nonnull_attribute__ (1, 3, 4);
 
-/* Callback type for ebl_set_initial_registers_tid.  */
+/* Callback type for ebl_set_initial_registers_tid.
+   Register -1 is mapped to PC (if arch PC has no DWARF number).
+   If FIRSTREG is -1 then NREGS has to be 1.  */
 typedef bool (ebl_tid_registers_t) (int firstreg, unsigned nregs,
                                    const Dwarf_Word *regs, void *arg)
   __nonnull_attribute__ (3);
@@ -402,6 +405,11 @@ extern bool ebl_set_initial_registers_tid (Ebl *ebl,
 extern size_t ebl_frame_nregs (Ebl *ebl)
   __nonnull_attribute__ (1);
 
+/* Convert *REGNO as is in DWARF to a lower range suitable for
+   Dwarf_Frame->REGS indexing.  */
+extern bool ebl_dwarf_to_regno (Ebl *ebl, unsigned *regno)
+  __nonnull_attribute__ (1, 2);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 0081981..f7007e5 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,13 @@
+2013-12-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       unwinder: ppc
+       * Makefile.am (TESTS): Add run-backtrace-core-ppc.sh.
+       (EXTRA_DIST): Add backtrace.ppc.core.bz2,
+       backtrace.ppc.exec.bz2 and run-backtrace-core-ppc.sh.
+       * backtrace.ppc.core.bz2: New file.
+       * backtrace.ppc.exec.bz2: New file.
+       * run-backtrace-core-ppc.sh: New file.
+
 2013-12-10  Mark Wielaard  <mjw@redhat.com>
 
        * Makefile.am (backtrace_child_biarch_SOURCES): New backtrace-child.c.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 75a16bd..7739623 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -106,7 +106,7 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile test-nlist \
        run-backtrace-native.sh run-backtrace-data.sh run-backtrace-dwarf.sh \
        run-backtrace-native-biarch.sh run-backtrace-native-core.sh \
        run-backtrace-native-core-biarch.sh run-backtrace-core-x86_64.sh \
-       run-backtrace-core-i386.sh
+       run-backtrace-core-i386.sh run-backtrace-core-ppc.sh
 
 if !BIARCH
 export ELFUTILS_DISABLE_BIARCH = 1
@@ -245,7 +245,9 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \
             run-backtrace-native-core.sh run-backtrace-native-core-biarch.sh \
             run-backtrace-core-x86_64.sh run-backtrace-core-i386.sh \
             backtrace-subr.sh backtrace.i386.core.bz2 backtrace.i386.exec.bz2 \
-            backtrace.x86_64.core.bz2 backtrace.x86_64.exec.bz2
+            backtrace.x86_64.core.bz2 backtrace.x86_64.exec.bz2 \
+            backtrace.ppc.core.bz2 backtrace.ppc.exec.bz2 \
+            run-backtrace-core-ppc.sh
 
 if USE_VALGRIND
 valgrind_cmd='valgrind -q --error-exitcode=1 --run-libc-freeres=no'

diff --git a/tests/backtrace.ppc.core.bz2 b/tests/backtrace.ppc.core.bz2
new file mode 100644 (file)
index 0000000..f20cd9f
Binary files /dev/null and b/tests/backtrace.ppc.core.bz2 differ

diff --git a/tests/backtrace.ppc.exec.bz2 b/tests/backtrace.ppc.exec.bz2
new file mode 100644 (file)
index 0000000..057c25a
Binary files /dev/null and b/tests/backtrace.ppc.exec.bz2 differ

diff --git a/tests/run-backtrace-core-ppc.sh b/tests/run-backtrace-core-ppc.sh
new file mode 100755 (executable)
index 0000000..65c9279
--- /dev/null
+++ b/tests/run-backtrace-core-ppc.sh
@@ -0,0 +1,20 @@
+#! /bin/bash
+# Copyright (C) 2013 Red Hat, Inc.
+# This file is part of elfutils.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# elfutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+. $srcdir/backtrace-subr.sh
+
+check_core ppc