AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 01:55:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Logger_Abort missing backtrace on x86 with MSVC due to my mistake

Browse Source
This commit is contained in:
UnknownShadow200 2021-03-30 21:46:51 +11:00
parent 0daa115ed0
commit 2f1445b7c7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Logger.c
View File

@ -742,13 +742,7 @@ void __attribute__((optimize("O0"))) Logger_Abort2(cc_result result, const char*
void Logger_Abort2(cc_result result, const char* raw_msg) { void Logger_Abort2(cc_result result, const char* raw_msg) {
#endif #endif
CONTEXT ctx; CONTEXT ctx;
#ifndef _M_IX86 #if _M_IX86 && __GNUC__
/* This method is guaranteed to exist on 64 bit windows. */
/* NOTE: This is missing in 32 bit Windows 2000 however, */
/* so an alternative is provided for MinGW below so that */
/* the game can cross-compiled for Windows 98 / 2000 */
RtlCaptureContext(&ctx);
#elif __GNUC__
/* Stack frame layout on x86: */ /* Stack frame layout on x86: */
/* [ebp] is previous frame's EBP */ /* [ebp] is previous frame's EBP */
/* [ebp+4] is previous frame's EIP (return address) */ /* [ebp+4] is previous frame's EIP (return address) */
@ -765,6 +759,12 @@ void Logger_Abort2(cc_result result, const char* raw_msg) {
: "eax", "memory" : "eax", "memory"
); );
ctx.ContextFlags = CONTEXT_CONTROL; ctx.ContextFlags = CONTEXT_CONTROL;
#else
/* This method is guaranteed to exist on 64 bit windows. */
/* NOTE: This is missing in 32 bit Windows 2000 however, */
/* so an alternative is provided for MinGW above so that */
/* the game can be cross-compiled for Windows 98 / 2000 */
RtlCaptureContext(&ctx);
#endif #endif
AbortCommon(result, raw_msg, &ctx); AbortCommon(result, raw_msg, &ctx);
} }