From nobody Wed Nov 5 17:30:39 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 1496796838320692.5281575260373; Tue, 6 Jun 2017 17:53:58 -0700 (PDT) Received: from localhost ([::1]:40649 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIPES-0006fz-Sb for importer@patchew.org; Tue, 06 Jun 2017 20:53:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOtJ-0002mI-JF for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOtG-00022K-Us for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:05 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:35112) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOtG-00022D-RR for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:02 -0400 Received: by mail-qt0-x243.google.com with SMTP id x58so19242790qtc.2 for ; Tue, 06 Jun 2017 17:32:02 -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.32.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:32:01 -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=FjcfMp4qrhBJLtfWG00jKbYlrFTJF+J7gA1hgU1i3vQ=; b=jGsOMVKtO3OMOIDdW0tczCmnB+ktjMaIkCypLXtUCphul39/Boh/mAlLvsaE55Ws8h iOIyPX/fC37/N8Spw/SCtVK1IxT/3SOKiI6byoy4PTAp+M8VGz3UG3wdBKbfmmptNZOo JC6L3KQTNI5sdI+EO4uWNzTgmfJYREMrVQKwhXDJrIn0jY1JMUWWujmZMe65h0W/saHj 9ANj4dRv4KPTjP+1UUmz/EG6PNyE6K+MsqeBaQy5JdQDYwaVDzonJY7dWwI8jR46yIg3 Gp3JLJkt6FFJRmlUv0Civ5sUNDCfWHL+jtiFhUZ5RlnsDSM4lDFfrkQqFLYGR6OvYe32 ZR2g== 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=FjcfMp4qrhBJLtfWG00jKbYlrFTJF+J7gA1hgU1i3vQ=; b=PECaJROK+Xz4rrugcGKxIyjzZTKPHmdFZvPzkNy89K2tJ9Rraqeneyux5jGChxK3dh /qZJwth2xooXu9KkHHlsiHUIk1Y6mZZ36gACidJwssRmmUVeHgbExRbY3iNatWLX193X LDlBdOS1CX83F7OEhDmsZcVFvq2bwISFE4YJeU1YEEmC/nsloVieW87JMUB9wV0/WpD+ OQGQ4VJoUVJymntAvvFSkn/Lz4dgVIP4iaF+jEcvxaUe4af3zFKrr7SI0YhdyCIl7CEt xQfVRsGtCm7P0RIWauB08T2jREHIeOeJJT+W+XiAqF7CMOOmirqjb8oGcWSOZkAQOOXU dxYQ== X-Gm-Message-State: AODbwcB1leOxz5647Hl4UCLus498GTggBEzcaTEi6CXsTr7tnsL7hBYa mOqg8kJmAGgHSBELi14= X-Received: by 10.200.45.83 with SMTP id o19mr27552560qta.43.1496795522205; Tue, 06 Jun 2017 17:32:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:38 -0700 Message-Id: <20170607003119.14778-30-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::243 Subject: [Qemu-devel] [PULL v2 29/70] target/s390x: Use unwind data for helper_lra 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" Fix saving exception_index around mmu_translate; eliminate a dead store. Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 6 +++--- target/s390x/translate.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index a8c85c9..17d8257 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1208,17 +1208,17 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t a= ddr) { CPUState *cs =3D CPU(s390_env_get_cpu(env)); uint32_t cc =3D 0; - int old_exc =3D cs->exception_index; uint64_t asc =3D env->psw.mask & PSW_MASK_ASC; uint64_t ret; - int flags; + int old_exc, flags; =20 /* XXX incomplete - has more corner cases */ if (!(env->psw.mask & PSW_MASK_64) && (addr >> 32)) { + cpu_restore_state(cs, GETPC()); program_interrupt(env, PGM_SPECIAL_OP, 2); } =20 - cs->exception_index =3D old_exc; + old_exc =3D cs->exception_index; if (mmu_translate(env, addr, 0, asc, &ret, &flags, true)) { cc =3D 3; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index cafcecb..80b08b9 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2565,7 +2565,6 @@ static ExitStatus op_lctlg(DisasContext *s, DisasOps = *o) static ExitStatus op_lra(DisasContext *s, DisasOps *o) { check_privileged(s); - potential_page_fault(s); gen_helper_lra(o->out, cpu_env, o->in2); set_cc_static(s); return NO_EXIT; --=20 2.9.4