From patchwork Tue May 23 03:02:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 765709 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 3wX10L2WMsz9sNk for ; Tue, 23 May 2017 13:16:50 +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="WiRl1y4i"; dkim-atps=neutral Received: from localhost ([::1]:45909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD0JU-0008AA-0X for incoming@patchwork.ozlabs.org; Mon, 22 May 2017 23:16:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06l-0005os-Sz for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06l-0003vf-0P for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:39 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:36073) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06k-0003vR-SL for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:38 -0400 Received: by mail-qt0-x243.google.com with SMTP id j13so20679691qta.3 for ; Mon, 22 May 2017 20:03:38 -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=FFcN/S3HTrwE1U2swoXSHl9UCRmU6OBvQO5uKuo+oN4=; b=WiRl1y4ipsVidUP+4WAvooO+lsfadED1y0i4XrPjavZpKdIxSVlUlQ2GMR4p9qz7B9 hQHm792ZoTAiKiHj02/WPcnw/7r2sF/CC9HuCULPOEFhp7XikKVTwxmco0VKOwod1FCL vw3b2Jj5/aXKJpn51wL/limo4VZGrXmiMg6b+G/qk9FzxnYUN0FYxWtNwPKzXkv2E89G 9OuhvZhWtKfF0i1YkjP4HXBD4r575YT4cYn8DZdhqKNLYrk0ufr0pQIcmsoY9OmU1E5s 6CVO/T206TFTeUGKtyJs9wALCt9kdYFLrBy5PJyPSzdpHEx/gkbqmdlqQ4DdzCOa3ZZJ F8cQ== 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=FFcN/S3HTrwE1U2swoXSHl9UCRmU6OBvQO5uKuo+oN4=; b=az7XbpR/1PEiNDiKliJG3UhF6Y9+LC/Xo5T1VfHOUS62n/K9Zb98HGbQzBQyffNErr GH4lbVIpjxZGX1/ny/e9o6n/rXXFTgXN/xfA/Q2C1Nmdt5Yw2MRn/qP7AvAQyGpBsYTX MZfmZcKFR646PjWPWNaGuIxbHERr41oDL7lKbWLqkEUOer5cvT5sm3E9RR5U9aFsIEl8 /fH3Y5kqxF/AKtH65/5Sb0uh7HZGaTdWJk0ZdWC7C2QZ0MVjPTPXgghBroJvN15Kw2m8 QePETxm8y9Hyae3rEs4a/uxfjdxmu49P12vPd1tNmA06DOMod/dBxdP0db+ityFIQXa1 OX5Q== X-Gm-Message-State: AODbwcCxTAvmd0apN4/TEu7FtLcTzCpucNvoq3aPc0mUZDZRNi1ASyid G/Liqe7mT3pLr743iPw= X-Received: by 10.200.45.113 with SMTP id o46mr25653887qta.194.1495508618041; Mon, 22 May 2017 20:03:38 -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.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:02:58 -0700 Message-Id: <20170523030312.6360-18-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::243 Subject: [Qemu-devel] [PATCH 17/31] 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Aurelien Jarno --- 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 7a59be0..6e85406 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -576,12 +576,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)) { @@ -593,8 +593,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 c00c15e..ad85a75 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1917,7 +1917,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);