commit 61749a123ebbdd7c2c9c9d0b0ad627f34e4b7159
author Sijie Chen <sijiec@google.com> Fri May 24 19:08:31 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 24 19:08:31 2024 +0000
tree 215307a55b25c864a50113a73bdd36c42688752a
parent 1e4cf5be94252609f885a59f8c86293f975cb5f4
parent f11349ef4da6f70463b4fd183451e3131cfe015b

Merge "[Berberis][CrashReporting] Add riscv case for thread local retrieve" into main am: f11349ef4d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3097682

Change-Id: I29caab646074e2fd3cd0c34af9f026065e56b0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

debuggerd/crash_dump.cpp

diff --git a/debuggerd/crash_dump.cpp b/debuggerd/crash_dump.cpp
index 77d4a07..1c1fb8a 100644
--- a/debuggerd/crash_dump.cpp
+++ b/debuggerd/crash_dump.cpp
@@ -449,7 +449,16 @@
 
   if (ptrace(PTRACE_GETREGSET, tid, NT_ARM_TLS, &pt_iov) != 0) {
     PLOG(ERROR) << "failed to read thread register for thread " << tid;
+    return false;
   }
+#elif defined(__riscv)
+  struct user_regs_struct regs;
+  struct iovec pt_iov = {.iov_base = &regs, .iov_len = sizeof(regs)};
+  if (ptrace(PTRACE_GETREGSET, tid, NT_PRSTATUS, &pt_iov) != 0) {
+    PLOG(ERROR) << "failed to read thread register for thread " << tid;
+    return false;
+  }
+  base = reinterpret_cast<uintptr_t>(regs.tp);
 #else
   // TODO(b/339287219): Add case for Riscv host.
   return false;