From patchwork Wed May 24 19:22:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9746787 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 A4B1060209 for ; Wed, 24 May 2017 19:34:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 910A628575 for ; Wed, 24 May 2017 19:34:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 830D22899B; Wed, 24 May 2017 19:34:33 +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 F422928575 for ; Wed, 24 May 2017 19:34:32 +0000 (UTC) Received: from localhost ([::1]:56493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDc3E-0003Rn-5R for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 May 2017 15:34:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbsP-00020K-6i for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDbsO-0001Tw-0S for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:21 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:35404) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDbsN-0001Sl-Rm for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:19 -0400 Received: by mail-qt0-x242.google.com with SMTP id r58so27542035qtb.2 for ; Wed, 24 May 2017 12:23:19 -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=64GOZe+eFOruX7RFeVVgr304QyscnvojmE2aQVLY80o=; b=jW3A/id9W7YNS5Z9owqQznoIP+F1yqu5pJloj4LXOFs6AcFDIBSuphv5Ie/d1B/NmY N00o5ABFhF56GkZSwX+eScr18fHPqufCftVx5CxwlmqSn9qoe+ldI0vC0ARKcXeqaU5C fix8kD+h+lw3CqtNirTPFZ3nEwX6GQTHkwuk+QD26LPoWZ9ymb+DFiIC/B2uNuMSUPZA 0yvxauZAabQzjGbviRLDargXZmJ9rxSYbJxDL3y7Hveu+l9tS8vPaXFaNnmXPwcIK36x jBz80tgqOvPPGClbXzedIF+jFVqmelQ3L2qdz8+gA22PrS7vcRC9A3vM2scqWMNmUtvK rKsw== 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=64GOZe+eFOruX7RFeVVgr304QyscnvojmE2aQVLY80o=; b=cnE6rTHWEeazpPl4F4x0R0XT2sts8u3W+tZK6WkJqQOCVIunKwYivCEUqH0iUAksSs Owg44VZO8iesQRcKXGefUJ/o2ZzH9CXjwtanRY1Jtcnl/CeUoZGZbh7Jyp2HHgszAewP QYs5kiZaYPGq/Td2m+rHJ7ar7ExGFuLl3+qqChAMFWeMCYtQPiLhOPm81T6+M25UpDIk 8Ac9bWq1FoW1/pULUSFlWdTGqVoY7xg9byAjZl535NICbS/aM6ibGXP/EffUa0Pw1Nro kizoiPPhWmnCa+FNrEdxQOTcxwsgH7oRf0kReQgKDUNaNXXDR0IVITkFHLyLa45tMrnl O/HQ== X-Gm-Message-State: AODbwcDYssWwwaGE8WnPB0V06QSBd+/zS1Pj8vL89zUsAOtGMu23UUre F7hIm5vh9xCr11qOT1o= X-Received: by 10.200.51.2 with SMTP id t2mr38200475qta.130.1495653799209; Wed, 24 May 2017 12:23:19 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id b23sm3296240qkb.31.2017.05.24.12.23.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 12:23:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 12:22:34 -0700 Message-Id: <20170524192246.15905-22-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170524192246.15905-1-rth@twiddle.net> References: <20170524192246.15905-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 v2 21/33] target/s390x: Use unwind data for helper_tre 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: thuth@redhat.com, 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 | 15 ++++++++------- target/s390x/translate.c | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index b37a963..fd6dbf7 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -744,9 +744,11 @@ void HELPER(tr)(CPUS390XState *env, uint32_t len, uint64_t array, uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array, uint64_t len, uint64_t trans) { + uintptr_t ra = GETPC(); uint8_t end = env->regs[0] & 0xff; uint64_t l = len; uint64_t i; + uint32_t cc = 0; if (!(env->psw.mask & PSW_MASK_64)) { array &= 0x7fffffff; @@ -757,25 +759,24 @@ uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array, amount of work we're willing to do. For now, let's cap at 8k. */ if (l > 0x2000) { l = 0x2000; - env->cc_op = 3; - } else { - env->cc_op = 0; + cc = 3; } for (i = 0; i < l; i++) { uint8_t byte, new_byte; - byte = cpu_ldub_data(env, array + i); + byte = cpu_ldub_data_ra(env, array + i, ra); if (byte == end) { - env->cc_op = 1; + cc = 1; break; } - new_byte = cpu_ldub_data(env, trans + byte); - cpu_stb_data(env, array + i, new_byte); + new_byte = cpu_ldub_data_ra(env, trans + byte, ra); + cpu_stb_data_ra(env, array + i, new_byte, ra); } + env->cc_op = cc; env->retxl = len - i; return array + i; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 1842cc3..447ba07 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4073,7 +4073,6 @@ static ExitStatus op_tr(DisasContext *s, DisasOps *o) static ExitStatus op_tre(DisasContext *s, DisasOps *o) { - potential_page_fault(s); gen_helper_tre(o->out, cpu_env, o->out, o->out2, o->in2); return_low128(o->out2); set_cc_static(s);