diff options
| author |  bunnei | 2014-05-17 13:35:20 -0400 |
|---|---|---|
| committer | bunnei | 2014-05-17 13:35:20 -0400 |
| commit | 3fac6dc39e6e94aa068d93535261eede97224e50 (patch) | |
| tree | 41b5a266814d633b94d090f13bc46c89e8f7f622 /src/core/arm/interpreter/armemu.cpp | |
| parent | - added enum ThreadProcessorId (diff) | |
| parent | updated how we call ARM core to make things much faster (diff) | |
| download | yuzu-3fac6dc39e6e94aa068d93535261eede97224e50.tar.gz yuzu-3fac6dc39e6e94aa068d93535261eede97224e50.tar.xz yuzu-3fac6dc39e6e94aa068d93535261eede97224e50.zip | |
Merge branch 'master' into threading
Diffstat (limited to 'src/core/arm/interpreter/armemu.cpp')
| -rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index 87141653f..32e315f4b 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp | |||
| @@ -4734,7 +4734,7 @@ TEST_EMULATE: | |||
| 4734 | else if (state->Emulate != RUN) | 4734 | else if (state->Emulate != RUN) |
| 4735 | break; | 4735 | break; |
| 4736 | } | 4736 | } |
| 4737 | while (!state->stop_simulator); | 4737 | while (state->NumInstrsToExecute--); |
| 4738 | 4738 | ||
| 4739 | state->decoded = decoded; | 4739 | state->decoded = decoded; |
| 4740 | state->loaded = loaded; | 4740 | state->loaded = loaded; |