diff options
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 26 | ||||
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.h | 7 | ||||
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_cp15.cpp | 88 | ||||
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_cp15.h | 32 |
4 files changed, 6 insertions, 147 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 6dcab5bab..89754da17 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -7,11 +7,9 @@ #include "common/assert.h" #include "common/microprofile.h" #include "core/arm/dynarmic/arm_dynarmic.h" -#include "core/arm/dynarmic/arm_dynarmic_cp15.h" -#include "core/arm/dyncom/arm_dyncom_interpreter.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/svc.h" +#include "core/hle/kernel/svc.h" #include "core/memory.h" static void InterpreterFallback(u64 pc, Dynarmic::Jit* jit, void* user_arg) { @@ -55,11 +53,11 @@ void MemoryWrite64(const u64 addr, const u64 data) { Memory::Write64(static_cast<VAddr>(addr), data); } -static Dynarmic::UserCallbacks GetUserCallbacks(ARM_Dynarmic* this_) { +static Dynarmic::UserCallbacks GetUserCallbacks(ARM_Interface* interpreter_fallback) { Dynarmic::UserCallbacks user_callbacks{}; user_callbacks.InterpreterFallback = &InterpreterFallback; - user_callbacks.user_arg = static_cast<void*>(this_); - user_callbacks.CallSVC = &SVC::CallSVC; + user_callbacks.user_arg = static_cast<void*>(interpreter_fallback); + user_callbacks.CallSVC = &Kernel::CallSVC; user_callbacks.memory.IsReadOnlyMemory = &IsReadOnlyMemory; user_callbacks.memory.ReadCode = &MemoryRead32; user_callbacks.memory.Read8 = &MemoryRead8; @@ -74,7 +72,7 @@ static Dynarmic::UserCallbacks GetUserCallbacks(ARM_Dynarmic* this_) { return user_callbacks; } -ARM_Dynarmic::ARM_Dynarmic(PrivilegeMode initial_mode) { +ARM_Dynarmic::ARM_Dynarmic() { } void ARM_Dynarmic::MapBackingMemory(VAddr address, size_t size, u8* memory, Kernel::VMAPermission perms) { @@ -111,13 +109,6 @@ u32 ARM_Dynarmic::GetVFPReg(int index) const { void ARM_Dynarmic::SetVFPReg(int index, u32 value) { } -u32 ARM_Dynarmic::GetVFPSystemReg(VFPSystemRegister reg) const { - return {}; -} - -void ARM_Dynarmic::SetVFPSystemReg(VFPSystemRegister reg, u32 value) { -} - u32 ARM_Dynarmic::GetCPSR() const { return jit->Cpsr(); } @@ -126,13 +117,6 @@ void ARM_Dynarmic::SetCPSR(u32 cpsr) { jit->Cpsr() = cpsr; } -u32 ARM_Dynarmic::GetCP15Register(CP15Register reg) { - return {}; -} - -void ARM_Dynarmic::SetCP15Register(CP15Register reg, u32 value) { -} - VAddr ARM_Dynarmic::GetTlsAddress() const { return jit->TlsAddr(); } diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h index 6567359b0..5c7f516d8 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.h +++ b/src/core/arm/dynarmic/arm_dynarmic.h @@ -9,7 +9,6 @@ #include <dynarmic/dynarmic.h> #include "common/common_types.h" #include "core/arm/arm_interface.h" -#include "core/arm/skyeye_common/armstate.h" namespace Memory { struct PageTable; @@ -17,7 +16,7 @@ struct PageTable; class ARM_Dynarmic final : public ARM_Interface { public: - ARM_Dynarmic(PrivilegeMode initial_mode); + ARM_Dynarmic(); void MapBackingMemory(VAddr address, size_t size, u8* memory, Kernel::VMAPermission perms) override; @@ -29,12 +28,8 @@ public: void SetExtReg(int index, u128& value) override; u32 GetVFPReg(int index) const override; void SetVFPReg(int index, u32 value) override; - u32 GetVFPSystemReg(VFPSystemRegister reg) const override; - void SetVFPSystemReg(VFPSystemRegister reg, u32 value) override; u32 GetCPSR() const override; void SetCPSR(u32 cpsr) override; - u32 GetCP15Register(CP15Register reg) override; - void SetCP15Register(CP15Register reg, u32 value) override; VAddr GetTlsAddress() const override; void SetTlsAddress(VAddr address) override; diff --git a/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp b/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp deleted file mode 100644 index b1fdce096..000000000 --- a/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright 2017 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#include "core/arm/dynarmic/arm_dynarmic_cp15.h" -#include "core/arm/skyeye_common/arm_regformat.h" -#include "core/arm/skyeye_common/armstate.h" - -using Callback = Dynarmic::Coprocessor::Callback; -using CallbackOrAccessOneWord = Dynarmic::Coprocessor::CallbackOrAccessOneWord; -using CallbackOrAccessTwoWords = Dynarmic::Coprocessor::CallbackOrAccessTwoWords; - -DynarmicCP15::DynarmicCP15(const std::shared_ptr<ARMul_State>& state) : interpreter_state(state) {} - -DynarmicCP15::~DynarmicCP15() = default; - -boost::optional<Callback> DynarmicCP15::CompileInternalOperation(bool two, unsigned opc1, - CoprocReg CRd, CoprocReg CRn, - CoprocReg CRm, unsigned opc2) { - return boost::none; -} - -CallbackOrAccessOneWord DynarmicCP15::CompileSendOneWord(bool two, unsigned opc1, CoprocReg CRn, - CoprocReg CRm, unsigned opc2) { - // TODO(merry): Privileged CP15 registers - - if (!two && CRn == CoprocReg::C7 && opc1 == 0 && CRm == CoprocReg::C5 && opc2 == 4) { - // This is a dummy write, we ignore the value written here. - return &interpreter_state->CP15[CP15_FLUSH_PREFETCH_BUFFER]; - } - - if (!two && CRn == CoprocReg::C7 && opc1 == 0 && CRm == CoprocReg::C10) { - switch (opc2) { - case 4: - // This is a dummy write, we ignore the value written here. - return &interpreter_state->CP15[CP15_DATA_SYNC_BARRIER]; - case 5: - // This is a dummy write, we ignore the value written here. - return &interpreter_state->CP15[CP15_DATA_MEMORY_BARRIER]; - default: - return boost::blank{}; - } - } - - if (!two && CRn == CoprocReg::C13 && opc1 == 0 && CRm == CoprocReg::C0 && opc2 == 2) { - return &interpreter_state->CP15[CP15_THREAD_UPRW]; - } - - return boost::blank{}; -} - -CallbackOrAccessTwoWords DynarmicCP15::CompileSendTwoWords(bool two, unsigned opc, CoprocReg CRm) { - return boost::blank{}; -} - -CallbackOrAccessOneWord DynarmicCP15::CompileGetOneWord(bool two, unsigned opc1, CoprocReg CRn, - CoprocReg CRm, unsigned opc2) { - // TODO(merry): Privileged CP15 registers - - if (!two && CRn == CoprocReg::C13 && opc1 == 0 && CRm == CoprocReg::C0) { - switch (opc2) { - case 2: - return &interpreter_state->CP15[CP15_THREAD_UPRW]; - case 3: - return &interpreter_state->CP15[CP15_THREAD_URO]; - default: - return boost::blank{}; - } - } - - return boost::blank{}; -} - -CallbackOrAccessTwoWords DynarmicCP15::CompileGetTwoWords(bool two, unsigned opc, CoprocReg CRm) { - return boost::blank{}; -} - -boost::optional<Callback> DynarmicCP15::CompileLoadWords(bool two, bool long_transfer, - CoprocReg CRd, - boost::optional<u8> option) { - return boost::none; -} - -boost::optional<Callback> DynarmicCP15::CompileStoreWords(bool two, bool long_transfer, - CoprocReg CRd, - boost::optional<u8> option) { - return boost::none; -} diff --git a/src/core/arm/dynarmic/arm_dynarmic_cp15.h b/src/core/arm/dynarmic/arm_dynarmic_cp15.h deleted file mode 100644 index 7fa54e14c..000000000 --- a/src/core/arm/dynarmic/arm_dynarmic_cp15.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#include <memory> -#include <dynarmic/coprocessor.h> -#include "common/common_types.h" - -struct ARMul_State; - -class DynarmicCP15 final : public Dynarmic::Coprocessor { -public: - explicit DynarmicCP15(const std::shared_ptr<ARMul_State>&); - ~DynarmicCP15() override; - - boost::optional<Callback> CompileInternalOperation(bool two, unsigned opc1, CoprocReg CRd, - CoprocReg CRn, CoprocReg CRm, - unsigned opc2) override; - CallbackOrAccessOneWord CompileSendOneWord(bool two, unsigned opc1, CoprocReg CRn, - CoprocReg CRm, unsigned opc2) override; - CallbackOrAccessTwoWords CompileSendTwoWords(bool two, unsigned opc, CoprocReg CRm) override; - CallbackOrAccessOneWord CompileGetOneWord(bool two, unsigned opc1, CoprocReg CRn, CoprocReg CRm, - unsigned opc2) override; - CallbackOrAccessTwoWords CompileGetTwoWords(bool two, unsigned opc, CoprocReg CRm) override; - boost::optional<Callback> CompileLoadWords(bool two, bool long_transfer, CoprocReg CRd, - boost::optional<u8> option) override; - boost::optional<Callback> CompileStoreWords(bool two, bool long_transfer, CoprocReg CRd, - boost::optional<u8> option) override; - -private: - std::shared_ptr<ARMul_State> interpreter_state; -}; |