diff options
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/function_wrappers.h | 60 | ||||
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/service/ldr_ro/ldr_ro.cpp | 8 | ||||
-rw-r--r-- | src/core/hle/svc.cpp | 13 |
4 files changed, 43 insertions, 44 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h index cafc7fe62..7875971ce 100644 --- a/src/core/hle/function_wrappers.h +++ b/src/core/hle/function_wrappers.h @@ -14,7 +14,7 @@ namespace HLE { -#define PARAM(n) Core::AppCore().GetReg(n) +#define PARAM(n) Core::CPU().GetReg(n) /// An invalid result code that is meant to be overwritten when a thread resumes from waiting static const ResultCode RESULT_INVALID(0xDEADC0DE); @@ -24,7 +24,7 @@ static const ResultCode RESULT_INVALID(0xDEADC0DE); * @param res Result to return */ static inline void FuncReturn(u32 res) { - Core::AppCore().SetReg(0, res); + Core::CPU().SetReg(0, res); } /** @@ -33,8 +33,8 @@ static inline void FuncReturn(u32 res) { * @todo Verify that this function is correct */ static inline void FuncReturn64(u64 res) { - Core::AppCore().SetReg(0, (u32)(res & 0xFFFFFFFF)); - Core::AppCore().SetReg(1, (u32)((res >> 32) & 0xFFFFFFFF)); + Core::CPU().SetReg(0, (u32)(res & 0xFFFFFFFF)); + Core::CPU().SetReg(1, (u32)((res >> 32) & 0xFFFFFFFF)); } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -49,7 +49,7 @@ template <ResultCode func(u32*, u32, u32, u32, u32, u32)> void Wrap() { u32 param_1 = 0; u32 retval = func(¶m_1, PARAM(0), PARAM(1), PARAM(2), PARAM(3), PARAM(4)).raw; - Core::AppCore().SetReg(1, param_1); + Core::CPU().SetReg(1, param_1); FuncReturn(retval); } @@ -57,7 +57,7 @@ template <ResultCode func(u32*, s32, u32, u32, u32, s32)> void Wrap() { u32 param_1 = 0; u32 retval = func(¶m_1, PARAM(0), PARAM(1), PARAM(2), PARAM(3), PARAM(4)).raw; - Core::AppCore().SetReg(1, param_1); + Core::CPU().SetReg(1, param_1); FuncReturn(retval); } @@ -69,7 +69,7 @@ void Wrap() { .raw; if (retval != RESULT_INVALID.raw) { - Core::AppCore().SetReg(1, (u32)param_1); + Core::CPU().SetReg(1, (u32)param_1); FuncReturn(retval); } } @@ -84,7 +84,7 @@ template <ResultCode func(u32*)> void Wrap() { u32 param_1 = 0; u32 retval = func(¶m_1).raw; - Core::AppCore().SetReg(1, param_1); + Core::CPU().SetReg(1, param_1); FuncReturn(retval); } @@ -102,11 +102,11 @@ void Wrap() { MemoryInfo memory_info = {}; PageInfo page_info = {}; u32 retval = func(&memory_info, &page_info, PARAM(2)).raw; - Core::AppCore().SetReg(1, memory_info.base_address); - Core::AppCore().SetReg(2, memory_info.size); - Core::AppCore().SetReg(3, memory_info.permission); - Core::AppCore().SetReg(4, memory_info.state); - Core::AppCore().SetReg(5, page_info.flags); + Core::CPU().SetReg(1, memory_info.base_address); + Core::CPU().SetReg(2, memory_info.size); + Core::CPU().SetReg(3, memory_info.permission); + Core::CPU().SetReg(4, memory_info.state); + Core::CPU().SetReg(5, page_info.flags); FuncReturn(retval); } @@ -115,11 +115,11 @@ void Wrap() { MemoryInfo memory_info = {}; PageInfo page_info = {}; u32 retval = func(&memory_info, &page_info, PARAM(2), PARAM(3)).raw; - Core::AppCore().SetReg(1, memory_info.base_address); - Core::AppCore().SetReg(2, memory_info.size); - Core::AppCore().SetReg(3, memory_info.permission); - Core::AppCore().SetReg(4, memory_info.state); - Core::AppCore().SetReg(5, page_info.flags); + Core::CPU().SetReg(1, memory_info.base_address); + Core::CPU().SetReg(2, memory_info.size); + Core::CPU().SetReg(3, memory_info.permission); + Core::CPU().SetReg(4, memory_info.state); + Core::CPU().SetReg(5, page_info.flags); FuncReturn(retval); } @@ -127,7 +127,7 @@ template <ResultCode func(s32*, u32)> void Wrap() { s32 param_1 = 0; u32 retval = func(¶m_1, PARAM(1)).raw; - Core::AppCore().SetReg(1, param_1); + Core::CPU().SetReg(1, param_1); FuncReturn(retval); } @@ -140,7 +140,7 @@ template <ResultCode func(u32*, u32)> void Wrap() { u32 param_1 = 0; u32 retval = func(¶m_1, PARAM(1)).raw; - Core::AppCore().SetReg(1, param_1); + Core::CPU().SetReg(1, param_1); FuncReturn(retval); } @@ -160,7 +160,7 @@ template <ResultCode func(u32*, const char*)> void Wrap() { u32 param_1 = 0; u32 retval = func(¶m_1, (char*)Memory::GetPointer(PARAM(1))).raw; - Core::AppCore().SetReg(1, param_1); + Core::CPU().SetReg(1, param_1); FuncReturn(retval); } @@ -168,7 +168,7 @@ template <ResultCode func(u32*, s32, s32)> void Wrap() { u32 param_1 = 0; u32 retval = func(¶m_1, PARAM(1), PARAM(2)).raw; - Core::AppCore().SetReg(1, param_1); + Core::CPU().SetReg(1, param_1); FuncReturn(retval); } @@ -176,7 +176,7 @@ template <ResultCode func(s32*, u32, s32)> void Wrap() { s32 param_1 = 0; u32 retval = func(¶m_1, PARAM(1), PARAM(2)).raw; - Core::AppCore().SetReg(1, param_1); + Core::CPU().SetReg(1, param_1); FuncReturn(retval); } @@ -184,8 +184,8 @@ template <ResultCode func(s64*, u32, s32)> void Wrap() { s64 param_1 = 0; u32 retval = func(¶m_1, PARAM(1), PARAM(2)).raw; - Core::AppCore().SetReg(1, (u32)param_1); - Core::AppCore().SetReg(2, (u32)(param_1 >> 32)); + Core::CPU().SetReg(1, (u32)param_1); + Core::CPU().SetReg(2, (u32)(param_1 >> 32)); FuncReturn(retval); } @@ -194,7 +194,7 @@ void Wrap() { u32 param_1 = 0; // The last parameter is passed in R0 instead of R4 u32 retval = func(¶m_1, PARAM(1), PARAM(2), PARAM(3), PARAM(0)).raw; - Core::AppCore().SetReg(1, param_1); + Core::CPU().SetReg(1, param_1); FuncReturn(retval); } @@ -209,8 +209,8 @@ template <ResultCode func(s64*, Kernel::Handle, u32)> void Wrap() { s64 param_1 = 0; u32 retval = func(¶m_1, PARAM(1), PARAM(2)).raw; - Core::AppCore().SetReg(1, (u32)param_1); - Core::AppCore().SetReg(2, (u32)(param_1 >> 32)); + Core::CPU().SetReg(1, (u32)param_1); + Core::CPU().SetReg(2, (u32)(param_1 >> 32)); FuncReturn(retval); } @@ -227,8 +227,8 @@ void Wrap() { reinterpret_cast<const char*>(Memory::GetPointer(PARAM(2))), PARAM(3)) .raw; // The first out parameter is moved into R2 and the second is moved into R1. - Core::AppCore().SetReg(1, param_2); - Core::AppCore().SetReg(2, param_1); + Core::CPU().SetReg(1, param_2); + Core::CPU().SetReg(2, param_1); FuncReturn(retval); } diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index c964b35d4..60b7bea70 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -187,7 +187,7 @@ static void SwitchContext(Thread* new_thread) { // Save context for previous thread if (previous_thread) { previous_thread->last_running_ticks = CoreTiming::GetTicks(); - Core::AppCore().SaveContext(previous_thread->context); + Core::CPU().SaveContext(previous_thread->context); if (previous_thread->status == THREADSTATUS_RUNNING) { // This is only the case when a reschedule is triggered without the current thread @@ -213,8 +213,8 @@ static void SwitchContext(Thread* new_thread) { // Restores thread to its nominal priority if it has been temporarily changed new_thread->current_priority = new_thread->nominal_priority; - Core::AppCore().LoadContext(new_thread->context); - Core::AppCore().SetCP15Register(CP15_THREAD_URO, new_thread->GetTLSAddress()); + Core::CPU().LoadContext(new_thread->context); + Core::CPU().SetCP15Register(CP15_THREAD_URO, new_thread->GetTLSAddress()); } else { current_thread = nullptr; } diff --git a/src/core/hle/service/ldr_ro/ldr_ro.cpp b/src/core/hle/service/ldr_ro/ldr_ro.cpp index 614f16d44..8d00a7577 100644 --- a/src/core/hle/service/ldr_ro/ldr_ro.cpp +++ b/src/core/hle/service/ldr_ro/ldr_ro.cpp @@ -457,7 +457,7 @@ static void LoadCRO(Interface* self, bool link_on_load_bug_fix) { } } - Core::AppCore().ClearInstructionCache(); + Core::CPU().ClearInstructionCache(); LOG_INFO(Service_LDR, "CRO \"%s\" loaded at 0x%08X, fixed_end=0x%08X", cro.ModuleName().data(), cro_address, cro_address + fix_size); @@ -562,7 +562,7 @@ static void UnloadCRO(Interface* self) { memory_synchronizer.RemoveMemoryBlock(cro_address, cro_buffer_ptr); } - Core::AppCore().ClearInstructionCache(); + Core::CPU().ClearInstructionCache(); cmd_buff[1] = result.raw; } @@ -624,7 +624,7 @@ static void LinkCRO(Interface* self) { } memory_synchronizer.SynchronizeOriginalMemory(); - Core::AppCore().ClearInstructionCache(); + Core::CPU().ClearInstructionCache(); cmd_buff[1] = result.raw; } @@ -686,7 +686,7 @@ static void UnlinkCRO(Interface* self) { } memory_synchronizer.SynchronizeOriginalMemory(); - Core::AppCore().ClearInstructionCache(); + Core::CPU().ClearInstructionCache(); cmd_buff[1] = result.raw; } diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 1f89ccfd5..2ca270de3 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -583,7 +583,7 @@ static ResultCode CreateThread(Kernel::Handle* out_handle, s32 priority, u32 ent /// Called when a thread exits static void ExitThread() { - LOG_TRACE(Kernel_SVC, "called, pc=0x%08X", Core::AppCore().GetPC()); + LOG_TRACE(Kernel_SVC, "called, pc=0x%08X", Core::CPU().GetPC()); Kernel::ExitCurrentThread(); } @@ -613,7 +613,7 @@ static ResultCode CreateMutex(Kernel::Handle* out_handle, u32 initial_locked) { using Kernel::Mutex; SharedPtr<Mutex> mutex = Mutex::Create(initial_locked != 0); - mutex->name = Common::StringFromFormat("mutex-%08x", Core::AppCore().GetReg(14)); + mutex->name = Common::StringFromFormat("mutex-%08x", Core::CPU().GetReg(14)); CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(mutex))); LOG_TRACE(Kernel_SVC, "called initial_locked=%s : created handle=0x%08X", @@ -684,7 +684,7 @@ static ResultCode CreateSemaphore(Kernel::Handle* out_handle, s32 initial_count, using Kernel::Semaphore; CASCADE_RESULT(SharedPtr<Semaphore> semaphore, Semaphore::Create(initial_count, max_count)); - semaphore->name = Common::StringFromFormat("semaphore-%08x", Core::AppCore().GetReg(14)); + semaphore->name = Common::StringFromFormat("semaphore-%08x", Core::CPU().GetReg(14)); CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(semaphore))); LOG_TRACE(Kernel_SVC, "called initial_count=%d, max_count=%d, created handle=0x%08X", @@ -741,7 +741,7 @@ static ResultCode CreateEvent(Kernel::Handle* out_handle, u32 reset_type) { using Kernel::Event; SharedPtr<Event> evt = Event::Create(static_cast<Kernel::ResetType>(reset_type)); - evt->name = Common::StringFromFormat("event-%08x", Core::AppCore().GetReg(14)); + evt->name = Common::StringFromFormat("event-%08x", Core::CPU().GetReg(14)); CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(evt))); LOG_TRACE(Kernel_SVC, "called reset_type=0x%08X : created handle=0x%08X", reset_type, @@ -788,7 +788,7 @@ static ResultCode CreateTimer(Kernel::Handle* out_handle, u32 reset_type) { using Kernel::Timer; SharedPtr<Timer> timer = Timer::Create(static_cast<Kernel::ResetType>(reset_type)); - timer->name = Common::StringFromFormat("timer-%08x", Core::AppCore().GetReg(14)); + timer->name = Common::StringFromFormat("timer-%08x", Core::CPU().GetReg(14)); CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(std::move(timer))); LOG_TRACE(Kernel_SVC, "called reset_type=0x%08X : created handle=0x%08X", reset_type, @@ -855,8 +855,7 @@ static void SleepThread(s64 nanoseconds) { static s64 GetSystemTick() { s64 result = CoreTiming::GetTicks(); // Advance time to defeat dumb games (like Cubic Ninja) that busy-wait for the frame to end. - Core::AppCore().AddTicks( - 150); // Measured time between two calls on a 9.2 o3DS with Ninjhax 1.1b + Core::CPU().AddTicks(150); // Measured time between two calls on a 9.2 o3DS with Ninjhax 1.1b return result; } |