yyc12345/libcmo21
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix x64 compile error. add arm support in IronPad

Browse Source
This commit is contained in:
yyc12345 2023-10-29 12:36:03 +08:00
parent b402e8db8e
commit 9475e2abc5
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IronPad/IronPad.cpp
View File

@ -127,22 +127,40 @@ namespace IronPad {
// ========== CORE DUMP ========== // ========== CORE DUMP ==========
// prepare frame. setup correct fields // prepare frame. setup correct fields
// references:
// https://github.com/rust-lang/backtrace-rs/blob/9ed25b581cfd2ee60e5a3b9054fd023bf6dced90/src/backtrace/dbghelp.rs
// https://sourceforge.net/p/predef/wiki/Architectures/
DWORD machine_type = 0; DWORD machine_type = 0;
STACKFRAME64 frame; STACKFRAME64 frame;
memset(&frame, 0, sizeof(frame)); memset(&frame, 0, sizeof(frame));
#if defined(_M_IX86) || defined(__i386__) #if defined(_M_IX86) || defined(__i386__)
// x86
machine_type = IMAGE_FILE_MACHINE_I386; machine_type = IMAGE_FILE_MACHINE_I386;
frame.AddrPC.Offset = context->Eip; frame.AddrPC.Offset = context->Eip;
frame.AddrStack.Offset = context->Esp; frame.AddrStack.Offset = context->Esp;
frame.AddrFrame.Offset = context->Ebp; frame.AddrFrame.Offset = context->Ebp;
#elif defined(_M_IX64) || defined(__amd64__) #elif defined(_M_AMD64) || defined(__amd64__)
// amd64
machine_type = IMAGE_FILE_MACHINE_AMD64; machine_type = IMAGE_FILE_MACHINE_AMD64;
frame.AddrPC.Offset = context->Rip; frame.AddrPC.Offset = context->Rip;
frame.AddrStack.Offset = context->Rsp; frame.AddrStack.Offset = context->Rsp;
frame.AddrFrame.Offset = context->Rbp; frame.AddrFrame.Offset = context->Rbp;
#elif defined(_M_ARM) || defined(__arm__)
// arm (32bit)
machine_type = IMAGE_FILE_MACHINE_ARMNT;
frame.AddrPC.Offset = context->Pc;
frame.AddrStack.Offset = context->Sp;
frame.AddrFrame.Offset = context->R11;
#elif defined(_M_ARM64) || defined(__aarch64__)
// arm64
machine_type = IMAGE_FILE_MACHINE_ARM64;
frame.AddrPC.Offset = context->Pc;
frame.AddrStack.Offset = context->Sp;
frame.AddrFrame.Offset = context->DUMMYUNIONNAME.DUMMYSTRUCTNAME.Fp;
#else #else
#error "Unsupported platform" #error "Unsupported platform"
//IA-64 anybody? //IA-64 anybody?
#endif #endif
frame.AddrPC.Mode = AddrModeFlat; frame.AddrPC.Mode = AddrModeFlat;
frame.AddrStack.Mode = AddrModeFlat; frame.AddrStack.Mode = AddrModeFlat;
@ -259,7 +277,7 @@ namespace IronPad {
const char* op = const char* op =
rec->ExceptionInformation[0] == 0 ? "read" : rec->ExceptionInformation[0] == 0 ? "read" :
rec->ExceptionInformation[0] == 1 ? "written" : "executed"; rec->ExceptionInformation[0] == 1 ? "written" : "executed";
fprintf(fs, "The data at memory address 0x%08x could not be %s.\n", fprintf(fs, "The data at memory address 0x%016" PRIxPTR " could not be %s.\n",
rec->ExceptionInformation[1], op); rec->ExceptionInformation[1], op);
} }
} }

2
IronPad/IronPad.hpp
View File

@ -8,7 +8,7 @@
#endif #endif
// Debug IronPad used. Force enable IronPad. // Debug IronPad used. Force enable IronPad.
//#define IRONPAD_ENABLED 1 #define IRONPAD_ENABLED 1
namespace IronPad { namespace IronPad {

2
LibCmo/CK2/ObjImpls/CKMesh.cpp
View File

@ -185,7 +185,7 @@ namespace LibCmo::CK2::ObjImpls {
} }
// calc real consumed size // calc real consumed size
CKDWORD realConsumedSize = rawbuf - static_cast<CKBYTE*>(buf.get()); CKDWORD realConsumedSize = static_cast<CKDWORD>(rawbuf - static_cast<CKBYTE*>(buf.get()));
// assign to reserved length field // assign to reserved length field
// length also include length indicator it self // length also include length indicator it self
*reservedBufDwordSize = realConsumedSize / CKSizeof(CKDWORD); *reservedBufDwordSize = realConsumedSize / CKSizeof(CKDWORD);