[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/12] target/s390x: Exit after changing PSW mask
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 11/12] target/s390x: Exit after changing PSW mask |
Date: |
Mon, 19 Jun 2017 11:18:38 -0700 |
Exit to cpu loop so we reevaluate cpu_s390x_hw_interrupts.
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/translate.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 8c055b7..6403542 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -1173,6 +1173,8 @@ typedef enum {
/* We are exiting the TB, but have neither emitted a goto_tb, nor
updated the PC for the next instruction to be executed. */
EXIT_PC_STALE,
+ /* We are exiting the TB to the main loop. */
+ EXIT_PC_STALE_NOCHAIN,
/* We are ending the TB with a noreturn function call, e.g. longjmp.
No following code will be executed. */
EXIT_NORETURN,
@@ -3795,7 +3797,8 @@ static ExitStatus op_ssm(DisasContext *s, DisasOps *o)
{
check_privileged(s);
tcg_gen_deposit_i64(psw_mask, psw_mask, o->in2, 56, 8);
- return NO_EXIT;
+ /* Exit to main loop to reevaluate s390_cpu_exec_interrupt. */
+ return EXIT_PC_STALE_NOCHAIN;
}
static ExitStatus op_stap(DisasContext *s, DisasOps *o)
@@ -4038,7 +4041,9 @@ static ExitStatus op_stnosm(DisasContext *s, DisasOps *o)
} else {
tcg_gen_ori_i64(psw_mask, psw_mask, i2 << 56);
}
- return NO_EXIT;
+
+ /* Exit to main loop to reevaluate s390_cpu_exec_interrupt. */
+ return EXIT_PC_STALE_NOCHAIN;
}
static ExitStatus op_stura(DisasContext *s, DisasOps *o)
@@ -5788,6 +5793,7 @@ void gen_intermediate_code(CPUS390XState *env, struct
TranslationBlock *tb)
case EXIT_NORETURN:
break;
case EXIT_PC_STALE:
+ case EXIT_PC_STALE_NOCHAIN:
update_psw_addr(&dc);
/* FALLTHRU */
case EXIT_PC_UPDATED:
@@ -5799,14 +5805,14 @@ void gen_intermediate_code(CPUS390XState *env, struct
TranslationBlock *tb)
/* Exit the TB, either by raising a debug exception or by return. */
if (do_debug) {
gen_exception(EXCP_DEBUG);
- } else if (use_exit_tb(&dc)) {
+ } else if (use_exit_tb(&dc) || status == EXIT_PC_STALE_NOCHAIN) {
tcg_gen_exit_tb(0);
} else {
tcg_gen_lookup_and_goto_ptr(psw_addr);
}
break;
default:
- abort();
+ g_assert_not_reached();
}
gen_tb_end(tb, num_insns);
--
2.9.4
- [Qemu-devel] [PULL 01/12] util: add cacheinfo, (continued)
- [Qemu-devel] [PULL 01/12] util: add cacheinfo, Richard Henderson, 2017/06/19
- [Qemu-devel] [PULL 03/12] translate-all: consolidate tb init in tb_gen_code, Richard Henderson, 2017/06/19
- [Qemu-devel] [PULL 04/12] tcg/aarch64: Use ADR in tcg_out_movi, Richard Henderson, 2017/06/19
- [Qemu-devel] [PULL 05/12] tcg/arm: Use indirect branch for goto_tb, Richard Henderson, 2017/06/19
- [Qemu-devel] [PULL 06/12] tcg/arm: Remove limit on code buffer size, Richard Henderson, 2017/06/19
- [Qemu-devel] [PULL 02/12] tcg: allocate TB structs before the corresponding translated code, Richard Henderson, 2017/06/19
- [Qemu-devel] [PULL 09/12] tcg: Increase hit rate of lookup_tb_ptr, Richard Henderson, 2017/06/19
- [Qemu-devel] [PULL 07/12] tcg/arm: Try pc-relative addresses for movi, Richard Henderson, 2017/06/19
- [Qemu-devel] [PULL 08/12] tcg/arm: Use ldr (literal) for goto_tb, Richard Henderson, 2017/06/19
- [Qemu-devel] [PULL 10/12] target/alpha: Use tcg_gen_lookup_and_goto_ptr, Richard Henderson, 2017/06/19
- [Qemu-devel] [PULL 11/12] target/s390x: Exit after changing PSW mask,
Richard Henderson <=
- [Qemu-devel] [PULL 12/12] target/arm: Exit after clearing aarch64 interrupt mask, Richard Henderson, 2017/06/19
- Re: [Qemu-devel] [PULL 00/12] TCG queued patches, Peter Maydell, 2017/06/22