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 /target/m68k/op_helper.c | |
| 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 'target/m68k/op_helper.c')
| -rw-r--r-- | target/m68k/op_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index ffea9693fc..3a7f7f2219 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -1056,7 +1056,7 @@ void HELPER(chk)(CPUM68KState *env, int32_t val, int32_t ub) CPUState *cs = CPU(m68k_env_get_cpu(env)); /* Recover PC and CC_OP for the beginning of the insn. */ - cpu_restore_state(cs, GETPC()); + cpu_restore_state(cs, GETPC(), true); /* flags have been modified by gen_flush_flags() */ env->cc_op = CC_OP_FLAGS; @@ -1087,7 +1087,7 @@ void HELPER(chk2)(CPUM68KState *env, int32_t val, int32_t lb, int32_t ub) CPUState *cs = CPU(m68k_env_get_cpu(env)); /* Recover PC and CC_OP for the beginning of the insn. */ - cpu_restore_state(cs, GETPC()); + cpu_restore_state(cs, GETPC(), true); /* flags have been modified by gen_flush_flags() */ env->cc_op = CC_OP_FLAGS; |