octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: kernel: Move SVC to its own namesapce.

Browse Source
This commit is contained in:
bunnei
2020-03-26 20:00:30 -04:00
parent b160804db0
commit 82d457af37
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/arm/dynarmic/arm_dynarmic_32.cpp
View File

@@ -67,7 +67,7 @@ public:
} }
void CallSVC(u32 swi) override { void CallSVC(u32 swi) override {
Kernel::CallSVC(parent.system, swi); Kernel::Svc::Call(parent.system, swi);
} }
void AddTicks(u64 ticks) override { void AddTicks(u64 ticks) override {

2
src/core/arm/dynarmic/arm_dynarmic_64.cpp
View File

@@ -103,7 +103,7 @@ public:
} }
void CallSVC(u32 swi) override { void CallSVC(u32 swi) override {
Kernel::CallSVC(parent.system, swi); Kernel::Svc::Call(parent.system, swi);
} }
void AddTicks(u64 ticks) override { void AddTicks(u64 ticks) override {

2
src/core/arm/unicorn/arm_unicorn.cpp
View File

@@ -266,7 +266,7 @@ void ARM_Unicorn::InterruptHook(uc_engine* uc, u32 int_no, void* user_data) {
switch (ec) { switch (ec) {
case 0x15: // SVC case 0x15: // SVC
Kernel::CallSVC(arm_instance->system, iss); Kernel::Svc::Call(arm_instance->system, iss);
break; break;
} }
} }

6
src/core/hle/kernel/svc.cpp
View File

@@ -42,7 +42,7 @@
#include "core/memory.h" #include "core/memory.h"
#include "core/reporter.h" #include "core/reporter.h"
namespace Kernel { namespace Kernel::Svc {
namespace { namespace {
// Checks if address + size is greater than the given address // Checks if address + size is greater than the given address
@@ -2656,7 +2656,7 @@ static const FunctionDef* GetSVCInfo64(u32 func_num) {
MICROPROFILE_DEFINE(Kernel_SVC, "Kernel", "SVC", MP_RGB(70, 200, 70)); MICROPROFILE_DEFINE(Kernel_SVC, "Kernel", "SVC", MP_RGB(70, 200, 70));
void CallSVC(Core::System& system, u32 immediate) { void Call(Core::System& system, u32 immediate) {
MICROPROFILE_SCOPE(Kernel_SVC); MICROPROFILE_SCOPE(Kernel_SVC);
// Lock the global kernel mutex when we enter the kernel HLE. // Lock the global kernel mutex when we enter the kernel HLE.
@@ -2675,4 +2675,4 @@ void CallSVC(Core::System& system, u32 immediate) {
} }
} }
} // namespace Kernel } // namespace Kernel::Svc

6
src/core/hle/kernel/svc.h
View File

@@ -10,8 +10,8 @@ namespace Core {
class System; class System;
} }
namespace Kernel { namespace Kernel::Svc {
void CallSVC(Core::System& system, u32 immediate); void Call(Core::System& system, u32 immediate);
} // namespace Kernel } // namespace Kernel::Svc