Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d73d91c4 authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Merge "Skip guest register getting on arm32." into main am: 88318e37 

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



Change-Id: I54b832e5c5d9b400e43b3810830e73fb601a6ba8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 303bf014 88318e37

debuggerd/crash_dump.cpp

+2 −4
Original line number Original line Diff line number Diff line
@@ -451,10 +451,8 @@ static bool GetGuestRegistersFromCrashedProcess(pid_t tid, NativeBridgeGuestRegs 
    return false;

    return false;

  }

  }

#elif defined(__arm__)

#elif defined(__arm__)

  if (ptrace(PTRACE_GET_THREAD_AREA, tid, nullptr, &base) == 0) {

  // Arm doesn't support any guest architectures yet.

    PLOG(ERROR) << "failed to get thread area for thread " << tid;

  return false;

  return false;

  }

#elif defined(__i386__)

#elif defined(__i386__)

  struct user_regs_struct regs;

  struct user_regs_struct regs;

  struct iovec pt_iov = {.iov_base = &regs, .iov_len = sizeof(regs)};

  struct iovec pt_iov = {.iov_base = &regs, .iov_len = sizeof(regs)};