From patchwork Tue May 23 03:03:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 765717 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 3wX15z6vdNz9sNk for ; Tue, 23 May 2017 13:21:43 +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="BLqpd6S8"; dkim-atps=neutral Received: from localhost ([::1]:45935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD0OD-00042H-CG for incoming@patchwork.ozlabs.org; Mon, 22 May 2017 23:21:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06q-0005sI-HE for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06p-0003xu-Je for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:44 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:35403) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06p-0003xg-G4 for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:43 -0400 Received: by mail-qk0-x242.google.com with SMTP id k74so21495235qke.2 for ; Mon, 22 May 2017 20:03:43 -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=r+Iigy6vGFNJcpTOA8TCfki/OkuG7EDBRle75HGponw=; b=BLqpd6S8CBncZJ6UiFbC9L3PxRGbZ3sUbJYdhlLDK3Y125Prj7TMYcPutovq6WSJ3M P4wHFKJdSwk9Ha7bZC992w2m1Lze2vcBKp34ouSU4ZsRdWYozcZHWdLckk8BDomVm4eE rxCR1v0V/lwRvutwOmo4McdsE4Z3YGP+QMfnx6lSgcNfs1Z8Z9SMbrBk2dWx5xWbyPc7 VR3o4n1jYrYX5RXX66o3fKU6JvXyxkj3n2hzrwD1VCosCkwRep++V2Ki5EuTLMz4hJKI GBKOyEeAKZn2X50+AtGw2zygBCNR/MpkPniPnSXS7HgsQCuQLPze8ornjgPvV5NsG4Uq 002w== 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=r+Iigy6vGFNJcpTOA8TCfki/OkuG7EDBRle75HGponw=; b=CmUmWvB7jOpW3+RT5vIJM17nCBnihKhOUr411EwHvZakkPnAz3JhmyWm1Fdxsop/ZO xPEEeeMFYS/yOammaRc8BbVhurKm09YjLy3T0c9/dmcfc109Pe6R39H31aN+9sAcbRkR UkqpmsGxLNVePPE7A8u1o05nrwjI55mJeimFmlZi3kwUVkWUVe3Qkm7sL6IYmfJBLqKs YFgytehwxpbgPLyUlu4R6OYWBVd9GSZejdUG5Xz5X1yBylTdQnSG+vJU1fjy4TeH9Rvn jFwI3GSndhMa5Ub+YsuD22F5PmDYraPdjhcRB4+VynYvM2gti3nZYcz7/jJiuGDHZHFW lfCA== X-Gm-Message-State: AODbwcDMxpPiMWXxTUGHor1sMhPhbOOKNTzR8AAg32PZXnbwg6Jywt1S OJUv9R4lYGCBKCw6nTw= X-Received: by 10.233.221.129 with SMTP id r123mr9120787qkf.0.1495508622783; Mon, 22 May 2017 20:03:42 -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.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:03:02 -0700 Message-Id: <20170523030312.6360-22-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:c09::242 Subject: [Qemu-devel] [PATCH 21/31] 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: , 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 | 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 748a6e8..4c6c6ee 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -720,8 +720,10 @@ 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; + uint32_t cc = 0; uint64_t i; if (!(env->psw.mask & PSW_MASK_64)) { @@ -733,25 +735,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 b506cee..ecef71c 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4078,7 +4078,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);