From: David Hildenbrand <david@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>,
David Hildenbrand <david@redhat.com>,
Cornelia Huck <cohuck@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
qemu-s390x@nongnu.org, Richard Henderson <rth@twiddle.net>
Subject: [PULL 13/31] target/s390x: Add ilen to unwind data
Date: Thu, 10 Oct 2019 13:33:38 +0200 [thread overview]
Message-ID: <20191010113356.5017-14-david@redhat.com> (raw)
In-Reply-To: <20191010113356.5017-1-david@redhat.com>
From: Richard Henderson <rth@twiddle.net>
Use ILEN_UNWIND to signal that we have in fact that cpu_restore_state
will have been called by the time we arrive in do_program_interrupt.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Message-Id: <20191001171614.8405-2-richard.henderson@linaro.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
target/s390x/cpu.h | 4 +++-
target/s390x/interrupt.c | 5 ++++-
target/s390x/translate.c | 20 +++++++++++++++++---
3 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index b907741858..1a5b1397da 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -34,7 +34,7 @@
/* The z/Architecture has a strong memory model with some store-after-load re-ordering */
#define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD)
-#define TARGET_INSN_START_EXTRA_WORDS 1
+#define TARGET_INSN_START_EXTRA_WORDS 2
#define MMU_MODE0_SUFFIX _primary
#define MMU_MODE1_SUFFIX _secondary
@@ -804,6 +804,8 @@ int cpu_s390x_signal_handler(int host_signum, void *pinfo, void *puc);
void s390_crw_mchk(void);
void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr,
uint32_t io_int_parm, uint32_t io_int_word);
+/* instruction length set by unwind info */
+#define ILEN_UNWIND 0
/* automatically detect the instruction length */
#define ILEN_AUTO 0xff
#define RA_IGNORED 0
diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c
index a841f7187d..30a9fb8852 100644
--- a/target/s390x/interrupt.c
+++ b/target/s390x/interrupt.c
@@ -28,7 +28,10 @@ void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen)
cs->exception_index = EXCP_PGM;
env->int_pgm_code = code;
- env->int_pgm_ilen = ilen;
+ /* If ILEN_UNWIND, int_pgm_ilen already has the correct value. */
+ if (ilen != ILEN_UNWIND) {
+ env->int_pgm_ilen = ilen;
+ }
}
void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen,
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index a3e43ff9ec..151dfa91fb 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -6309,6 +6309,9 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
/* Search for the insn in the table. */
insn = extract_insn(env, s, &f);
+ /* Emit insn_start now that we know the ILEN. */
+ tcg_gen_insn_start(s->base.pc_next, s->cc_op, s->ilen);
+
/* Not found means unimplemented/illegal opcode. */
if (insn == NULL) {
qemu_log_mask(LOG_UNIMP, "unimplemented opcode 0x%02x%02x\n",
@@ -6463,9 +6466,6 @@ static void s390x_tr_tb_start(DisasContextBase *db, CPUState *cs)
static void s390x_tr_insn_start(DisasContextBase *dcbase, CPUState *cs)
{
- DisasContext *dc = container_of(dcbase, DisasContext, base);
-
- tcg_gen_insn_start(dc->base.pc_next, dc->cc_op);
}
static bool s390x_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *cs,
@@ -6473,6 +6473,14 @@ static bool s390x_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *cs,
{
DisasContext *dc = container_of(dcbase, DisasContext, base);
+ /*
+ * Emit an insn_start to accompany the breakpoint exception.
+ * The ILEN value is a dummy, since this does not result in
+ * an s390x exception, but an internal qemu exception which
+ * brings us back to interact with the gdbstub.
+ */
+ tcg_gen_insn_start(dc->base.pc_next, dc->cc_op, 2);
+
dc->base.is_jmp = DISAS_PC_STALE;
dc->do_debug = true;
/* The address covered by the breakpoint must be included in
@@ -6567,8 +6575,14 @@ void restore_state_to_opc(CPUS390XState *env, TranslationBlock *tb,
target_ulong *data)
{
int cc_op = data[1];
+
env->psw.addr = data[0];
+
+ /* Update the CC opcode if it is not already up-to-date. */
if ((cc_op != CC_OP_DYNAMIC) && (cc_op != CC_OP_STATIC)) {
env->cc_op = cc_op;
}
+
+ /* Record ILEN. */
+ env->int_pgm_ilen = data[2];
}
--
2.21.0
next prev parent reply other threads:[~2019-10-10 11:48 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 11:33 [PULL 00/31] s390x/tcg update David Hildenbrand
2019-10-10 11:33 ` [PULL 01/31] s390x/mmu: Drop debug logging from MMU code David Hildenbrand
2019-10-10 11:33 ` [PULL 02/31] s390x/mmu: Move DAT protection handling out of mmu_translate_asce() David Hildenbrand
2019-10-10 11:33 ` [PULL 03/31] s390x/mmu: Inject DAT exceptions from a single place David Hildenbrand
2019-10-10 11:33 ` [PULL 04/31] s390x/mmu: Inject PGM_ADDRESSING on bogus table addresses David Hildenbrand
2019-10-10 11:33 ` [PULL 05/31] s390x/mmu: Use TARGET_PAGE_MASK in mmu_translate_pte() David Hildenbrand
2019-10-10 11:33 ` [PULL 06/31] s390x/mmu: DAT table definition overhaul David Hildenbrand
2019-10-10 11:33 ` [PULL 07/31] s390x/mmu: Convert to non-recursive page table walk David Hildenbrand
2019-10-10 11:33 ` [PULL 08/31] s390x/mmu: Add EDAT2 translation support David Hildenbrand
2019-10-10 11:33 ` [PULL 09/31] s390x/mmu: Implement ESOP-2 and access-exception-fetch/store-indication facility David Hildenbrand
2019-10-10 11:33 ` [PULL 10/31] s390x/mmu: Implement Instruction-Execution-Protection Facility David Hildenbrand
2019-10-10 11:33 ` [PULL 11/31] s390x/cpumodel: Prepare for changes of QEMU model David Hildenbrand
2019-10-10 11:33 ` [PULL 12/31] s390x/cpumodel: Add new TCG features to QEMU cpu model David Hildenbrand
2019-10-10 11:33 ` David Hildenbrand [this message]
2019-10-10 11:33 ` [PULL 14/31] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt David Hildenbrand
2019-10-10 11:33 ` [PULL 15/31] target/s390x: Remove ilen parameter from s390_program_interrupt David Hildenbrand
2019-10-10 11:33 ` [PULL 16/31] target/s390x: Use tcg_s390_program_interrupt in TCG helpers David Hildenbrand
2019-10-10 11:33 ` [PULL 17/31] target/s390x: Push trigger_pgm_exception lower in s390_cpu_tlb_fill David Hildenbrand
2019-10-10 11:33 ` [PULL 18/31] target/s390x: Handle tec " David Hildenbrand
2019-10-10 11:33 ` [PULL 19/31] target/s390x: Return exception from mmu_translate_real David Hildenbrand
2019-10-17 11:57 ` Peter Maydell
2019-10-17 12:05 ` Peter Maydell
2019-10-17 12:13 ` David Hildenbrand
2019-10-10 11:33 ` [PULL 20/31] target/s390x: Remove exc argument to mmu_translate_asce David Hildenbrand
2019-10-10 11:33 ` [PULL 21/31] target/s390x: Return exception from mmu_translate David Hildenbrand
2019-10-10 11:33 ` [PULL 22/31] target/s390x: Return exception from translate_pages David Hildenbrand
2019-10-10 11:33 ` [PULL 23/31] target/s390x: Remove fail variable from s390_cpu_tlb_fill David Hildenbrand
2019-10-10 11:33 ` [PULL 24/31] target/s390x: Simplify helper_lra David Hildenbrand
2019-10-10 11:33 ` [PULL 25/31] target/s390x: Rely on unwinding in s390_cpu_tlb_fill David Hildenbrand
2019-10-10 11:33 ` [PULL 26/31] target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw David Hildenbrand
2019-10-10 11:33 ` [PULL 27/31] target/s390x: Remove ILEN_AUTO David Hildenbrand
2019-10-10 11:33 ` [PULL 28/31] target/s390x: Remove ilen argument from trigger_access_exception David Hildenbrand
2019-10-10 11:33 ` [PULL 29/31] target/s390x: Remove ilen argument from trigger_pgm_exception David Hildenbrand
2019-10-10 11:33 ` [PULL 30/31] target/s390x: Remove ILEN_UNWIND David Hildenbrand
2019-10-10 11:33 ` [PULL 31/31] s390x/tcg: MVCL: Exit to main loop if requested David Hildenbrand
2019-10-10 12:33 ` [PULL 00/31] s390x/tcg update no-reply
2019-10-10 13:11 ` David Hildenbrand
2019-10-14 11:26 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191010113356.5017-14-david@redhat.com \
--to=david@redhat.com \
--cc=cohuck@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).