diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-07-17 03:42:16 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 03:42:16 -0300 |
| commit | c3218c110fcdd25c2dfb3847ec86e09eed62457c (patch) | |
| tree | d224f1c5d92cfd0e404f14613d764fc7de67c4e9 | |
| parent | b56e7f870add41d0300745342d24315e8fa3f881 (diff) | |
| parent | 093e5440e202931402129acabcb73426079552a8 (diff) | |
Merge pull request #2726 from lioncash/accessmainline-128
core: Remove CurrentArmInterface() global accessor
| -rw-r--r-- | src/core/arm/unicorn/arm_unicorn.cpp | 9 | ||||
| -rw-r--r-- | src/core/core.h | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index b0ee7821a4..97d5c2a8ad 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp @@ -50,11 +50,14 @@ static void CodeHook(uc_engine* uc, uint64_t address, uint32_t size, void* user_ static bool UnmappedMemoryHook(uc_engine* uc, uc_mem_type type, u64 addr, int size, u64 value, void* user_data) { + auto* const system = static_cast<System*>(user_data); + ARM_Interface::ThreadContext ctx{}; - Core::CurrentArmInterface().SaveContext(ctx); + system->CurrentArmInterface().SaveContext(ctx); ASSERT_MSG(false, "Attempted to read from unmapped memory: 0x{:X}, pc=0x{:X}, lr=0x{:X}", addr, ctx.pc, ctx.cpu_registers[30]); - return {}; + + return false; } ARM_Unicorn::ARM_Unicorn(System& system) : system{system} { @@ -65,7 +68,7 @@ ARM_Unicorn::ARM_Unicorn(System& system) : system{system} { uc_hook hook{}; CHECKED(uc_hook_add(uc, &hook, UC_HOOK_INTR, (void*)InterruptHook, this, 0, -1)); - CHECKED(uc_hook_add(uc, &hook, UC_HOOK_MEM_INVALID, (void*)UnmappedMemoryHook, this, 0, -1)); + CHECKED(uc_hook_add(uc, &hook, UC_HOOK_MEM_INVALID, (void*)UnmappedMemoryHook, &system, 0, -1)); if (GDBStub::IsServerEnabled()) { CHECKED(uc_hook_add(uc, &hook, UC_HOOK_CODE, (void*)CodeHook, this, 0, -1)); last_bkpt_hit = false; diff --git a/src/core/core.h b/src/core/core.h index 11e73278ef..8ebb385ac9 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -327,10 +327,6 @@ private: static System s_instance; }; -inline ARM_Interface& CurrentArmInterface() { - return System::GetInstance().CurrentArmInterface(); -} - inline Kernel::Process* CurrentProcess() { return System::GetInstance().CurrentProcess(); } |