diff options
| author | 2019-04-07 02:43:49 -0400 | |
|---|---|---|
| committer | 2019-04-07 02:43:51 -0400 | |
| commit | a6a82bb004b9b16a80a35c433de4a87e566b3be3 (patch) | |
| tree | e1e883f1c97221d7181cf471bc84a7e700611659 | |
| parent | kernel: Handle page table switching within MakeCurrentProcess() (diff) | |
| download | yuzu-a6a82bb004b9b16a80a35c433de4a87e566b3be3.tar.gz yuzu-a6a82bb004b9b16a80a35c433de4a87e566b3be3.tar.xz yuzu-a6a82bb004b9b16a80a35c433de4a87e566b3be3.zip | |
arm/arm_dynarmic: Remove unnecessary current_page_table member
Given the page table will always be guaranteed to be that of whatever
the current process is, we no longer need to keep this around.
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 2 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.h | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index f64e4c6a6..49145911b 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp | |||
| @@ -163,7 +163,6 @@ MICROPROFILE_DEFINE(ARM_Jit_Dynarmic, "ARM JIT", "Dynarmic", MP_RGB(255, 64, 64) | |||
| 163 | 163 | ||
| 164 | void ARM_Dynarmic::Run() { | 164 | void ARM_Dynarmic::Run() { |
| 165 | MICROPROFILE_SCOPE(ARM_Jit_Dynarmic); | 165 | MICROPROFILE_SCOPE(ARM_Jit_Dynarmic); |
| 166 | ASSERT(Memory::GetCurrentPageTable() == current_page_table); | ||
| 167 | 166 | ||
| 168 | jit->Run(); | 167 | jit->Run(); |
| 169 | } | 168 | } |
| @@ -278,7 +277,6 @@ void ARM_Dynarmic::ClearExclusiveState() { | |||
| 278 | 277 | ||
| 279 | void ARM_Dynarmic::PageTableChanged() { | 278 | void ARM_Dynarmic::PageTableChanged() { |
| 280 | jit = MakeJit(); | 279 | jit = MakeJit(); |
| 281 | current_page_table = Memory::GetCurrentPageTable(); | ||
| 282 | } | 280 | } |
| 283 | 281 | ||
| 284 | DynarmicExclusiveMonitor::DynarmicExclusiveMonitor(std::size_t core_count) : monitor(core_count) {} | 282 | DynarmicExclusiveMonitor::DynarmicExclusiveMonitor(std::size_t core_count) : monitor(core_count) {} |
diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h index 81e0b4ac0..d867c2a50 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.h +++ b/src/core/arm/dynarmic/arm_dynarmic.h | |||
| @@ -12,10 +12,6 @@ | |||
| 12 | #include "core/arm/exclusive_monitor.h" | 12 | #include "core/arm/exclusive_monitor.h" |
| 13 | #include "core/arm/unicorn/arm_unicorn.h" | 13 | #include "core/arm/unicorn/arm_unicorn.h" |
| 14 | 14 | ||
| 15 | namespace Common { | ||
| 16 | struct PageTable; | ||
| 17 | } | ||
| 18 | |||
| 19 | namespace Core::Timing { | 15 | namespace Core::Timing { |
| 20 | class CoreTiming; | 16 | class CoreTiming; |
| 21 | } | 17 | } |
| @@ -69,8 +65,6 @@ private: | |||
| 69 | std::size_t core_index; | 65 | std::size_t core_index; |
| 70 | Timing::CoreTiming& core_timing; | 66 | Timing::CoreTiming& core_timing; |
| 71 | DynarmicExclusiveMonitor& exclusive_monitor; | 67 | DynarmicExclusiveMonitor& exclusive_monitor; |
| 72 | |||
| 73 | Common::PageTable* current_page_table = nullptr; | ||
| 74 | }; | 68 | }; |
| 75 | 69 | ||
| 76 | class DynarmicExclusiveMonitor final : public ExclusiveMonitor { | 70 | class DynarmicExclusiveMonitor final : public ExclusiveMonitor { |