shifathosn
/
AnyPS5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3520 from MarcZX100/codex/gcc13-unwind-3459 

fix(libc): resume host foreign exceptions with host unwinder
This commit is contained in:
Dean 2026-10-12 08:37:59 +13:00 committed by GitHub
parent a11c8f7f70 b316c9885d
commit 4be9c25519
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/libs/prx/libc/src/exception/Unwind.cpp
View File

@ -1,7 +1,11 @@
#include "prx/libc/include/exceptions/Unwind.hpp"
#include "prx/libc/include/exceptions/Runtime.hpp"
#include "prx/libc/include/specifics/linux/ElfTypes.hpp"
#include "prx/libc/src/specifics/x86_64/RegisterContext.cpp"
#if defined(__linux__)
#include <dlfcn.h>
#endif
#ifdef _WIN32
#include <windows.h>
#include <algorithm>
@ -502,6 +506,14 @@ _Unwind_Reason_Code APS5_VABI _Unwind_RaiseException_nid_postfix(_Unwind_Excepti
}
[[noreturn]] void APS5_VABI _Unwind_Resume_nid_postfix(_Unwind_Exception* exception) {
#if defined(__linux__)
if (!LibcException::Native(exception->exception_class) && !exception->private_1) {
using Resume = void (*)(_Unwind_Exception*);
const auto resume = reinterpret_cast<Resume>(dlsym(RTLD_NEXT, "_Unwind_Resume"));
if (!resume) std::abort();
resume(exception);
}
#endif
_Unwind_Context context;
LibcCaptureRegisters(context.registers);
if (!LibcUnwind::Step(context)) std::abort();