Skip to content

Do stack walk based on linked register when pc is null in KSCrash #430

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

Merged
chzhij5 merged 1 commit into from
Dec 9, 2019
Merged

Do stack walk based on linked register when pc is null in KSCrash #430

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
13 changes: 12 additions & 1 deletion ...rix-iOS/Matrix/WCCrashBlockMonitor/KSCrash/Recording/Tools/KSStackCursor_MachineContext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,9 @@ static bool advanceCursor(KSStackCursor *cursor)
return false;
}

if(context->instructionAddress == 0)
if(context->instructionAddress == 0 && cursor->state.currentDepth == 0)
{
// Link register, if available, is the second address in the trace.
context->instructionAddress = kscpu_instructionAddress(context->machineContext);
if(context->instructionAddress == 0)
{
Expand All @@ -124,6 +125,16 @@ static bool advanceCursor(KSStackCursor *cursor)
nextAddress = context->instructionAddress;
goto successfulExit;
}

if (context->linkRegister == 0 && !context->isPastFramePointer)
{
context->linkRegister = kscpu_linkRegister(context->machineContext);
if (context->linkRegister != 0)
{
nextAddress = context->linkRegister;
goto successfulExit;
}
}

if(context->currentFrame.previous == NULL)
{
Expand Down