The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-23 20:11:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle unmapped ranges in TranslateRange

Browse Source
This commit is contained in:
Billy Laws 2022-09-29 20:20:57 +01:00
parent acfa58ea8c
commit b310b99bdc
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/cpp/skyline/common/address_space.h
View File

@ -113,6 +113,9 @@ namespace skyline {
std::pair<span<u8>, size_t> LookupBlockLocked(VaType virt, std::function<void(span<u8>)> cpuAccessCallback = {}) { std::pair<span<u8>, size_t> LookupBlockLocked(VaType virt, std::function<void(span<u8>)> cpuAccessCallback = {}) {
const auto &blockEntry{this->blockSegmentTable[virt]}; const auto &blockEntry{this->blockSegmentTable[virt]};
if (blockEntry.phys == nullptr)
return {span<u8>{}, 0};
VaType segmentOffset{virt - blockEntry.virt}; VaType segmentOffset{virt - blockEntry.virt};
span<u8> blockSpan{blockEntry.phys, blockEntry.extent}; span<u8> blockSpan{blockEntry.phys, blockEntry.extent};
if (cpuAccessCallback) if (cpuAccessCallback)

12
app/src/main/cpp/skyline/common/address_space.inc
View File

@ -248,11 +248,15 @@ namespace skyline {
blockPhys = sparseMap; blockPhys = sparseMap;
} }
span cpuBlock{blockPhys, blockSize}; if (predecessor->phys) {
if (cpuAccessCallback) span cpuBlock{blockPhys, blockSize};
cpuAccessCallback(cpuBlock); if (cpuAccessCallback)
cpuAccessCallback(cpuBlock);
ranges.push_back(cpuBlock); ranges.push_back(cpuBlock);
} else {
ranges.push_back(span<u8>{static_cast<u8*>(nullptr), blockSize});
}
size -= blockSize; size -= blockSize;