diff options
Diffstat (limited to 'src/core/arm/unicorn')
-rw-r--r-- | src/core/arm/unicorn/arm_unicorn.cpp | 8 | ||||
-rw-r--r-- | src/core/arm/unicorn/arm_unicorn.h | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index 6bc349460..307f12198 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp @@ -11,6 +11,8 @@ #include "core/core_timing.h" #include "core/hle/kernel/svc.h" +namespace Core { + // Load Unicorn DLL once on Windows using RAII #ifdef _MSC_VER #include <unicorn_dynload.h> @@ -211,7 +213,7 @@ void ARM_Unicorn::ExecuteInstructions(int num_instructions) { } } -void ARM_Unicorn::SaveContext(ARM_Interface::ThreadContext& ctx) { +void ARM_Unicorn::SaveContext(ThreadContext& ctx) { int uregs[32]; void* tregs[32]; @@ -238,7 +240,7 @@ void ARM_Unicorn::SaveContext(ARM_Interface::ThreadContext& ctx) { CHECKED(uc_reg_read_batch(uc, uregs, tregs, 32)); } -void ARM_Unicorn::LoadContext(const ARM_Interface::ThreadContext& ctx) { +void ARM_Unicorn::LoadContext(const ThreadContext& ctx) { int uregs[32]; void* tregs[32]; @@ -277,3 +279,5 @@ void ARM_Unicorn::RecordBreak(GDBStub::BreakpointAddress bkpt) { last_bkpt = bkpt; last_bkpt_hit = true; } + +} // namespace Core diff --git a/src/core/arm/unicorn/arm_unicorn.h b/src/core/arm/unicorn/arm_unicorn.h index af7943352..bd6b2f723 100644 --- a/src/core/arm/unicorn/arm_unicorn.h +++ b/src/core/arm/unicorn/arm_unicorn.h @@ -9,6 +9,8 @@ #include "core/arm/arm_interface.h" #include "core/gdbstub/gdbstub.h" +namespace Core { + class ARM_Unicorn final : public ARM_Interface { public: ARM_Unicorn(); @@ -46,3 +48,5 @@ private: GDBStub::BreakpointAddress last_bkpt{}; bool last_bkpt_hit; }; + +} // namespace Core |