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

fix(libSceSystemService): run guest exit handlers first on LoadExec exit

This commit is contained in:
David-cmrg 2026-10-13 03:07:29 +02:00
parent 77b9f7270c
commit 9f9c351f54
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/libs/prx/libSceSystemService/Export.cpp
View File

@ -192,10 +192,7 @@ extern "C" {
int APS5_VABI sceSystemServiceLoadExec(const char* path, const char* const* arguments) {
if (!path || !*path) return SYSTEM_SERVICE_ERROR_PARAMETER;
if (std::strcmp(path, "exit") == 0) {
LibcRunShutdown_nid_postfix();
std::exit(0);
}
if (std::strcmp(path, "exit") == 0) LibcExit_nid_no_patch(0);
auto launch = PrepareLaunch(path, arguments);
LibcRunShutdown_nid_postfix();
std::fflush(nullptr);

6
core/libs/tests/GuestSystemExit.cpp
View File

@ -18,6 +18,7 @@
#include <unistd.h>
#endif
extern "C" int APS5_VABI sceSystemServiceLoadExec(const char*, const char* const*);
extern "C" int APS5_VABI __cxa_atexit_nid_postfix(void (APS5_VABI *func)(void*), void* arg, void* dsoHandle);
extern "C" void APS5_VABI _Exit_nid_postfix(int);
extern "C" void APS5_VABI catchReturnFromMain_nid_postfix(int);
using GuestQuickExitCallback = void (APS5_VABI*)();
@ -25,9 +26,11 @@ extern "C" int APS5_VABI at_quick_exit_nid_postfix(GuestQuickExitCallback);
extern "C" void APS5_VABI quick_exit_nid_postfix(int);
namespace {
bool cleaned = false;
bool finalized = false;
void Cleanup() { cleaned = true; }
void APS5_VABI Finalize(void*) { finalized = true; }
void VerifyExit() {
if (!cleaned) std::_Exit(1);
if (!cleaned || !finalized) std::_Exit(1);
std::puts("Guest shutdown and atexit completed");
}
int quickOrder = 0;
@ -164,6 +167,7 @@ int main(int argc, char** argv) {
}
if (argc > 1) {
LibcRegisterShutdown_nid_postfix(Cleanup);
Require(__cxa_atexit_nid_postfix(Finalize, nullptr, nullptr) == 0);
Require(std::atexit(VerifyExit) == 0);
sceSystemServiceLoadExec("exit", nullptr);
return 2;