7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-04-19 08:25:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Merge 09d4f9f51b into dcd3244944

Browse source
This commit is contained in:
Jasmine 2025-04-03 00:24:16 +00:00 • committed by GitHub
commit 41537e8e84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 4 deletions

18
loader/src/platform/ios/crashlog.mm
View file

@ -164,9 +164,15 @@ static Mod* modFromAddress(void const* addr) {
static std::string getInfo(void* address, Mod* faultyMod) {
std::stringstream stream;
stream << "Faulty Lib: " << getImageName(imageFromAddress(address)) << "\n";
auto image = imageFromAddress(address);
auto imageName = getImageName(image);
stream << "Faulty Lib: " << imageName << "\n";
stream << "Faulty Mod: " << (faultyMod ? faultyMod->getID() : "<Unknown>") << "\n";
stream << "Instruction Address: " << address << "\n";
stream << "Instruction Address: " << address;
if (image) {
stream << " (" << imageName << " + " << std::showbase << std::hex << ((uintptr_t)address - (uintptr_t)image->imageLoadAddress) << std::dec << ")";
}
stream << "\n";
stream << "Signal Code: " << std::hex << s_signal << " (" << getSignalCodeString() << ")" << std::dec << "\n";
return stream.str();
}
@ -279,8 +285,12 @@ static std::string getStacktrace() {
free(demangle);
}
stacktrace << "- " << binary;
stacktrace << " @ " << std::showbase << std::hex << address << std::dec;
if (auto image = imageFromAddress(reinterpret_cast<void*>(address))) {
stacktrace << "- " << getImageName(image) << " + " << std::showbase << std::hex << (address - (uintptr_t)image->imageLoadAddress) << std::dec;
}
else {
stacktrace << "- " << binary << " @ " << std::showbase << std::hex << address << std::dec;
}
stacktrace << " (" << function << " + " << offset << ")\n";
stacktrace << "- " << function << "\n";
}