AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 02:56:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't bother logging fp and sp for previous stack frames in windows build crash log, this information has never been useful

Browse Source
This commit is contained in:
UnknownShadow200 2019-11-20 19:29:14 +11:00
parent f75e4b7f18
commit c25a45a6b5
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Logger.c
View File

@ -227,10 +227,9 @@ static void Logger_PrintFrame(String* str, cc_uintptr addr, cc_uintptr symAddr,
#if defined CC_BUILD_WEB #if defined CC_BUILD_WEB
void Logger_Backtrace(String* trace, void* ctx) { } void Logger_Backtrace(String* trace, void* ctx) { }
#elif defined CC_BUILD_WIN #elif defined CC_BUILD_WIN
struct StackPointers { cc_uintptr ip, fp, sp; };
struct SymbolAndName { IMAGEHLP_SYMBOL Symbol; char Name[256]; }; struct SymbolAndName { IMAGEHLP_SYMBOL Symbol; char Name[256]; };
static int Logger_GetFrames(CONTEXT* ctx, struct StackPointers* pointers, int max) { static int Logger_GetFrames(CONTEXT* ctx, cc_uintptr* addrs, int max) {
STACKFRAME frame = { 0 }; STACKFRAME frame = { 0 };
frame.AddrPC.Mode = AddrModeFlat; frame.AddrPC.Mode = AddrModeFlat;
frame.AddrFrame.Mode = AddrModeFlat; frame.AddrFrame.Mode = AddrModeFlat;
@ -259,27 +258,24 @@ static int Logger_GetFrames(CONTEXT* ctx, struct StackPointers* pointers, int ma
for (count = 0; count < max; count++) { for (count = 0; count < max; count++) {
if (!StackWalk(type, process, thread, &frame, &copy, NULL, SymFunctionTableAccess, SymGetModuleBase, NULL)) break; if (!StackWalk(type, process, thread, &frame, &copy, NULL, SymFunctionTableAccess, SymGetModuleBase, NULL)) break;
if (!frame.AddrFrame.Offset) break; if (!frame.AddrFrame.Offset) break;
addrs[count] = frame.AddrPC.Offset;
pointers[count].ip = frame.AddrPC.Offset;
pointers[count].fp = frame.AddrFrame.Offset;
pointers[count].sp = frame.AddrStack.Offset;
} }
return count; return count;
} }
void Logger_Backtrace(String* trace, void* ctx) { void Logger_Backtrace(String* trace, void* ctx) {
char strBuffer[512]; String str; char strBuffer[512]; String str;
struct StackPointers pointers[40]; cc_uintptr addrs[40];
int i, frames; int i, frames;
HANDLE process; HANDLE process;
cc_uintptr addr; cc_uintptr addr;
process = GetCurrentProcess(); process = GetCurrentProcess();
SymInitialize(process, NULL, TRUE); SymInitialize(process, NULL, TRUE);
frames = Logger_GetFrames((CONTEXT*)ctx, pointers, 40); frames = Logger_GetFrames((CONTEXT*)ctx, addrs, 40);
for (i = 0; i < frames; i++) { for (i = 0; i < frames; i++) {
addr = pointers[i].ip; addr = addrs[i];
String_InitArray(str, strBuffer); String_InitArray(str, strBuffer);
struct SymbolAndName s = { 0 }; struct SymbolAndName s = { 0 };
@ -294,9 +290,6 @@ void Logger_Backtrace(String* trace, void* ctx) {
Logger_PrintFrame(&str, addr, s.Symbol.Address, s.Symbol.Name, m.ModuleName); Logger_PrintFrame(&str, addr, s.Symbol.Address, s.Symbol.Name, m.ModuleName);
String_AppendString(trace, &str); String_AppendString(trace, &str);
/* frame and stack address */
String_Format2(&str, " fp: %x, sp: %x\r\n", &pointers[i].fp, &pointers[i].sp);
/* This function only works for .pdb debug info */ /* This function only works for .pdb debug info */
/* This function is also missing on Windows98 + KernelEX */ /* This function is also missing on Windows98 + KernelEX */
#if _MSC_VER #if _MSC_VER