From patchwork Wed Jun 7 00:30:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9770309 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8D00760234 for ; Wed, 7 Jun 2017 00:38:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E9AD2847D for ; Wed, 7 Jun 2017 00:38:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 632A228524; Wed, 7 Jun 2017 00:38:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 157832847D for ; Wed, 7 Jun 2017 00:38:14 +0000 (UTC) Received: from localhost ([::1]:40579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOzG-0007PF-0j for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Jun 2017 20:38:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOsu-0002Qu-0l for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOst-0001rM-5L for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:40 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:35988) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOst-0001r8-0u for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:39 -0400 Received: by mail-qt0-x244.google.com with SMTP id s33so19303589qtg.3 for ; Tue, 06 Jun 2017 17:31:38 -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=B2Lv1EoKgZPdxqxAGLUfuBk3FR2uXsMtD7KfI0ZEwnk=; b=p9FJ86RNcTUlK9jy5jkQBIL4InmnsddBzWdkUIeMF0Mn5GvGy/9dl45oFymclTDMln +zfglZ+eARAqJc8Vyy1/fi9V/ZmYIk8Gy29QiF8DnXQlpMk+jGNk8WSlsSG5Fyg7w3Wy iRFMuUqlfdCsqRjFVsF0CHIPQ1Y0xKTsyglTKN0Ua24+57bYEjwfSWoHEOfKjPKtrZFu C4YtZ0aooHyuiF5nOvvRtvYRnZxcF2eA9+8280iclr/sOwjiJj/I7WJS1ulxmKZHh5IB JAWEXRwCmxznPd3u7e18Ej7+UO9DIJJS6IFJqXAUrZeVx6TOaVaYtKPpSNnMpiyyl/G/ e44g== 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=B2Lv1EoKgZPdxqxAGLUfuBk3FR2uXsMtD7KfI0ZEwnk=; b=MC+ps/OL9dwI8lpQ9rkRP6lTxV8X1gh4TqsJA3L3ZuS01ToaUrL5PfpLaRYNm1ytKy vex8jjGwGR9gE+6/585Qp/7b1bZ3XvbE8hmYzf4XmvHD4gB5+m4lxWwJtpCfesbiSiZn /e3utWFBQjtWiAYPM4UIJj6s0JbA54RxjVQzIpEOMLoOJmQpHikhD39ITx/fAMKWOmcF WqIXAKbcqapp7suEIqqEa2yrO4gaeR83YDPiGtzWO1i84p9ssnX7N2ANYvMVnNPvieWl Ot4G0zZyXmsKlQ2nvN4yxWxmVia/2YrqzjJ7/Bh7YpwdoF2c+IJtkZ1Zb5PQiihkHBXG +oIw== X-Gm-Message-State: AODbwcATcv7kBxMtqeTt6725mBO4qQSLTzr22lojAg1jktSBYVYlhmiD rOdyPM1agNbpWFyjFBE= X-Received: by 10.237.32.176 with SMTP id 45mr36649339qtb.30.1496795498367; Tue, 06 Jun 2017 17:31:38 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:19 -0700 Message-Id: <20170607003119.14778-11-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::244 Subject: [Qemu-devel] [PULL v2 10/70] target/s390x: Use unwind data for helper_srst 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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, 2 insertions(+), 2 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 3e75cae..33d83e5 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -327,6 +327,7 @@ static inline uint64_t get_address_31fix(CPUS390XState *env, int reg) uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0, uint64_t end, uint64_t str) { + uintptr_t ra = GETPC(); uint32_t len; uint8_t v, c = r0; @@ -344,7 +345,7 @@ uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0, uint64_t end, env->cc_op = 2; return end; } - v = cpu_ldub_data(env, str + len); + v = cpu_ldub_data_ra(env, str + len, ra); if (v == c) { /* Character found. Set R1 to the location; R2 is unmodified. */ env->cc_op = 1; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index d4c5fa3..9fc5b31 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3977,7 +3977,6 @@ static ExitStatus op_stmh(DisasContext *s, DisasOps *o) static ExitStatus op_srst(DisasContext *s, DisasOps *o) { - potential_page_fault(s); gen_helper_srst(o->in1, cpu_env, regs[0], o->in1, o->in2); set_cc_static(s); return_low128(o->in2);