Skip to content

fix(mac): use arm64 thread state accessors on new Apple SDKs #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhaowq32 wants to merge 1 commit into
base: handler
Choose a base branch
from
Open

fix(mac): use arm64 thread state accessors on new Apple SDKs #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/client/mac/handler/minidump_generator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,17 @@ bool MinidumpGenerator::GetThreadContext(mach_port_t thread_id, breakpad_ucontex
GetContextARM64(state, &arm64_ctx);

std::copy_n(std::begin(arm64_ctx.iregs), std::size(context->uc_mcontext->__ss.__x), std::begin(context->uc_mcontext->__ss.__x));
#if defined(__darwin_arm_thread_state64_set_fp) && defined(__darwin_arm_thread_state64_set_lr_fptr) && defined(__darwin_arm_thread_state64_set_sp) && defined(__darwin_arm_thread_state64_set_pc_fptr)
__darwin_arm_thread_state64_set_fp(context->uc_mcontext->__ss, arm64_ctx.iregs[MD_CONTEXT_ARM64_REG_FP]);
__darwin_arm_thread_state64_set_lr_fptr(context->uc_mcontext->__ss, reinterpret_cast<void *>(arm64_ctx.iregs[MD_CONTEXT_ARM64_REG_LR]));
__darwin_arm_thread_state64_set_sp(context->uc_mcontext->__ss, arm64_ctx.iregs[MD_CONTEXT_ARM64_REG_SP]);
__darwin_arm_thread_state64_set_pc_fptr(context->uc_mcontext->__ss, reinterpret_cast<void *>(arm64_ctx.iregs[MD_CONTEXT_ARM64_REG_PC]));
#else
context->uc_mcontext->__ss.__fp = arm64_ctx.iregs[MD_CONTEXT_ARM64_REG_FP];
context->uc_mcontext->__ss.__lr = arm64_ctx.iregs[MD_CONTEXT_ARM64_REG_LR];
context->uc_mcontext->__ss.__sp = arm64_ctx.iregs[MD_CONTEXT_ARM64_REG_SP];
context->uc_mcontext->__ss.__pc = arm64_ctx.iregs[MD_CONTEXT_ARM64_REG_PC];
#endif
context->uc_mcontext->__ss.__cpsr = arm64_ctx.cpsr;
#endif
return true;
Expand Down