Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-10 22:09:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 766579 - Part 3: Follow up fix. r=dbaron

Browse Source
This commit is contained in:
Benoit Girard 2012-07-10 17:39:10 -04:00
parent 3fc748b074
commit 6640c590c3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xpcom/base/nsStackWalk.cpp
View File

@ -508,6 +508,9 @@ NS_StackWalk(NS_WalkStackCallback aCallback, PRUint32 aSkipFrames,
data.pcs = (void**) _alloca(data.pc_count * sizeof(void*));
data.pc_size = data.pc_count;
data.pc_count = 0;
data.sps = (void**) _alloca(data.sp_count * sizeof(void*));
data.sp_size = data.sp_count;
data.sp_count = 0;
WalkStackMain64(&data);
}
} else {
@ -545,9 +548,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, PRUint32 aSkipFrames,
for (PRUint32 i = 0; i < data.pc_count; ++i)
(*aCallback)(data.pcs[i], data.sps[i], aClosure);
if (data.sp_size > ArrayLength(local_sps))
free(data.sps);
return NS_OK;
}
@ -1099,8 +1099,10 @@ FramePointerStackWalk(NS_WalkStackCallback aCallback, PRUint32 aSkipFrames,
#if (defined(__ppc__) && defined(XP_MACOSX)) || defined(__powerpc64__)
// ppc mac or powerpc64 linux
void *pc = *(bp+2);
bp += 3;
#else // i386 or powerpc32 linux
void *pc = *(bp+1);
bp += 2;
#endif
if (IsCriticalAddress(pc)) {
printf("Aborting stack trace, PC is critical\n");
@ -1111,7 +1113,7 @@ FramePointerStackWalk(NS_WalkStackCallback aCallback, PRUint32 aSkipFrames,
// it called. We can't know the exact location of the SP
// but this should be sufficient for our use the SP
// to order elements on the stack.
(*aCallback)(pc, (bp), aClosure);
(*aCallback)(pc, bp, aClosure);
}
bp = next;
}
@ -1168,7 +1170,7 @@ unwind_callback (struct _Unwind_Context *context, void *closure)
{
unwind_info *info = static_cast<unwind_info *>(closure);
void *pc = reinterpret_cast<void *>(_Unwind_GetIP(context));
// TODO Use something like 'unw_get_reg(&cursor, UNW_REG_SP, &sp)' to get sp
// TODO Use something like '_Unwind_GetGR()' to get the stack pointer.
if (IsCriticalAddress(pc)) {
printf("Aborting stack trace, PC is critical\n");
/* We just want to stop the walk, so any error code will do.