diff options
| author | bunnei <bunneidev@gmail.com> | 2021-03-24 01:08:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 01:08:37 +0100 |
| commit | 716285fab8830938de6f4e9cbcb408910964c202 (patch) | |
| tree | 70abf5991b934beda2a9341d8d39e5b72bfc625f | |
| parent | Merge pull request #6092 from ivan-boikov/cancel-dir-select (diff) | |
| parent | core: arm_dynarmic: Ensure JIT state is saved/restored on page table changes. (diff) | |
| download | yuzu-716285fab8830938de6f4e9cbcb408910964c202.tar yuzu-716285fab8830938de6f4e9cbcb408910964c202.tar.gz yuzu-716285fab8830938de6f4e9cbcb408910964c202.tar.bz2 yuzu-716285fab8830938de6f4e9cbcb408910964c202.tar.lz yuzu-716285fab8830938de6f4e9cbcb408910964c202.tar.xz yuzu-716285fab8830938de6f4e9cbcb408910964c202.tar.zst yuzu-716285fab8830938de6f4e9cbcb408910964c202.zip | |
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 5 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_64.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index ec4407b6e..53d78de32 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -306,13 +306,18 @@ void ARM_Dynarmic_32::ClearExclusiveState() { void ARM_Dynarmic_32::PageTableChanged(Common::PageTable& page_table, std::size_t new_address_space_size_in_bits) { + ThreadContext32 ctx{}; + SaveContext(ctx); + auto key = std::make_pair(&page_table, new_address_space_size_in_bits); auto iter = jit_cache.find(key); if (iter != jit_cache.end()) { jit = iter->second; + LoadContext(ctx); return; } jit = MakeJit(page_table, new_address_space_size_in_bits); + LoadContext(ctx); jit_cache.emplace(key, jit); } diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index ae5566ab8..b36b7d918 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -348,13 +348,18 @@ void ARM_Dynarmic_64::ClearExclusiveState() { void ARM_Dynarmic_64::PageTableChanged(Common::PageTable& page_table, std::size_t new_address_space_size_in_bits) { + ThreadContext64 ctx{}; + SaveContext(ctx); + auto key = std::make_pair(&page_table, new_address_space_size_in_bits); auto iter = jit_cache.find(key); if (iter != jit_cache.end()) { jit = iter->second; + LoadContext(ctx); return; } jit = MakeJit(page_table, new_address_space_size_in_bits); + LoadContext(ctx); jit_cache.emplace(key, jit); } |