FEX-Emu/FEX
1
0
Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2025-02-17 05:18:49 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #606 from duck-37/sigsegv-fail-tests

Browse Source 
Have tests that throw a non-HLT SIGSEGV fail
This commit is contained in:
Ryan Houdek 2021-01-06 15:28:38 -08:00 committed by GitHub
commit ee8dfb8fc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
External/FEXCore/Source/Interface/Context/Context.cpp vendored
View File

@ -99,6 +99,10 @@ namespace FEXCore::Context {
CTX->HandleCallback(RIP);
}
void RegisterHostSignalHandler(FEXCore::Context::Context *CTX, int Signal, HostSignalDelegatorFunction Func) {
CTX->RegisterHostSignalHandler(Signal, Func);
}
void RegisterFrontendHostSignalHandler(FEXCore::Context::Context *CTX, int Signal, HostSignalDelegatorFunction Func) {
CTX->RegisterFrontendHostSignalHandler(Signal, Func);
}

1
External/FEXCore/Source/Interface/Context/Context.h vendored
View File

@ -117,6 +117,7 @@ namespace FEXCore::Context {
void StartGdbServer();
void StopGdbServer();
void HandleCallback(uint64_t RIP);
void RegisterHostSignalHandler(int Signal, HostSignalDelegatorFunction Func);
void RegisterFrontendHostSignalHandler(int Signal, HostSignalDelegatorFunction Func);
static void RemoveCodeEntry(FEXCore::Core::InternalThreadState *Thread, uint64_t GuestRIP);

4
External/FEXCore/Source/Interface/Core/Core.cpp vendored
View File

@ -286,6 +286,10 @@ namespace FEXCore::Context {
Thread->CPUBackend->CallbackPtr(Thread, RIP);
}
void Context::RegisterHostSignalHandler(int Signal, HostSignalDelegatorFunction Func) {
SignalDelegation->RegisterHostSignalHandler(Signal, Func);
}
void Context::RegisterFrontendHostSignalHandler(int Signal, HostSignalDelegatorFunction Func) {
SignalDelegation->RegisterFrontendHostSignalHandler(Signal, Func);
}

1
External/FEXCore/include/FEXCore/Core/Context.h vendored
View File

@ -218,6 +218,7 @@ namespace FEXCore::Context {
void HandleCallback(FEXCore::Context::Context *CTX, uint64_t RIP);
void RegisterHostSignalHandler(FEXCore::Context::Context *CTX, int Signal, HostSignalDelegatorFunction Func);
void RegisterFrontendHostSignalHandler(FEXCore::Context::Context *CTX, int Signal, HostSignalDelegatorFunction Func);
FEXCore::Core::InternalThreadState* CreateThread(FEXCore::Context::Context *CTX, FEXCore::Core::CPUState *NewThreadState, uint64_t ParentTID);

4
Source/CommonCore/HostFactory.cpp
View File

@ -58,7 +58,7 @@ namespace HostFactory {
, CTX {CTX}
, ThreadState {Thread}
, IsFallback {Fallback} {
FEXCore::Context::RegisterFrontendHostSignalHandler(CTX, SIGSEGV,
FEXCore::Context::RegisterHostSignalHandler(CTX, SIGSEGV,
[](FEXCore::Core::InternalThreadState *Thread, int Signal, void *info, void *ucontext) -> bool {
auto InternalThread = reinterpret_cast<FEXCore::Core::InternalThreadState*>(Thread);
HostCore *Core = reinterpret_cast<HostCore*>(InternalThread->CPUBackend.get());
@ -66,7 +66,7 @@ namespace HostFactory {
}
);
FEXCore::Context::RegisterFrontendHostSignalHandler(CTX, 63, [](FEXCore::Core::InternalThreadState *Thread, int Signal, void *info, void *ucontext) -> bool {
FEXCore::Context::RegisterHostSignalHandler(CTX, 63, [](FEXCore::Core::InternalThreadState *Thread, int Signal, void *info, void *ucontext) -> bool {
return true;
});
}

11
Source/Tests/TestHarnessRunner.cpp
View File

@ -101,6 +101,12 @@ int main(int argc, char **argv, char **const envp) {
std::unique_ptr<FEX::HLE::SignalDelegator> SignalDelegation = std::make_unique<FEX::HLE::SignalDelegator>();
std::unique_ptr<FEXCore::HLE::SyscallHandler> SyscallHandler{FEX::HLE::CreateHandler(Loader.Is64BitMode() ? FEXCore::Context::OperatingMode::MODE_64BIT : FEXCore::Context::OperatingMode::MODE_32BIT, CTX, SignalDelegation.get())};
bool DidFault = false;
SignalDelegation->RegisterFrontendHostSignalHandler(SIGSEGV, [&DidFault](FEXCore::Core::InternalThreadState *Thread, int Signal, void *info, void *ucontext) {
DidFault = true;
return false;
});
FEXCore::Context::SetSignalDelegator(CTX, SignalDelegation.get());
FEXCore::Context::SetSyscallHandler(CTX, SyscallHandler.get());
bool Result1 = FEXCore::Context::InitCore(CTX, &Loader);
@ -113,9 +119,10 @@ int main(int argc, char **argv, char **const envp) {
// Just re-use compare state. It also checks against the expected values in config.
FEXCore::Core::CPUState State;
FEXCore::Context::GetCPUState(CTX, &State);
bool Passed = Loader.CompareStates(&State, nullptr);
bool Passed = !DidFault && Loader.CompareStates(&State, nullptr);
LogMan::Msg::I("Passed? %s\n", Passed ? "Yes" : "No");
LogMan::Msg::I("Faulted? %s", DidFault ? "Yes" : "No");
LogMan::Msg::I("Passed? %s", Passed ? "Yes" : "No");
FEXCore::Context::DestroyContext(CTX);