summaryrefslogtreecommitdiffstats
path: root/src/core/arm/unicorn/arm_unicorn.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-25 03:43:32 +0200
committerLioncash <mathew1800@gmail.com>2018-08-25 03:50:39 +0200
commit43e0d865faa932b980580a79a87d5ea464e9545c (patch)
treeb4f06db70fe68a3edffc29e9373b9d98b8e35306 /src/core/arm/unicorn/arm_unicorn.cpp
parentPort #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" (#1142) (diff)
downloadyuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar
yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar.gz
yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar.bz2
yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar.lz
yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar.xz
yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.tar.zst
yuzu-43e0d865faa932b980580a79a87d5ea464e9545c.zip
Diffstat (limited to 'src/core/arm/unicorn/arm_unicorn.cpp')
-rw-r--r--src/core/arm/unicorn/arm_unicorn.cpp8
1 files changed, 6 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