summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dynarmic
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-05-31 08:21:39 +0200
committerGitHub <noreply@github.com>2021-05-31 08:21:39 +0200
commitf34176996e443cb79bd70ea2c72feeabac2b1430 (patch)
treeb1c649a914bd136248782a371202ab314bf18939 /src/core/arm/dynarmic
parentMerge pull request #6344 from german77/update-libusb (diff)
parentcore/memory: Check our memory fallbacks for out-of-bound behavior. (diff)
downloadyuzu-f34176996e443cb79bd70ea2c72feeabac2b1430.tar
yuzu-f34176996e443cb79bd70ea2c72feeabac2b1430.tar.gz
yuzu-f34176996e443cb79bd70ea2c72feeabac2b1430.tar.bz2
yuzu-f34176996e443cb79bd70ea2c72feeabac2b1430.tar.lz
yuzu-f34176996e443cb79bd70ea2c72feeabac2b1430.tar.xz
yuzu-f34176996e443cb79bd70ea2c72feeabac2b1430.tar.zst
yuzu-f34176996e443cb79bd70ea2c72feeabac2b1430.zip
Diffstat (limited to 'src/core/arm/dynarmic')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_32.cpp28
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_64.cpp32
2 files changed, 31 insertions, 29 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index e5b78210a..cea7f0fb1 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -24,45 +24,46 @@ namespace Core {
class DynarmicCallbacks32 : public Dynarmic::A32::UserCallbacks {
public:
- explicit DynarmicCallbacks32(ARM_Dynarmic_32& parent_) : parent{parent_} {}
+ explicit DynarmicCallbacks32(ARM_Dynarmic_32& parent_)
+ : parent{parent_}, memory(parent.system.Memory()) {}
u8 MemoryRead8(u32 vaddr) override {
- return parent.system.Memory().Read8(vaddr);
+ return memory.Read8(vaddr);
}
u16 MemoryRead16(u32 vaddr) override {
- return parent.system.Memory().Read16(vaddr);
+ return memory.Read16(vaddr);
}
u32 MemoryRead32(u32 vaddr) override {
- return parent.system.Memory().Read32(vaddr);
+ return memory.Read32(vaddr);
}
u64 MemoryRead64(u32 vaddr) override {
- return parent.system.Memory().Read64(vaddr);
+ return memory.Read64(vaddr);
}
void MemoryWrite8(u32 vaddr, u8 value) override {
- parent.system.Memory().Write8(vaddr, value);
+ memory.Write8(vaddr, value);
}
void MemoryWrite16(u32 vaddr, u16 value) override {
- parent.system.Memory().Write16(vaddr, value);
+ memory.Write16(vaddr, value);
}
void MemoryWrite32(u32 vaddr, u32 value) override {
- parent.system.Memory().Write32(vaddr, value);
+ memory.Write32(vaddr, value);
}
void MemoryWrite64(u32 vaddr, u64 value) override {
- parent.system.Memory().Write64(vaddr, value);
+ memory.Write64(vaddr, value);
}
bool MemoryWriteExclusive8(u32 vaddr, u8 value, u8 expected) override {
- return parent.system.Memory().WriteExclusive8(vaddr, value, expected);
+ return memory.WriteExclusive8(vaddr, value, expected);
}
bool MemoryWriteExclusive16(u32 vaddr, u16 value, u16 expected) override {
- return parent.system.Memory().WriteExclusive16(vaddr, value, expected);
+ return memory.WriteExclusive16(vaddr, value, expected);
}
bool MemoryWriteExclusive32(u32 vaddr, u32 value, u32 expected) override {
- return parent.system.Memory().WriteExclusive32(vaddr, value, expected);
+ return memory.WriteExclusive32(vaddr, value, expected);
}
bool MemoryWriteExclusive64(u32 vaddr, u64 value, u64 expected) override {
- return parent.system.Memory().WriteExclusive64(vaddr, value, expected);
+ return memory.WriteExclusive64(vaddr, value, expected);
}
void InterpreterFallback(u32 pc, std::size_t num_instructions) override {
@@ -112,6 +113,7 @@ public:
}
ARM_Dynarmic_32& parent;
+ Core::Memory::Memory& memory;
std::size_t num_interpreted_instructions{};
static constexpr u64 minimum_run_cycles = 1000U;
};
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
index dd439f55e..63193dcb1 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
@@ -27,57 +27,56 @@ using Vector = Dynarmic::A64::Vector;
class DynarmicCallbacks64 : public Dynarmic::A64::UserCallbacks {
public:
- explicit DynarmicCallbacks64(ARM_Dynarmic_64& parent_) : parent{parent_} {}
+ explicit DynarmicCallbacks64(ARM_Dynarmic_64& parent_)
+ : parent{parent_}, memory(parent.system.Memory()) {}
u8 MemoryRead8(u64 vaddr) override {
- return parent.system.Memory().Read8(vaddr);
+ return memory.Read8(vaddr);
}
u16 MemoryRead16(u64 vaddr) override {
- return parent.system.Memory().Read16(vaddr);
+ return memory.Read16(vaddr);
}
u32 MemoryRead32(u64 vaddr) override {
- return parent.system.Memory().Read32(vaddr);
+ return memory.Read32(vaddr);
}
u64 MemoryRead64(u64 vaddr) override {
- return parent.system.Memory().Read64(vaddr);
+ return memory.Read64(vaddr);
}
Vector MemoryRead128(u64 vaddr) override {
- auto& memory = parent.system.Memory();
return {memory.Read64(vaddr), memory.Read64(vaddr + 8)};
}
void MemoryWrite8(u64 vaddr, u8 value) override {
- parent.system.Memory().Write8(vaddr, value);
+ memory.Write8(vaddr, value);
}
void MemoryWrite16(u64 vaddr, u16 value) override {
- parent.system.Memory().Write16(vaddr, value);
+ memory.Write16(vaddr, value);
}
void MemoryWrite32(u64 vaddr, u32 value) override {
- parent.system.Memory().Write32(vaddr, value);
+ memory.Write32(vaddr, value);
}
void MemoryWrite64(u64 vaddr, u64 value) override {
- parent.system.Memory().Write64(vaddr, value);
+ memory.Write64(vaddr, value);
}
void MemoryWrite128(u64 vaddr, Vector value) override {
- auto& memory = parent.system.Memory();
memory.Write64(vaddr, value[0]);
memory.Write64(vaddr + 8, value[1]);
}
bool MemoryWriteExclusive8(u64 vaddr, std::uint8_t value, std::uint8_t expected) override {
- return parent.system.Memory().WriteExclusive8(vaddr, value, expected);
+ return memory.WriteExclusive8(vaddr, value, expected);
}
bool MemoryWriteExclusive16(u64 vaddr, std::uint16_t value, std::uint16_t expected) override {
- return parent.system.Memory().WriteExclusive16(vaddr, value, expected);
+ return memory.WriteExclusive16(vaddr, value, expected);
}
bool MemoryWriteExclusive32(u64 vaddr, std::uint32_t value, std::uint32_t expected) override {
- return parent.system.Memory().WriteExclusive32(vaddr, value, expected);
+ return memory.WriteExclusive32(vaddr, value, expected);
}
bool MemoryWriteExclusive64(u64 vaddr, std::uint64_t value, std::uint64_t expected) override {
- return parent.system.Memory().WriteExclusive64(vaddr, value, expected);
+ return memory.WriteExclusive64(vaddr, value, expected);
}
bool MemoryWriteExclusive128(u64 vaddr, Vector value, Vector expected) override {
- return parent.system.Memory().WriteExclusive128(vaddr, value, expected);
+ return memory.WriteExclusive128(vaddr, value, expected);
}
void InterpreterFallback(u64 pc, std::size_t num_instructions) override {
@@ -139,6 +138,7 @@ public:
}
ARM_Dynarmic_64& parent;
+ Core::Memory::Memory& memory;
u64 tpidrro_el0 = 0;
u64 tpidr_el0 = 0;
static constexpr u64 minimum_run_cycles = 1000U;