From patchwork Mon Apr 1 10:29:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161532 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp282091jan; Mon, 1 Apr 2019 03:35:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqxqqdWi/Ha0oliG3caCbop3RW5IfjHhTPW+NpsVwHWIDr6TxC5qVkZ19X5ko7GZWgSkNvPz X-Received: by 2002:a81:9982:: with SMTP id q124mr51839681ywg.390.1554114919433; Mon, 01 Apr 2019 03:35:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554114919; cv=none; d=google.com; s=arc-20160816; b=MCpvTWUa58XGGW3RmZZfH9pLKeYTs9IlN/Sdnz62MU0297WbpnJbJB8Yf2hkxhQfjV TsmCKbqb/S6PbeobWgKZ8CPAVLQ7QKxjvupuqPBpLwil2b76f+xQgPQD52uJkgK5IMQo ZzRw0WpWRlDhYkUQpjdSUmxNiku/W2J182gc5HcBlaVj1J0HkGRtonSKB1iNnsUZfP93 PH3QSUicab0YimBx70XT9e5YJpdhERjVavp9l/iO9Y8ZlNbddzFmfnKNxGtwjsBilYOR v/vJ2twqKyv+QOnRInbYzFzdpJd8GK2yX3IdHvBEH/uLcvPSLfgbzNav2VlGRDVvirbw VK2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=DkfMTjWk07PiP5fZQCny13Xy5ICPwt1EBc+DLoGeLtk=; b=uRlfRmaTW37F/dXtT/YJn9ii4EKdLxYnBew/VkvNOramzSFj3vS0lN5cZUutnMM6hg Vx3xqPnIVnHfkf1dS2OZiuxBU97+8JIaVjNIsMAdy9VzALgUfccQS+TuvelXOpP4FpRh /MlQVEj8bUTseZhyRFt2a7jJruiqmg16/loR2EcOvuuftc5E5D+B2hgIGP/t9VvNykZH ImfZTrKwtfRpJvJXz79O2gxyqTa2G7xKaO14lZiHDH7BHHoqkpCYiFaFTkMLGZ3Nv3nE /rRVtT7JTm2Mkg94lh+UsPcB1wETJfnVdgjHNgw157mhFIlsYIDVCmGr7ki/dbQDIa2m URgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FPjW9UfY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u18si5782292ywu.334.2019.04.01.03.35.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 01 Apr 2019 03:35:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FPjW9UfY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:56508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAuHe-000879-Ta for patch@linaro.org; Mon, 01 Apr 2019 06:35:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAuBy-0003LW-1i for qemu-devel@nongnu.org; Mon, 01 Apr 2019 06:29:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hAuBw-0005s4-QM for qemu-devel@nongnu.org; Mon, 01 Apr 2019 06:29:26 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:36144) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hAuBw-0005rf-K1 for qemu-devel@nongnu.org; Mon, 01 Apr 2019 06:29:24 -0400 Received: by mail-pf1-x441.google.com with SMTP id z5so3326264pfn.3 for ; Mon, 01 Apr 2019 03:29:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DkfMTjWk07PiP5fZQCny13Xy5ICPwt1EBc+DLoGeLtk=; b=FPjW9UfY7KAK1XY6aZ6BxeeGjR8Qd8qBJdn3hEiG0OIdaVAt2x4JHjQvzzyKfuKERO 9r4v+wjIGmVqZPjrmWmM4spBVuih1bXvVH3ewCB8jLTiAR4fbQVtImoJnapKutdro6d1 9xlVQm8Mdowao+PJBZAsFZayQay0SCDxKJQs8pjzd8xalygRBwvDzulVyNULnEJ3MnDO mNNArm/S3OGSxN8R38rlGy3Jh1uyPzVSV/tVbqWABW8rcMCat4MDIdwthlA9mPrU9bkU daU18YatjrbB/+dSryyxUnxDrB337uWZ2oTVnrsJfpDw6r1ddQqTX2sEkPQWn9gYOd1M cvcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DkfMTjWk07PiP5fZQCny13Xy5ICPwt1EBc+DLoGeLtk=; b=sSRaVGYJjo2rTtJSLpFHtVmfeo89vn1Vy0+S803p0d0r3NGEwPOc5GmQGFuIl9q5iF lxJsEP+pEcZLWqHBNaEnHXt8Z2jB6FjP9FtkpvChD3kl/b/8XApoJ9i9e9u8OyQH7DsZ EUaKW6yUNyn26fwxu6kYhjDqVUvQcML95ZAh+v6TXYA6hgSiDi69SLG97eTwLf1+9ttg z1PLK1bgXYQDZTbTH0Xs0SrbJEL1H/wCbLQhJl0ZAvJJfYdKT3ab5qVizAf+tGSBxQsV XTO9/KtfeylSmP5R2h+8Y0e93XAAeTpuPZ0Ul4VL1TsarKx/YXVElNz44+QyqGcsU4W0 vNHg== X-Gm-Message-State: APjAAAXxcmnzKeNqfJXH62amJTMdJGX1+L+cLHXHQYHBvfGmjadWVMtI bbPC/sUwgSAXmFIG0tQunX8HlQI3hJwmnQ== X-Received: by 2002:a65:51c8:: with SMTP id i8mr9751852pgq.175.1554114563359; Mon, 01 Apr 2019 03:29:23 -0700 (PDT) Received: from cloudburst.imgcgcw.net ([147.50.13.10]) by smtp.gmail.com with ESMTPSA id c134sm20048203pfc.87.2019.04.01.03.29.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 03:29:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 1 Apr 2019 17:29:07 +0700 Message-Id: <20190401102911.8685-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190401102911.8685-1-richard.henderson@linaro.org> References: <20190401102911.8685-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::441 Subject: [Qemu-devel] [PATCH for-4.1 2/6] target/s390x: Add ilen to unwind data X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, cohuck@redhat.com, Richard Henderson , david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson 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 --- target/s390x/cpu.h | 4 +++- target/s390x/internal.h | 2 +- target/s390x/interrupt.c | 7 +++++-- target/s390x/translate.c | 10 +++++++++- 4 files changed, 18 insertions(+), 5 deletions(-) -- 2.17.1 Reviewed-by: David Hildenbrand diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 6ccf41fc45..1498f3b7f4 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -44,7 +44,7 @@ #include "exec/cpu-all.h" #define NB_MMU_MODES 4 -#define TARGET_INSN_START_EXTRA_WORDS 1 +#define TARGET_INSN_START_EXTRA_WORDS 2 #define MMU_MODE0_SUFFIX _primary #define MMU_MODE1_SUFFIX _secondary @@ -787,6 +787,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/internal.h b/target/s390x/internal.h index 3b4855c175..5f7901da5e 100644 --- a/target/s390x/internal.h +++ b/target/s390x/internal.h @@ -312,7 +312,7 @@ void cpu_unmap_lowcore(LowCore *lowcore); /* interrupt.c */ -void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen); +void trigger_pgm_exception(CPUS390XState *env, uint32_t code, int ilen); void cpu_inject_clock_comparator(S390CPU *cpu); void cpu_inject_cpu_timer(S390CPU *cpu); void cpu_inject_emergency_signal(S390CPU *cpu, uint16_t src_cpu_addr); diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c index a17eff5ebc..901cd713de 100644 --- a/target/s390x/interrupt.c +++ b/target/s390x/interrupt.c @@ -21,13 +21,16 @@ #endif /* Ensure to exit the TB after this call! */ -void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen) +void trigger_pgm_exception(CPUS390XState *env, uint32_t code, int ilen) { CPUState *cs = CPU(s390_env_get_cpu(env)); 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 d22d0f7643..6f9cd19126 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -57,6 +57,7 @@ struct DisasContext { DisasContextBase base; const DisasInsn *insn; DisasFields *fields; + TCGOp *insn_start; uint64_t ex_value; /* * During translate_one(), pc_tmp is used to determine the instruction @@ -6220,6 +6221,7 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s, } s->pc_tmp = s->base.pc_next + ilen; s->ilen = ilen; + tcg_set_insn_param(s->insn_start, 2, ilen); /* We can't actually determine the insn format until we've looked up the full insn opcode. Which we can't do without locating the @@ -6455,7 +6457,12 @@ 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); + /* + * ??? Alternately, delay emitting insn_start until after we + * have computed the insn length in extract_insn. + */ + tcg_gen_insn_start(dc->base.pc_next, dc->cc_op, 0); + dc->insn_start = tcg_last_op(); } static bool s390x_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *cs, @@ -6561,4 +6568,5 @@ void restore_state_to_opc(CPUS390XState *env, TranslationBlock *tb, if ((cc_op != CC_OP_DYNAMIC) && (cc_op != CC_OP_STATIC)) { env->cc_op = cc_op; } + env->int_pgm_ilen = data[2]; }