Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / breakpad / src / client / linux / minidump_writer / linux_ptrace_dumper.cc

diff --git a/src/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc b/src/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
index 8b96037..5ab59c2 100644 (file)
--- a/src/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+++ b/src/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
@@ -47,6 +47,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ptrace.h>
+#include <sys/uio.h>
 #include <sys/wait.h>
 
 #if defined(__i386)
@@ -186,6 +187,20 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
   if (info->ppid == -1 || info->tgid == -1)
     return false;
 
+#ifdef PTRACE_GETREGSET
+  struct iovec io;
+  io.iov_base = &info->regs;
+  io.iov_len = sizeof(info->regs);
+  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+    return false;
+  }
+
+  io.iov_base = &info->fpregs;
+  io.iov_len = sizeof(info->fpregs);
+  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+    return false;
+  }
+#else
   if (sys_ptrace(PTRACE_GETREGS, tid, NULL, &info->regs) == -1) {
     return false;
   }
@@ -193,6 +208,7 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
   if (sys_ptrace(PTRACE_GETFPREGS, tid, NULL, &info->fpregs) == -1) {
     return false;
   }
+#endif
 
 #if defined(__i386)
 #if !defined(bit_FXSAVE)  // e.g. Clang
@@ -241,6 +257,8 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
   my_memcpy(&stack_pointer, &info->regs.rsp, sizeof(info->regs.rsp));
 #elif defined(__ARM_EABI__)
   my_memcpy(&stack_pointer, &info->regs.ARM_sp, sizeof(info->regs.ARM_sp));
+#elif defined(__aarch64__)
+  my_memcpy(&stack_pointer, &info->regs.sp, sizeof(info->regs.sp));
 #elif defined(__mips__)
   stack_pointer =
       reinterpret_cast<uint8_t*>(info->regs.regs[MD_CONTEXT_MIPS_REG_SP]);