From patchwork Sun Jun 4 17:34:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9765103 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 ECD30601D7 for ; Sun, 4 Jun 2017 17:47:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD380280DE for ; Sun, 4 Jun 2017 17:47:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D01D428111; Sun, 4 Jun 2017 17:47:53 +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 736FB280DE for ; Sun, 4 Jun 2017 17:47:53 +0000 (UTC) Received: from localhost ([::1]:57876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZd2-0001DT-FB for patchwork-qemu-devel@patchwork.kernel.org; Sun, 04 Jun 2017 13:47:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZRD-0007Q9-8o for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZRC-00030T-Bo for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:39 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:34450) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZRC-0002zI-6G for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:38 -0400 Received: by mail-pg0-x244.google.com with SMTP id v14so3629422pgn.1 for ; Sun, 04 Jun 2017 10:35: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=+rU6X27Q2EHgtfHxY5ShUD6tFrZv9JFBvXuVE+6VAKE=; b=sfk8GCnYSSkUPILvH5HUAR59+lfmTTtk2Qw+/x4XFa8uJNHyPSLUhKcyghh9FZGKKI +O5EZfl2QrHEnAyRX11asYZYQgTyOKRScpehQCNgYggqAs/VuY8VS7dPrVIRWahAUHjm NUT42oE7SN1w1En8KbtTm+3JVKgNtFCRGxm3FcEnNlMAEe7vmbjUXwFATmSbjg/c86oG LaZMZkJkDGbYQ3++KUxA9bkBAOJNWlLk9Jk8tw8oKoShWW4BkbCdCn4HKcrEKR+tBLF/ y4HItuRSlEE8rK/y3fBXi+dS/FRssopzb9UhozF3IAY0e8zobU1/zsG8QNtNOTcgblBL CBAQ== 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=+rU6X27Q2EHgtfHxY5ShUD6tFrZv9JFBvXuVE+6VAKE=; b=QjXqQG7mvcwdNfpCD1+CJYA7FHQGNP70tGTSV8hDr9nmOToE6widWzqwH36h9g+B2t LUvHW2+pV0hQEzobzlF561OLlds6xXcX7X4nsyYoyTZklPJMhXr8Zs0iB1JpUxkgLbi+ VZlIBBaEVhxSzc7LaYrUwRFV5edEEzVF15Y8lueSbiZtShUHMGpQTAfkGG+PfFz3tKY3 EzHNuQQ5tP3nzJjeoFk6BTbdbI0LVKg9eiKYabDcjy1bYDzy5sINZ6srcP9dlWIPoZu2 0kAT270g/6bSPlPmjurHHx+TqT7sVFLccAzHINY/xp1nRIf3rQUN7I7djIczV0Ih2su0 iE8A== X-Gm-Message-State: AODbwcBHU0F+v0gS8zbjCvHj+RlO0ghnHJYPdTLjlPYlVCTl52nrbMkP YyVC2kV3LwLBk/x0KKY= X-Received: by 10.99.152.25 with SMTP id q25mr17353208pgd.93.1496597737136; Sun, 04 Jun 2017 10:35:37 -0700 (PDT) Received: from bigtime.ASUS (cpe-98-155-27-246.hawaii.res.rr.com. [98.155.27.246]) by smtp.gmail.com with ESMTPSA id j191sm52854419pgc.53.2017.06.04.10.35.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:18 -0700 Message-Id: <20170604173509.29684-19-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170604173509.29684-1-rth@twiddle.net> References: <20170604173509.29684-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::244 Subject: [Qemu-devel] [PULL 18/69] target/s390x: Use unwind data for helper_clcle 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 | 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 8a095ad..f5a3044 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -595,12 +595,12 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) { + uintptr_t ra = GETPC(); uint64_t destlen = env->regs[r1 + 1]; uint64_t dest = get_address_31fix(env, r1); uint64_t srclen = env->regs[r3 + 1]; uint64_t src = get_address_31fix(env, r3); uint8_t pad = a2 & 0xff; - uint8_t v1 = 0, v2 = 0; uint32_t cc = 0; if (!(destlen || srclen)) { @@ -612,8 +612,8 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, } for (; destlen || srclen; src++, dest++, destlen--, srclen--) { - v1 = srclen ? cpu_ldub_data(env, src) : pad; - v2 = destlen ? cpu_ldub_data(env, dest) : pad; + uint8_t v1 = srclen ? cpu_ldub_data_ra(env, src, ra) : pad; + uint8_t v2 = destlen ? cpu_ldub_data_ra(env, dest, ra) : pad; if (v1 != v2) { cc = (v1 < v2) ? 1 : 2; break; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index b42acae..9270067 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1915,7 +1915,6 @@ static ExitStatus op_clcle(DisasContext *s, DisasOps *o) { TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3)); - potential_page_fault(s); gen_helper_clcle(cc_op, cpu_env, r1, o->in2, r3); tcg_temp_free_i32(r1); tcg_temp_free_i32(r3);