Skip to content

Fix ucontext for powerpc darwin #359

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix ucontext for powerpc darwin #359

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
17 changes: 15 additions & 2 deletions backward.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,8 @@ class StackTraceImpl<system_tag::current_tag> : public StackTraceImplHolder {
ctx.uc_mcontext.fault_address = uctx->uc_mcontext.fault_address;
_stacktrace[index] = reinterpret_cast<void *>(ctx.uc_mcontext.pc);
++index;
#elif defined(__APPLE__) && defined(__x86_64__)
#elif defined(__APPLE__)
#if defined(__x86_64__)
unw_getcontext(&ctx);
// OS X's implementation of libunwind uses its own context object
// so we need to convert the passed context to libunwind's format
Expand Down Expand Up @@ -1037,7 +1038,7 @@ class StackTraceImpl<system_tag::current_tag> : public StackTraceImplHolder {
}
_stacktrace[index] = reinterpret_cast<void *>(ctx.data[16]);
++index;
#elif defined(__APPLE__)
#elif defined(__i386__)
unw_getcontext(&ctx)
// TODO: Convert the ucontext_t to libunwind's unw_context_t like
// we do in 64 bits
Expand All @@ -1048,6 +1049,18 @@ class StackTraceImpl<system_tag::current_tag> : public StackTraceImplHolder {
_stacktrace[index] =
reinterpret_cast<void *>(ctx.uc_mcontext->__ss.__eip);
++index;
#else // PowerPC
unw_getcontext(&ctx)
// TODO: Convert the ucontext_t to libunwind's unw_context_t like
// we do in x86_64 case.
if (ctx.uc_mcontext->__ss.__srr0 ==
reinterpret_cast<greg_t>(error_addr())) {
ctx.uc_mcontext->__ss.__srr0 = ctx.uc_mcontext->__ss.__r1;
}
_stacktrace[index] =
reinterpret_cast<void *>(ctx.uc_mcontext->__ss.__srr0);
++index;
#endif
#endif
}

Expand Down