diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-05-17 13:35:20 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-05-17 13:35:20 -0400 |
| commit | 3fac6dc39e6e94aa068d93535261eede97224e50 (patch) | |
| tree | 41b5a266814d633b94d090f13bc46c89e8f7f622 /src/core/arm/interpreter/armemu.cpp | |
| parent | 14ae026386cf3f984d60401e2104165c3ca3266b (diff) | |
| parent | 265c770a9d663b96a9a422201bac3dd454fa95c0 (diff) | |
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: else if (state->Emulate != RUN) break; } - while (!state->stop_simulator); + while (state->NumInstrsToExecute--); state->decoded = decoded; state->loaded = loaded; |