summaryrefslogtreecommitdiff
path: root/src/core/arm
diff options
context:
space:
mode:
authorGravatar bunnei2020-03-26 20:00:30 -0400
committerGravatar bunnei2020-04-17 00:59:28 -0400
commit82d457af3760f2208b31d4a99bb2e1f264cc1dfe (patch)
tree6e049d0a0f8ae1763aa9abea8600e07d8a37b409 /src/core/arm
parentexternals: Update to latest dynarmic. (diff)
downloadyuzu-82d457af3760f2208b31d4a99bb2e1f264cc1dfe.tar.gz
yuzu-82d457af3760f2208b31d4a99bb2e1f264cc1dfe.tar.xz
yuzu-82d457af3760f2208b31d4a99bb2e1f264cc1dfe.zip
core: kernel: Move SVC to its own namesapce.
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_32.cpp2
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_64.cpp2
-rw-r--r--src/core/arm/unicorn/arm_unicorn.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index 187a972ac..9bc86e3b9 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -67,7 +67,7 @@ public:
67 } 67 }
68 68
69 void CallSVC(u32 swi) override { 69 void CallSVC(u32 swi) override {
70 Kernel::CallSVC(parent.system, swi); 70 Kernel::Svc::Call(parent.system, swi);
71 } 71 }
72 72
73 void AddTicks(u64 ticks) override { 73 void AddTicks(u64 ticks) override {
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
index a53a58ba0..bcbaac57f 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
@@ -103,7 +103,7 @@ public:
103 } 103 }
104 104
105 void CallSVC(u32 swi) override { 105 void CallSVC(u32 swi) override {
106 Kernel::CallSVC(parent.system, swi); 106 Kernel::Svc::Call(parent.system, swi);
107 } 107 }
108 108
109 void AddTicks(u64 ticks) override { 109 void AddTicks(u64 ticks) override {
diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp
index 8a9800a96..d189efb63 100644
--- a/src/core/arm/unicorn/arm_unicorn.cpp
+++ b/src/core/arm/unicorn/arm_unicorn.cpp
@@ -266,7 +266,7 @@ void ARM_Unicorn::InterruptHook(uc_engine* uc, u32 int_no, void* user_data) {
266 266
267 switch (ec) { 267 switch (ec) {
268 case 0x15: // SVC 268 case 0x15: // SVC
269 Kernel::CallSVC(arm_instance->system, iss); 269 Kernel::Svc::Call(arm_instance->system, iss);
270 break; 270 break;
271 } 271 }
272} 272}