mctaylors/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

MemoryManager: Fix errors popping out.

Browse source
This commit is contained in:
Fernando Sahmkow 2022-02-19 14:18:02 +01:00
parent 3d02143476
commit 5a568b1655
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/memory.cpp
View file

@ -551,6 +551,11 @@ struct Memory::Impl {
[]() {}); []() {});
} }
[[nodiscard]] u8* GetPointerSilent(const VAddr vaddr) const {
return GetPointerImpl(
vaddr, []() {}, []() {});
}
/** /**
* Reads a particular data type out of memory at the given virtual address. * Reads a particular data type out of memory at the given virtual address.
* *
@ -686,6 +691,10 @@ u8* Memory::GetPointer(VAddr vaddr) {
return impl->GetPointer(vaddr); return impl->GetPointer(vaddr);
} }
u8* Memory::GetPointerSilent(VAddr vaddr) {
return impl->GetPointerSilent(vaddr);
}
const u8* Memory::GetPointer(VAddr vaddr) const { const u8* Memory::GetPointer(VAddr vaddr) const {
return impl->GetPointer(vaddr); return impl->GetPointer(vaddr);
} }

1
src/core/memory.h
View file

@ -114,6 +114,7 @@ public:
* If the address is not valid, nullptr will be returned. * If the address is not valid, nullptr will be returned.
*/ */
u8* GetPointer(VAddr vaddr); u8* GetPointer(VAddr vaddr);
u8* GetPointerSilent(VAddr vaddr);
template <typename T> template <typename T>
T* GetPointer(VAddr vaddr) { T* GetPointer(VAddr vaddr) {

12
src/video_core/memory_manager.cpp
View file

@ -134,11 +134,15 @@ GPUVAddr MemoryManager::BigPageTableOp(GPUVAddr gpu_addr, [[maybe_unused]] VAddr
big_page_table_cpu[index] = sub_value; big_page_table_cpu[index] = sub_value;
const bool is_continous = ([&] { const bool is_continous = ([&] {
uintptr_t base_ptr{ uintptr_t base_ptr{
reinterpret_cast<uintptr_t>(memory.GetPointer(current_cpu_addr))}; reinterpret_cast<uintptr_t>(memory.GetPointerSilent(current_cpu_addr))};
if (base_ptr == 0) {
return false;
}
for (VAddr start_cpu = current_cpu_addr + page_size; for (VAddr start_cpu = current_cpu_addr + page_size;
start_cpu < current_cpu_addr + big_page_size; start_cpu += page_size) { start_cpu < current_cpu_addr + big_page_size; start_cpu += page_size) {
base_ptr += page_size; base_ptr += page_size;
if (base_ptr != reinterpret_cast<uintptr_t>(memory.GetPointer(start_cpu))) { auto next_ptr = reinterpret_cast<uintptr_t>(memory.GetPointerSilent(start_cpu));
if (next_ptr == 0 || base_ptr != next_ptr) {
return false; return false;
} }
} }
@ -359,7 +363,7 @@ void MemoryManager::ReadBlockImpl(GPUVAddr gpu_src_addr, void* dest_buffer,
if constexpr (is_safe) { if constexpr (is_safe) {
rasterizer->FlushRegion(cpu_addr_base, copy_amount); rasterizer->FlushRegion(cpu_addr_base, copy_amount);
} }
if (!IsBigPageContinous(page_index)) { if (!IsBigPageContinous(page_index)) [[unlikely]] {
memory.ReadBlockUnsafe(cpu_addr_base, dest_buffer, copy_amount); memory.ReadBlockUnsafe(cpu_addr_base, dest_buffer, copy_amount);
} else { } else {
u8* physical = memory.GetPointer(cpu_addr_base); u8* physical = memory.GetPointer(cpu_addr_base);
@ -407,7 +411,7 @@ void MemoryManager::WriteBlockImpl(GPUVAddr gpu_dest_addr, const void* src_buffe
if constexpr (is_safe) { if constexpr (is_safe) {
rasterizer->InvalidateRegion(cpu_addr_base, copy_amount); rasterizer->InvalidateRegion(cpu_addr_base, copy_amount);
} }
if (!IsBigPageContinous(page_index)) { if (!IsBigPageContinous(page_index)) [[unlikely]] {
memory.WriteBlockUnsafe(cpu_addr_base, src_buffer, copy_amount); memory.WriteBlockUnsafe(cpu_addr_base, src_buffer, copy_amount);
} else { } else {
u8* physical = memory.GetPointer(cpu_addr_base); u8* physical = memory.GetPointer(cpu_addr_base);