[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/21] target/s390x: Skip wout, cout helpers if op he
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 19/21] target/s390x: Skip wout, cout helpers if op helper does not return |
Date: |
Tue, 16 Oct 2018 10:49:09 -0700 |
When op raises an exception, it may not have initialized the output
temps that would be written back by wout or cout.
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/translate.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 18861cd186..a7bd689337 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -1128,11 +1128,19 @@ struct DisasInsn {
const char *name;
+ /* Pre-process arguments before HELP_OP. */
void (*help_in1)(DisasContext *, DisasFields *, DisasOps *);
void (*help_in2)(DisasContext *, DisasFields *, DisasOps *);
void (*help_prep)(DisasContext *, DisasFields *, DisasOps *);
+
+ /*
+ * Post-process output after HELP_OP.
+ * Note that these are not called if HELP_OP returns DISAS_NORETURN.
+ */
void (*help_wout)(DisasContext *, DisasFields *, DisasOps *);
void (*help_cout)(DisasContext *, DisasOps *);
+
+ /* Implement the operation itself. */
DisasJumpType (*help_op)(DisasContext *, DisasOps *);
uint64_t data;
@@ -6125,11 +6133,13 @@ static DisasJumpType translate_one(CPUS390XState *env,
DisasContext *s)
if (insn->help_op) {
ret = insn->help_op(s, &o);
}
- if (insn->help_wout) {
- insn->help_wout(s, &f, &o);
- }
- if (insn->help_cout) {
- insn->help_cout(s, &o);
+ if (ret != DISAS_NORETURN) {
+ if (insn->help_wout) {
+ insn->help_wout(s, &f, &o);
+ }
+ if (insn->help_cout) {
+ insn->help_cout(s, &o);
+ }
}
/* Free any temporaries created by the helpers. */
--
2.17.2
- [Qemu-devel] [PULL 13/21] target/i386: Convert to HAVE_CMPXCHG128, (continued)
- [Qemu-devel] [PULL 13/21] target/i386: Convert to HAVE_CMPXCHG128, Richard Henderson, 2018/10/16
- [Qemu-devel] [PULL 08/21] exec: introduce tlb_init, Richard Henderson, 2018/10/16
- [Qemu-devel] [PULL 05/21] tcg: distribute tcg_time into TCG contexts, Richard Henderson, 2018/10/16
- [Qemu-devel] [PULL 06/21] target/alpha: remove tlb_flush from alpha_cpu_initfn, Richard Henderson, 2018/10/16
- [Qemu-devel] [PULL 02/21] tcg: access cpu->icount_decr.u16.high with atomics, Richard Henderson, 2018/10/16
- [Qemu-devel] [PULL 17/21] target/s390x: Convert to HAVE_CMPXCHG128 and HAVE_ATOMIC128, Richard Henderson, 2018/10/16
- [Qemu-devel] [PULL 18/21] target/s390x: Split do_cdsg, do_lpq, do_stpq, Richard Henderson, 2018/10/16
- [Qemu-devel] [PULL 10/21] cputlb: serialize tlb updates with env->tlb_lock, Richard Henderson, 2018/10/16
- [Qemu-devel] [PULL 20/21] target/s390x: Check HAVE_ATOMIC128 and HAVE_CMPXCHG128 at translate, Richard Henderson, 2018/10/16
- [Qemu-devel] [PULL 11/21] tcg: Add tlb_index and tlb_entry helpers, Richard Henderson, 2018/10/16
- [Qemu-devel] [PULL 19/21] target/s390x: Skip wout, cout helpers if op helper does not return,
Richard Henderson <=
- [Qemu-devel] [PULL 21/21] cputlb: read CPUTLBEntry.addr_write atomically, Richard Henderson, 2018/10/16
- Re: [Qemu-devel] [PULL 00/21] tcg patch queue, Peter Maydell, 2018/10/18