7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-23 07:57:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Update macos crashlog to include base and offset

Browse source
This commit is contained in:
altalk23 2023-09-08 16:33:22 +03:00
parent b71ae3f0fd
commit 7816c435c4
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
loader/src/platform/mac/crashlog.mm
View file

@ -251,7 +251,20 @@ static std::string getStacktrace() {
stream >> std::hex >> address >> std::dec; stream >> std::hex >> address >> std::dec;
if (!line.empty()) { if (!line.empty()) {
stacktrace << " - " << std::showbase << std::hex << address << std::dec; // log::debug("address: {}", address);
auto image = imageFromAddress(reinterpret_cast<void*>(address));
// log::debug("image: {}", image);
stacktrace << " - " << std::showbase << std::hex;
if (image) {
auto baseAddress = image->imageLoadAddress;
auto imageName = getImageName(image);
stacktrace << imageName << " + " << (address - (uintptr_t)baseAddress);
}
else {
stacktrace << address;
}
stacktrace << std::dec;
stacktrace << ": " << line << "\n"; stacktrace << ": " << line << "\n";
} }
else { else {
@ -319,14 +332,15 @@ static void handlerThread() {
s_cv.wait(lock, [] { return s_signal != 0; }); s_cv.wait(lock, [] { return s_signal != 0; });
auto signalAddress = reinterpret_cast<void*>(s_context->uc_mcontext->__ss.__rip); auto signalAddress = reinterpret_cast<void*>(s_context->uc_mcontext->__ss.__rip);
Mod* faultyMod = nullptr; // Mod* faultyMod = nullptr;
for (int i = 1; i < s_backtraceSize; ++i) { // for (int i = 1; i < s_backtraceSize; ++i) {
auto mod = modFromAddress(s_backtrace[i]); // auto mod = modFromAddress(s_backtrace[i]);
if (mod != nullptr) { // if (mod != nullptr) {
faultyMod = mod; // faultyMod = mod;
break; // break;
} // }
} // }
Mod* faultyMod = modFromAddress(signalAddress);
auto text = crashlog::writeCrashlog(faultyMod, getInfo(signalAddress, faultyMod), getStacktrace(), getRegisters()); auto text = crashlog::writeCrashlog(faultyMod, getInfo(signalAddress, faultyMod), getStacktrace(), getRegisters());
@ -334,6 +348,8 @@ static void handlerThread() {
s_signal = 0; s_signal = 0;
s_cv.notify_all(); s_cv.notify_all();
log::debug("Notified");
} }
static bool s_lastLaunchCrashed; static bool s_lastLaunchCrashed;