Skip to content

Commit

Permalink
PageFaultHandler: Warning fix
Browse files Browse the repository at this point in the history
  • Loading branch information
stenzek committed Dec 22, 2024
1 parent 448009f commit 7f1ebd3
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/util/page_fault_handler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@
#include <mach/task.h>
#endif

namespace PageFaultHandler {
static std::recursive_mutex s_exception_handler_mutex;
static bool s_in_exception_handler = false;
static bool s_installed = false;
} // namespace PageFaultHandler

#if defined(CPU_ARCH_ARM64)
[[maybe_unused]] static bool IsStoreInstruction(const void* ptr)
{
Expand Down Expand Up @@ -85,7 +79,11 @@ static bool s_installed = false;

namespace PageFaultHandler {
static LONG ExceptionHandler(PEXCEPTION_POINTERS exi);
}

static std::recursive_mutex s_exception_handler_mutex;
static bool s_in_exception_handler = false;
static bool s_installed = false;
} // namespace PageFaultHandler

LONG PageFaultHandler::ExceptionHandler(PEXCEPTION_POINTERS exi)
{
Expand Down Expand Up @@ -140,6 +138,10 @@ bool PageFaultHandler::Install(Error* error)

namespace PageFaultHandler {
static void SignalHandler(int sig, siginfo_t* info, void* ctx);

static std::recursive_mutex s_exception_handler_mutex;
static bool s_in_exception_handler = false;
static bool s_installed = false;
} // namespace PageFaultHandler

void PageFaultHandler::SignalHandler(int sig, siginfo_t* info, void* ctx)
Expand Down Expand Up @@ -210,7 +212,7 @@ void PageFaultHandler::SignalHandler(int sig, siginfo_t* info, void* ctx)
result = HandlePageFault(exception_pc, exception_address, is_write);
s_in_exception_handler = false;
}

s_exception_handler_mutex.unlock();

// Resumes execution right where we left off (re-executes instruction that caused the SIGSEGV).
Expand Down

0 comments on commit 7f1ebd3

Please sign in to comment.