citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

externals: Update dynarmic to b58048a

This commit is contained in:
MerryMage 2020-04-06 16:44:59 +01:00
parent 3b1b8b7e1f
commit e04590a06d
4 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/dynarmic vendored

@ -1 +1 @@
Subproject commit 4e6848d1c9e8dadc70595c15b5589f8b14aad478 Subproject commit b58048a5a88ad6184d64f16cfd2c5d63a1952e77

8
src/core/arm/dynarmic/arm_dynarmic.cpp
View File

@ -143,6 +143,14 @@ public:
return; return;
} }
break; break;
case Dynarmic::A32::Exception::SendEvent:
case Dynarmic::A32::Exception::SendEventLocal:
case Dynarmic::A32::Exception::WaitForInterrupt:
case Dynarmic::A32::Exception::WaitForEvent:
case Dynarmic::A32::Exception::Yield:
case Dynarmic::A32::Exception::PreloadData:
case Dynarmic::A32::Exception::PreloadDataWithIntentToWrite:
return;
} }
ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})", ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})",
static_cast<std::size_t>(exception), pc, MemoryReadCode(pc)); static_cast<std::size_t>(exception), pc, MemoryReadCode(pc));

34
src/core/arm/dynarmic/arm_dynarmic_cp15.cpp
View File

@ -14,10 +14,10 @@ DynarmicCP15::DynarmicCP15(const std::shared_ptr<ARMul_State>& state) : interpre
DynarmicCP15::~DynarmicCP15() = default; DynarmicCP15::~DynarmicCP15() = default;
boost::optional<Callback> DynarmicCP15::CompileInternalOperation(bool two, unsigned opc1, std::optional<Callback> DynarmicCP15::CompileInternalOperation(bool two, unsigned opc1,
CoprocReg CRd, CoprocReg CRn, CoprocReg CRd, CoprocReg CRn,
CoprocReg CRm, unsigned opc2) { CoprocReg CRm, unsigned opc2) {
return boost::none; return std::nullopt;
} }
CallbackOrAccessOneWord DynarmicCP15::CompileSendOneWord(bool two, unsigned opc1, CoprocReg CRn, CallbackOrAccessOneWord DynarmicCP15::CompileSendOneWord(bool two, unsigned opc1, CoprocReg CRn,
@ -38,7 +38,7 @@ CallbackOrAccessOneWord DynarmicCP15::CompileSendOneWord(bool two, unsigned opc1
// This is a dummy write, we ignore the value written here. // This is a dummy write, we ignore the value written here.
return &interpreter_state->CP15[CP15_DATA_MEMORY_BARRIER]; return &interpreter_state->CP15[CP15_DATA_MEMORY_BARRIER];
default: default:
return boost::blank{}; return std::monostate{};
} }
} }
@ -46,11 +46,11 @@ CallbackOrAccessOneWord DynarmicCP15::CompileSendOneWord(bool two, unsigned opc1
return &interpreter_state->CP15[CP15_THREAD_UPRW]; return &interpreter_state->CP15[CP15_THREAD_UPRW];
} }
return boost::blank{}; return std::monostate{};
} }
CallbackOrAccessTwoWords DynarmicCP15::CompileSendTwoWords(bool two, unsigned opc, CoprocReg CRm) { CallbackOrAccessTwoWords DynarmicCP15::CompileSendTwoWords(bool two, unsigned opc, CoprocReg CRm) {
return boost::blank{}; return std::monostate{};
} }
CallbackOrAccessOneWord DynarmicCP15::CompileGetOneWord(bool two, unsigned opc1, CoprocReg CRn, CallbackOrAccessOneWord DynarmicCP15::CompileGetOneWord(bool two, unsigned opc1, CoprocReg CRn,
@ -64,25 +64,23 @@ CallbackOrAccessOneWord DynarmicCP15::CompileGetOneWord(bool two, unsigned opc1,
case 3: case 3:
return &interpreter_state->CP15[CP15_THREAD_URO]; return &interpreter_state->CP15[CP15_THREAD_URO];
default: default:
return boost::blank{}; return std::monostate{};
} }
} }
return boost::blank{}; return std::monostate{};
} }
CallbackOrAccessTwoWords DynarmicCP15::CompileGetTwoWords(bool two, unsigned opc, CoprocReg CRm) { CallbackOrAccessTwoWords DynarmicCP15::CompileGetTwoWords(bool two, unsigned opc, CoprocReg CRm) {
return boost::blank{}; return std::monostate{};
} }
boost::optional<Callback> DynarmicCP15::CompileLoadWords(bool two, bool long_transfer, std::optional<Callback> DynarmicCP15::CompileLoadWords(bool two, bool long_transfer, CoprocReg CRd,
CoprocReg CRd, std::optional<u8> option) {
boost::optional<u8> option) { return std::nullopt;
return boost::none;
} }
boost::optional<Callback> DynarmicCP15::CompileStoreWords(bool two, bool long_transfer, std::optional<Callback> DynarmicCP15::CompileStoreWords(bool two, bool long_transfer, CoprocReg CRd,
CoprocReg CRd, std::optional<u8> option) {
boost::optional<u8> option) { return std::nullopt;
return boost::none;
} }

14
src/core/arm/dynarmic/arm_dynarmic_cp15.h
View File

@ -17,19 +17,19 @@ public:
explicit DynarmicCP15(const std::shared_ptr<ARMul_State>&); explicit DynarmicCP15(const std::shared_ptr<ARMul_State>&);
~DynarmicCP15() override; ~DynarmicCP15() override;
boost::optional<Callback> CompileInternalOperation(bool two, unsigned opc1, CoprocReg CRd, std::optional<Callback> CompileInternalOperation(bool two, unsigned opc1, CoprocReg CRd,
CoprocReg CRn, CoprocReg CRm, CoprocReg CRn, CoprocReg CRm,
unsigned opc2) override; unsigned opc2) override;
CallbackOrAccessOneWord CompileSendOneWord(bool two, unsigned opc1, CoprocReg CRn, CallbackOrAccessOneWord CompileSendOneWord(bool two, unsigned opc1, CoprocReg CRn,
CoprocReg CRm, unsigned opc2) override; CoprocReg CRm, unsigned opc2) override;
CallbackOrAccessTwoWords CompileSendTwoWords(bool two, unsigned opc, CoprocReg CRm) override; CallbackOrAccessTwoWords CompileSendTwoWords(bool two, unsigned opc, CoprocReg CRm) override;
CallbackOrAccessOneWord CompileGetOneWord(bool two, unsigned opc1, CoprocReg CRn, CoprocReg CRm, CallbackOrAccessOneWord CompileGetOneWord(bool two, unsigned opc1, CoprocReg CRn, CoprocReg CRm,
unsigned opc2) override; unsigned opc2) override;
CallbackOrAccessTwoWords CompileGetTwoWords(bool two, unsigned opc, CoprocReg CRm) override; CallbackOrAccessTwoWords CompileGetTwoWords(bool two, unsigned opc, CoprocReg CRm) override;
boost::optional<Callback> CompileLoadWords(bool two, bool long_transfer, CoprocReg CRd, std::optional<Callback> CompileLoadWords(bool two, bool long_transfer, CoprocReg CRd,
boost::optional<u8> option) override; std::optional<u8> option) override;
boost::optional<Callback> CompileStoreWords(bool two, bool long_transfer, CoprocReg CRd, std::optional<Callback> CompileStoreWords(bool two, bool long_transfer, CoprocReg CRd,
boost::optional<u8> option) override; std::optional<u8> option) override;
private: private:
std::shared_ptr<ARMul_State> interpreter_state; std::shared_ptr<ARMul_State> interpreter_state;