From nobody Wed Nov 5 17:27:42 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.zoho.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 1496796693866189.63991346688044; Tue, 6 Jun 2017 17:51:33 -0700 (PDT) Received: from localhost ([::1]:40640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIPC6-0003yY-Hr for importer@patchew.org; Tue, 06 Jun 2017 20:51:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOtF-0002j4-LU for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOtE-00021U-P3 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:01 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:36005) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOtE-00021B-LT for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:00 -0400 Received: by mail-qt0-x241.google.com with SMTP id s33so19304141qtg.3 for ; Tue, 06 Jun 2017 17:32:00 -0700 (PDT) Received: from bigtime.twiddle.net.com (71-217-91-69.tukw.qwest.net. [71.217.91.69]) by smtp.gmail.com with ESMTPSA id m47sm29286qtc.36.2017.06.06.17.31.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:58 -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=bFGlzYX490reNPMP/xRgGHIVaTvUEv8Kv0Q+zLgfYKA=; b=rAJZ1fucsNaiNxd5vmf4KQcH1rCH0+YWZPVNsAEal3oepOYGDr9G9fnnfkmil1iIdK mLdsVPzB5oYJr4zm0WwxKmWfAAAOz+m8eJzJj8jb9wSn046gfu2tHfxDR1iBjNIFv7Eg OsBVtAYoTmaOB7+41SHZTraSdzYWS07RmnnKmf4SvoHbbbwrfw7VlmQZ7El/1ym4THAH S/+iLwA9l2eCAiMiXAnwx2zMrlkM5ody16L5X7PbLaHABUrEY3EJJkGMFHiyfbxaYKYy 7TLvtKpVOMMrlcjxAQeFVLwtyA7vznxK5VO/MntS4dRyp6CKt7ig9R98g+wdmcOPKyUD u53w== 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=bFGlzYX490reNPMP/xRgGHIVaTvUEv8Kv0Q+zLgfYKA=; b=BwQ97weC45ruA1tjI2b2eLyJBhUU4hjQAIP6/Wm9uqP7OmTUZw/iieFi3Yk2BGJsnx mjXBqqJSXFHiJQ8fljQDXRNvJZfvfRKWP01zr2IeO9EX2SL8p4rQdkghUEWFx5H0Vfq6 wHVL3YSgmdpOuAB4GHK8BUL6lhoMwjVTAav4Y27aqgdOy5Q3IJtGFrmGC+pl/obUWSi0 a7iS+QEZSqrYuGYot8NQ5I0QyYY9YFduALSp1WI34GtSfhsno7oB3buc9TRGHA9tEjTP nfj0PBLsnbMkRyeiBMjW80yq51au9UjziERRhA015Z0HRNeyy2sAkId+0iEApWBIUnbs sPpw== X-Gm-Message-State: AODbwcAJ7qDIw0tSidhX2m9HjTDzPA621oFKGUUZm0E2X241BNDH7KCn ueVkiX2PvfdDSkUJKAg= X-Received: by 10.237.32.176 with SMTP id 45mr36650593qtb.30.1496795519473; Tue, 06 Jun 2017 17:31:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:36 -0700 Message-Id: <20170607003119.14778-28-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170607003119.14778-1-rth@twiddle.net> References: <20170607003119.14778-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PULL v2 27/70] target/s390x: Use unwind data for helper_testblock 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: peter.maydell@linaro.org, aurelien@aurel32.net 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" Reviewed-by: Thomas Huth Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 3 +++ target/s390x/translate.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index b64c04e..7df2e53 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -939,6 +939,7 @@ void HELPER(stctl)(CPUS390XState *env, uint32_t r1, uin= t64_t a2, uint32_t r3) =20 uint32_t HELPER(testblock)(CPUS390XState *env, uint64_t real_addr) { + uintptr_t ra =3D GETPC(); CPUState *cs =3D CPU(s390_env_get_cpu(env)); uint64_t abs_addr; int i; @@ -947,12 +948,14 @@ uint32_t HELPER(testblock)(CPUS390XState *env, uint64= _t real_addr) abs_addr =3D mmu_real2abs(env, real_addr) & TARGET_PAGE_MASK; if (!address_space_access_valid(&address_space_memory, abs_addr, TARGET_PAGE_SIZE, true)) { + cpu_restore_state(cs, ra); program_interrupt(env, PGM_ADDRESSING, 4); return 1; } =20 /* Check low-address protection */ if ((env->cregs[0] & CR0_LOWPROT) && real_addr < 0x2000) { + cpu_restore_state(cs, ra); program_interrupt(env, PGM_PROTECTION, 4); return 1; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 2f15329..16e39d3 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4047,7 +4047,6 @@ static ExitStatus op_tcxb(DisasContext *s, DisasOps *= o) static ExitStatus op_testblock(DisasContext *s, DisasOps *o) { check_privileged(s); - potential_page_fault(s); gen_helper_testblock(cc_op, cpu_env, o->in2); set_cc_static(s); return NO_EXIT; --=20 2.9.4