From patchwork Tue May 23 03:03:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 765716 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wX13R063cz9sNk for ; Tue, 23 May 2017 13:19:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aKcTzUHC"; dkim-atps=neutral Received: from localhost ([::1]:45920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD0M4-00025F-87 for incoming@patchwork.ozlabs.org; Mon, 22 May 2017 23:19:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06y-00060K-FO for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06x-0003zo-Jo for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:52 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:36085) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06x-0003zh-Fo for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:51 -0400 Received: by mail-qt0-x242.google.com with SMTP id j13so20680092qta.3 for ; Mon, 22 May 2017 20:03:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=m3huJziVGEWsWiKUmvwOTd/6w6IPGWOwoKUC0oVf0IU=; b=aKcTzUHCKXISXHMFCfTL9MYv1895D2MgKA3GQL6EQwYlO/GVu3mLgq5JfbEUn2A0Go zJQFczOHJXo2gItkOi3/fz/ixmhaj45rS5TuQe0dMiA4MM6tPVk58sgXPnhLHNEtaz2f 2kFJ/B4weJ9Swh1m2YktT/veJ66xOUe/DXzd9hiH+4QGOAjd9aUN5jFydTKa4LNuRXUt xmAv+GGPOTJaavM069mUMc/qAg7aKYTFDp9m2KqOF5tJg6oOPYbPwlwvh+Gq0LNGv5Yw 1VecxJGvY+cynxS0VJDhZvorKF3ehRjz7kYEAG8H/8sqONKmAzAnV5o0GLwJ8DNMQ+ff vH7Q== 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:subject:date:message-id :in-reply-to:references; bh=m3huJziVGEWsWiKUmvwOTd/6w6IPGWOwoKUC0oVf0IU=; b=XCccrKlBtkjByhPcopzx0nQhs6/BrjWgdeohWEncuEvgCJAxP1fw2+WAgVMZ6Xb9q2 Qfd2X0CiiX4d+TVwYfDg2Fbp6cW//nS8uS1CUbbKweaUwuyimusMy5KQIhCfPyGpflo7 wJ55OvtYOeqS9igq+CD9MHKIDlD7AnfvrD24mxrsjVljkXDBQYVIg7f6xe06Dtru3pES IIxbQ8UT+A3y+7Js4xmG8PkRCz6S5Lf4bvSXEhYZWdwpt7I3iEl+R9unGefNyhmU+2Bo 2WSEe/MuIsGmeaovptDsxcRSQXI2eWOwmaxDD5dstJcMeEaEmshWj6NilV+Of4e7XrMu lC3w== X-Gm-Message-State: AODbwcBkED7hwPeLI2qX2G0KlqfxQa+bEQt7Q65gVQdeqSq1aZc452mx yqCvkIXPpDQ9qBIfbJM= X-Received: by 10.200.40.193 with SMTP id j1mr26190203qtj.186.1495508630781; Mon, 22 May 2017 20:03:50 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id s190sm12918805qkh.57.2017.05.22.20.03.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:03:09 -0700 Message-Id: <20170523030312.6360-29-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170523030312.6360-1-rth@twiddle.net> References: <20170523030312.6360-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::242 Subject: [Qemu-devel] [PATCH 28/31] 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Note that exception_index is not live during a TB, so there is no point saving it around mmu_translate. Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 4 +--- target/s390x/translate.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 7f22bf0..81b27c0 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1181,17 +1181,16 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr) { CPUState *cs = CPU(s390_env_get_cpu(env)); uint32_t cc = 0; - int old_exc = cs->exception_index; uint64_t asc = env->psw.mask & PSW_MASK_ASC; uint64_t ret; int flags; /* 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); } - cs->exception_index = old_exc; if (mmu_translate(env, addr, 0, asc, &ret, &flags, true)) { cc = 3; } @@ -1200,7 +1199,6 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr) } else { ret |= addr & ~TARGET_PAGE_MASK; } - cs->exception_index = old_exc; env->cc_op = cc; return ret; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 282fa27..3e4b397 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;