diff options
| author |  bunnei | 2018-08-13 12:18:51 -0400 |
|---|---|---|
| committer |  GitHub | 2018-08-13 12:18:51 -0400 |
| commit | 875d52a81f2beb65875b56fd3b104779d413962e (patch) | |
| tree | 4d4be4a781170feb1feb12e8fcc89a314e0f03c6 /src | |
| parent | Merge pull request #1049 from bunnei/vtx-size-8 (diff) | |
| parent | arm_dynarmic: Remove IsExecuting check from PrepareReschedule (diff) | |
| download | yuzu-875d52a81f2beb65875b56fd3b104779d413962e.tar.gz yuzu-875d52a81f2beb65875b56fd3b104779d413962e.tar.xz yuzu-875d52a81f2beb65875b56fd3b104779d413962e.zip | |
Merge pull request #1053 from MerryMage/rm-IsExecuting
arm_dynarmic: Remove IsExecuting check from PrepareReschedule
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 0996f129c..20e5200a8 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp | |||
| @@ -243,9 +243,7 @@ void ARM_Dynarmic::LoadContext(const ThreadContext& ctx) { | |||
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | void ARM_Dynarmic::PrepareReschedule() { | 245 | void ARM_Dynarmic::PrepareReschedule() { |
| 246 | if (jit->IsExecuting()) { | 246 | jit->HaltExecution(); |
| 247 | jit->HaltExecution(); | ||
| 248 | } | ||
| 249 | } | 247 | } |
| 250 | 248 | ||
| 251 | void ARM_Dynarmic::ClearInstructionCache() { | 249 | void ARM_Dynarmic::ClearInstructionCache() { |