mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-24 15:27:19 +02:00
core/arm_interface: Improve the performance of memory fallbacks.
We just create one memory subsystem. This is a constant all the time. So there is no need to call the non-inlined parent.Memory() helper on every callback.
This commit is contained in:
parent
420b1f89d3
commit
ddb186e61d
@ -24,45 +24,46 @@ namespace Core {
|
|||||||
|
|
||||||
class DynarmicCallbacks32 : public Dynarmic::A32::UserCallbacks {
|
class DynarmicCallbacks32 : public Dynarmic::A32::UserCallbacks {
|
||||||
public:
|
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 {
|
u8 MemoryRead8(u32 vaddr) override {
|
||||||
return parent.system.Memory().Read8(vaddr);
|
return memory.Read8(vaddr);
|
||||||
}
|
}
|
||||||
u16 MemoryRead16(u32 vaddr) override {
|
u16 MemoryRead16(u32 vaddr) override {
|
||||||
return parent.system.Memory().Read16(vaddr);
|
return memory.Read16(vaddr);
|
||||||
}
|
}
|
||||||
u32 MemoryRead32(u32 vaddr) override {
|
u32 MemoryRead32(u32 vaddr) override {
|
||||||
return parent.system.Memory().Read32(vaddr);
|
return memory.Read32(vaddr);
|
||||||
}
|
}
|
||||||
u64 MemoryRead64(u32 vaddr) override {
|
u64 MemoryRead64(u32 vaddr) override {
|
||||||
return parent.system.Memory().Read64(vaddr);
|
return memory.Read64(vaddr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MemoryWrite8(u32 vaddr, u8 value) override {
|
void MemoryWrite8(u32 vaddr, u8 value) override {
|
||||||
parent.system.Memory().Write8(vaddr, value);
|
memory.Write8(vaddr, value);
|
||||||
}
|
}
|
||||||
void MemoryWrite16(u32 vaddr, u16 value) override {
|
void MemoryWrite16(u32 vaddr, u16 value) override {
|
||||||
parent.system.Memory().Write16(vaddr, value);
|
memory.Write16(vaddr, value);
|
||||||
}
|
}
|
||||||
void MemoryWrite32(u32 vaddr, u32 value) override {
|
void MemoryWrite32(u32 vaddr, u32 value) override {
|
||||||
parent.system.Memory().Write32(vaddr, value);
|
memory.Write32(vaddr, value);
|
||||||
}
|
}
|
||||||
void MemoryWrite64(u32 vaddr, u64 value) override {
|
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 {
|
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 {
|
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 {
|
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 {
|
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 {
|
void InterpreterFallback(u32 pc, std::size_t num_instructions) override {
|
||||||
@ -112,6 +113,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
ARM_Dynarmic_32& parent;
|
ARM_Dynarmic_32& parent;
|
||||||
|
Core::Memory::Memory& memory;
|
||||||
std::size_t num_interpreted_instructions{};
|
std::size_t num_interpreted_instructions{};
|
||||||
static constexpr u64 minimum_run_cycles = 1000U;
|
static constexpr u64 minimum_run_cycles = 1000U;
|
||||||
};
|
};
|
||||||
|
@ -27,57 +27,56 @@ using Vector = Dynarmic::A64::Vector;
|
|||||||
|
|
||||||
class DynarmicCallbacks64 : public Dynarmic::A64::UserCallbacks {
|
class DynarmicCallbacks64 : public Dynarmic::A64::UserCallbacks {
|
||||||
public:
|
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 {
|
u8 MemoryRead8(u64 vaddr) override {
|
||||||
return parent.system.Memory().Read8(vaddr);
|
return memory.Read8(vaddr);
|
||||||
}
|
}
|
||||||
u16 MemoryRead16(u64 vaddr) override {
|
u16 MemoryRead16(u64 vaddr) override {
|
||||||
return parent.system.Memory().Read16(vaddr);
|
return memory.Read16(vaddr);
|
||||||
}
|
}
|
||||||
u32 MemoryRead32(u64 vaddr) override {
|
u32 MemoryRead32(u64 vaddr) override {
|
||||||
return parent.system.Memory().Read32(vaddr);
|
return memory.Read32(vaddr);
|
||||||
}
|
}
|
||||||
u64 MemoryRead64(u64 vaddr) override {
|
u64 MemoryRead64(u64 vaddr) override {
|
||||||
return parent.system.Memory().Read64(vaddr);
|
return memory.Read64(vaddr);
|
||||||
}
|
}
|
||||||
Vector MemoryRead128(u64 vaddr) override {
|
Vector MemoryRead128(u64 vaddr) override {
|
||||||
auto& memory = parent.system.Memory();
|
|
||||||
return {memory.Read64(vaddr), memory.Read64(vaddr + 8)};
|
return {memory.Read64(vaddr), memory.Read64(vaddr + 8)};
|
||||||
}
|
}
|
||||||
|
|
||||||
void MemoryWrite8(u64 vaddr, u8 value) override {
|
void MemoryWrite8(u64 vaddr, u8 value) override {
|
||||||
parent.system.Memory().Write8(vaddr, value);
|
memory.Write8(vaddr, value);
|
||||||
}
|
}
|
||||||
void MemoryWrite16(u64 vaddr, u16 value) override {
|
void MemoryWrite16(u64 vaddr, u16 value) override {
|
||||||
parent.system.Memory().Write16(vaddr, value);
|
memory.Write16(vaddr, value);
|
||||||
}
|
}
|
||||||
void MemoryWrite32(u64 vaddr, u32 value) override {
|
void MemoryWrite32(u64 vaddr, u32 value) override {
|
||||||
parent.system.Memory().Write32(vaddr, value);
|
memory.Write32(vaddr, value);
|
||||||
}
|
}
|
||||||
void MemoryWrite64(u64 vaddr, u64 value) override {
|
void MemoryWrite64(u64 vaddr, u64 value) override {
|
||||||
parent.system.Memory().Write64(vaddr, value);
|
memory.Write64(vaddr, value);
|
||||||
}
|
}
|
||||||
void MemoryWrite128(u64 vaddr, Vector value) override {
|
void MemoryWrite128(u64 vaddr, Vector value) override {
|
||||||
auto& memory = parent.system.Memory();
|
|
||||||
memory.Write64(vaddr, value[0]);
|
memory.Write64(vaddr, value[0]);
|
||||||
memory.Write64(vaddr + 8, value[1]);
|
memory.Write64(vaddr + 8, value[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MemoryWriteExclusive8(u64 vaddr, std::uint8_t value, std::uint8_t expected) override {
|
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 {
|
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 {
|
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 {
|
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 {
|
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 {
|
void InterpreterFallback(u64 pc, std::size_t num_instructions) override {
|
||||||
@ -139,6 +138,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
ARM_Dynarmic_64& parent;
|
ARM_Dynarmic_64& parent;
|
||||||
|
Core::Memory::Memory& memory;
|
||||||
u64 tpidrro_el0 = 0;
|
u64 tpidrro_el0 = 0;
|
||||||
u64 tpidr_el0 = 0;
|
u64 tpidr_el0 = 0;
|
||||||
static constexpr u64 minimum_run_cycles = 1000U;
|
static constexpr u64 minimum_run_cycles = 1000U;
|
||||||
|
Loading…
Reference in New Issue
Block a user