Citra-emu/dynarmic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emit_x64: InvalidateCacheRanges: erase blocks after iterating through the map (#124)

Browse Source
This commit is contained in:
Phanto-m 2017-12-18 16:13:40 +01:00 committed by Merry
parent ce9c265df0
commit 672069608f
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend_x64/emit_x64.cpp
View File

@ -5,6 +5,7 @@
*/ */
#include <unordered_map> #include <unordered_map>
#include <unordered_set>
#include <dynarmic/coprocessor.h> #include <dynarmic/coprocessor.h>
@ -3584,23 +3585,36 @@ void EmitX64::EmitPatchMovRcx(CodePtr target_code_ptr) {
} }
void EmitX64::ClearCache() { void EmitX64::ClearCache() {
block_ranges.clear();
block_descriptors.clear(); block_descriptors.clear();
patch_information.clear(); patch_information.clear();
} }
void EmitX64::InvalidateCacheRanges(const boost::icl::interval_set<u32>& ranges) { void EmitX64::InvalidateCacheRanges(const boost::icl::interval_set<u32>& ranges) {
// Remove cached block descriptors and patch information overlapping with the given range. // Remove cached block descriptors and patch information overlapping with the given range.
std::unordered_set<IR::LocationDescriptor> erase_locations;
for (auto invalidate_interval : ranges) { for (auto invalidate_interval : ranges) {
auto pair = block_ranges.equal_range(invalidate_interval); auto pair = block_ranges.equal_range(invalidate_interval);
for (auto it = pair.first; it != pair.second; ++it) { for (auto it = pair.first; it != pair.second; ++it) {
for (const auto& descriptor : it->second) { for (const auto &descriptor : it->second) {
if (patch_information.count(descriptor.UniqueHash())) { erase_locations.insert(descriptor);
Unpatch(descriptor);
}
block_descriptors.erase(descriptor.UniqueHash());
} }
} }
block_ranges.erase(pair.first, pair.second); }
for (const auto &descriptor : erase_locations) {
auto it = block_descriptors.find(descriptor.UniqueHash());
if (it == block_descriptors.end()) {
continue;
}
if (patch_information.count(descriptor.UniqueHash())) {
Unpatch(descriptor);
}
block_ranges.subtract(std::make_pair(
boost::icl::discrete_interval<u32>::closed(
it->second.start_location.PC(), it->second.end_location_pc - 1),
std::set<IR::LocationDescriptor>{descriptor}));
block_descriptors.erase(it);
} }
} }