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

Allow GetPhysicalRef to hold a past-the-end offset (#6141) 

Games will sometimes use these when representing open right bounds
and so disallowing it caused regressions, with a notable example
being when MemoryFill is called to the end of vram, causing an
"invalid end address" error.
This had been noted on a comment in GetPhysicalRef prior to the
regression.
This commit is contained in:
Vitor K 2022-10-01 07:37:27 -03:00 committed by GitHub
parent 030ecaa83c
commit 6a9d36608f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/memory_ref.h
View File

@ -77,7 +77,7 @@ public:
} }
MemoryRef(std::shared_ptr<BackingMem> backing_mem_, u64 offset_) MemoryRef(std::shared_ptr<BackingMem> backing_mem_, u64 offset_)
: backing_mem(std::move(backing_mem_)), offset(offset_) { : backing_mem(std::move(backing_mem_)), offset(offset_) {
ASSERT(offset < backing_mem->GetSize()); ASSERT(offset <= backing_mem->GetSize());
Init(); Init();
} }
explicit operator bool() const { explicit operator bool() const {

2
src/core/memory.cpp
View File

@ -496,7 +496,7 @@ MemoryRef MemorySystem::GetPhysicalRef(PAddr address) const {
default: default:
UNREACHABLE(); UNREACHABLE();
} }
if (offset_into_region >= target_mem->GetSize()) { if (offset_into_region > target_mem->GetSize()) {
return {nullptr}; return {nullptr};
} }