From nobody Wed Nov 5 02:54:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500950454637186.10545856333772; Mon, 24 Jul 2017 19:40:54 -0700 (PDT) Received: from localhost ([::1]:58102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZpmH-0007ja-Dd for importer@patchew.org; Mon, 24 Jul 2017 22:40:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZpiM-0004gv-Uf for qemu-devel@nongnu.org; Mon, 24 Jul 2017 22:36:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZpiL-0005nt-U8 for qemu-devel@nongnu.org; Mon, 24 Jul 2017 22:36:50 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:35269) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZpiL-0005nk-Pv for qemu-devel@nongnu.org; Mon, 24 Jul 2017 22:36:49 -0400 Received: by mail-qk0-x242.google.com with SMTP id k2so4148534qkf.2 for ; Mon, 24 Jul 2017 19:36:49 -0700 (PDT) Received: from bigtime.com ([71.217.194.233]) by smtp.gmail.com with ESMTPSA id l64sm8847707qkf.95.2017.07.24.19.36.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jul 2017 19:36:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=n5+D+MAsPGJhIi480kV6kptRXtkyE9qdIw3pzFGv+II=; b=Iew22QAYIP33hJiMGfFKlpYbWfgN+fRFayXO/42539IMteBOAMY4vIYOBV5dnLGhI6 +nuz1QQFs29rQOmv0pSucRjZpy3FdiF6coSJgnAICV4WaouYeSqpv1ejx1gzWSXXbIZi ngttmaSHEpGO91ds5cNBeLfLzXur2kyqMTrqrD8RrYh0tMLqWLPzPzmV7Xuo4eotYMFc zCs4K3iXZePzGKf0kUV6LGt3FR/7KthKbP6EwYJ7dgZ3NldkOVKAWVJzbstNLFOMqpnP RUqoUOG7GHP9d8S+8VbXLOmXGuMm+e4WrfYa3IrPXQK3LZX8scZ+BfBQ4AJcR44Xr+fY SA+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=n5+D+MAsPGJhIi480kV6kptRXtkyE9qdIw3pzFGv+II=; b=MFnSgHGc76O39XrO5ZhdJtXkmG8Z0zwzaKEMeXnHCWmfaOHy0eXknFDSHXUTdNNTYB kOWzfE+QG6QjN+Wr+TR/U23Fdo/TkN/fN7mbq2xrTMKR+gZrN22Is+WD8QS1okLzdJ1R plNxhBIOhvgsWtZPHjFykLqkCzCXQjyQOirgZQF4K/e7kluqW1zO8H7OjIfO2loumlj+ WUsyOyZ8lQkvN7CreCpS21wgxXna4riQggbIYmiPFCBpo4V8a3fnT0l0j+KwaI9VNrll a7gB+xzwWpTTQwhC9rnzAqlaol5hJkG22U22Nswjvht20BZiZKMBxVP+5H2exRQWVvs6 siow== X-Gm-Message-State: AIVw113sCCFEc4bMXY4l7xtF6XDtAkdJr6kjy0vkHB0Q5G9vPYresiSN jsmAwM4U8AyEXOJdAbM= X-Received: by 10.55.187.134 with SMTP id l128mr21922528qkf.90.1500950209097; Mon, 24 Jul 2017 19:36:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 24 Jul 2017 19:36:11 -0700 Message-Id: <20170725023611.9169-5-rth@twiddle.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170725023611.9169-1-rth@twiddle.net> References: <20170725023611.9169-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH 4/4] target/s390x: Use ilen from unwind in tlb_fill 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: david@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 026189aefd..1141f1362b 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -43,7 +43,18 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccess= Type access_type, { int ret =3D s390_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx); if (unlikely(ret !=3D 0)) { - cpu_loop_exit_restore(cs, retaddr); + cpu_restore_state(cs, retaddr); + + /* Note that handle_mmu_fault sets ilen to either 2 (for code) + or AUTO (for data). We can resolve AUTO now, as if it was + set to UNWIND -- that will have been done via assignment + in cpu_restore_state. Otherwise re-examine access_type. */ + if (access_type =3D=3D MMU_INST_FETCH) { + CPUS390XState *env =3D cs->env_ptr; + env->int_pgm_ilen =3D 2; + } + + cpu_loop_exit(cs); } } =20 --=20 2.13.3