diff options
| author | Peter Maydell | 2018-04-11 15:23:56 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-04-11 15:23:56 +0200 |
| commit | 6523eaca378df1455481f1cec65ada589d65df0e (patch) | |
| tree | bcab49b7b0fe2a58cc38729c94477e03b2dde022 /hw | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-2.12-pull-r... (diff) | |
| parent | icount: fix cpu_restore_state_from_tb for non-tb-exit cases (diff) | |
| download | qemu-6523eaca378df1455481f1cec65ada589d65df0e.tar.gz qemu-6523eaca378df1455481f1cec65ada589d65df0e.tar.xz qemu-6523eaca378df1455481f1cec65ada589d65df0e.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180411' into staging
Handle read-modify-write i/o with icount
# gpg: Signature made Wed 11 Apr 2018 00:07:23 BST
# gpg: using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-tcg-20180411:
icount: fix cpu_restore_state_from_tb for non-tb-exit cases
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/misc/mips_itu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c index ef935b51a8..c84a48bbb7 100644 --- a/hw/misc/mips_itu.c +++ b/hw/misc/mips_itu.c @@ -174,10 +174,9 @@ static void wake_blocked_threads(ITCStorageCell *c) static void QEMU_NORETURN block_thread_and_exit(ITCStorageCell *c) { c->blocked_threads |= 1ULL << current_cpu->cpu_index; - cpu_restore_state(current_cpu, current_cpu->mem_io_pc); current_cpu->halted = 1; current_cpu->exception_index = EXCP_HLT; - cpu_loop_exit(current_cpu); + cpu_loop_exit_restore(current_cpu, current_cpu->mem_io_pc); } /* ITC Bypass View */ |