luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stackwalk64 architecture detection

Browse Source
This commit is contained in:
Jeremy 2023-10-04 15:31:59 -04:00
parent 262f024332
commit 4324901cd1
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/unwind/unwind_with_dbghelp.cpp
View File

@ -64,7 +64,7 @@ namespace detail {
STACKFRAME64 frame; STACKFRAME64 frame;
ZeroMemory(&frame, sizeof(STACKFRAME64)); ZeroMemory(&frame, sizeof(STACKFRAME64));
DWORD machine_type; DWORD machine_type;
#ifdef _M_IX86 #if defined(_M_IX86) || defined(__i386__)
machine_type = IMAGE_FILE_MACHINE_I386; machine_type = IMAGE_FILE_MACHINE_I386;
frame.AddrPC.Offset = context.Eip; frame.AddrPC.Offset = context.Eip;
frame.AddrPC.Mode = AddrModeFlat; frame.AddrPC.Mode = AddrModeFlat;
@ -72,7 +72,7 @@ namespace detail {
frame.AddrFrame.Mode = AddrModeFlat; frame.AddrFrame.Mode = AddrModeFlat;
frame.AddrStack.Offset = context.Esp; frame.AddrStack.Offset = context.Esp;
frame.AddrStack.Mode = AddrModeFlat; frame.AddrStack.Mode = AddrModeFlat;
#elif _M_X64 #elif defined(_M_X64) || defined(__x86_64__)
machine_type = IMAGE_FILE_MACHINE_AMD64; machine_type = IMAGE_FILE_MACHINE_AMD64;
frame.AddrPC.Offset = context.Rip; frame.AddrPC.Offset = context.Rip;
frame.AddrPC.Mode = AddrModeFlat; frame.AddrPC.Mode = AddrModeFlat;
@ -80,7 +80,7 @@ namespace detail {
frame.AddrFrame.Mode = AddrModeFlat; frame.AddrFrame.Mode = AddrModeFlat;
frame.AddrStack.Offset = context.Rsp; frame.AddrStack.Offset = context.Rsp;
frame.AddrStack.Mode = AddrModeFlat; frame.AddrStack.Mode = AddrModeFlat;
#elif _M_IA64 #elif defined(_M_IA64) || defined(__aarch64__)
machine_type = IMAGE_FILE_MACHINE_IA64; machine_type = IMAGE_FILE_MACHINE_IA64;
frame.AddrPC.Offset = context.StIIP; frame.AddrPC.Offset = context.StIIP;
frame.AddrPC.Mode = AddrModeFlat; frame.AddrPC.Mode = AddrModeFlat;