From patchwork Tue May 23 03:02:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 765694 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 3wX0n10sp5z9sNc for ; Tue, 23 May 2017 13:07:01 +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="WMib3fZR"; dkim-atps=neutral Received: from localhost ([::1]:45866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD09y-0007s1-Hi for incoming@patchwork.ozlabs.org; Mon, 22 May 2017 23:06:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06W-0005aI-R2 for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06V-0003i7-Rl for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:24 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:36858) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06V-0003hk-O7 for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:23 -0400 Received: by mail-qk0-x244.google.com with SMTP id y128so21473359qka.3 for ; Mon, 22 May 2017 20:03:23 -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=O19mvqR9Sdetx2bKaz9xBgepzDPmrcicVsZBgHSHZXg=; b=WMib3fZRl0l+D7ipZ+dEnQFxaf/4QGmfwvsXere6J7D4nJbLDMtJ3UEu6fx2A7T1rs vxAznNXp1zwyOu+wSB2RVQG+dcf2LVJ3KeRAdsUa6YpLAevR9EysgOjSwrwvI/cpm6Zt 7pMPVh7tIzK/LRza7prcz2gShSK6+aB9otLVoPy3OGk5BaJXGHxwg9ZAQ1J1djB79sPI Oh7JhChVsGAmh1fqfn8gf/3jiJX2yXRH3a8UOJXN4P6zjmVIu/PIgCN9487NBE3EZ5vl t7uJ0M1jtdq7GcoOPMEk4aRv3/yVf559HZyuqKhrUPWH/pgeUDtn2ZAxYE/iBZOs27ou 013A== 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=O19mvqR9Sdetx2bKaz9xBgepzDPmrcicVsZBgHSHZXg=; b=hw5/H4udTKPnEsgEs0+eMzoPvJeU3dMqsCN4UBGjlCi8F0s364Fz4VkEpjuO5MJteQ rVa+5p5QRbczu1j8UoNBQlof1LpOlHtuNEVYLMDk4z5vkdo88v8KKXrCKLSK3p/PxcDf 5w4fAeX1qH7AVo9FB26WrqKPNstlcHuMEizpy0EBjPgrYgUZqpnsn19oO0oVdlZtW8QW IgfoN9bapPvtpyEJ+cl/ezGi0bhTnCpinbs2h6JCbT7s7xG3yM/ViGmYP2vloICKwDVO weIj5E7wiaup7/F/Mnv5piadiyv1qrdzho1HNfzWevn4NdpaaFNidkhLgRojkiLyJ3aL qqXA== X-Gm-Message-State: AODbwcAxu4UQAVyTJ0uP4DezyFPxNPzyj4MywmZ8N4v1hhKrvFP5vv+X o8tzWvn0cTe9FqbD1ic= X-Received: by 10.55.191.67 with SMTP id p64mr24144076qkf.149.1495508602894; Mon, 22 May 2017 20:03:22 -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.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:02:45 -0700 Message-Id: <20170523030312.6360-5-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::244 Subject: [Qemu-devel] [PATCH 04/31] target/s390x: Use unwind data for helper_xc 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 | 25 ++++++++++++------------- target/s390x/translate.c | 1 - 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 1018fe0..e0a6fad 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -68,7 +68,7 @@ static inline uint64_t adj_len_to_page(uint64_t len, uint64_t addr) } static void fast_memset(CPUS390XState *env, uint64_t dest, uint8_t byte, - uint32_t l) + uint32_t l, uintptr_t ra) { int mmu_idx = cpu_mmu_index(env, false); @@ -83,7 +83,7 @@ static void fast_memset(CPUS390XState *env, uint64_t dest, uint8_t byte, } else { /* We failed to get access to the whole page. The next write access will likely fill the QEMU TLB for the next iteration. */ - cpu_stb_data(env, dest, byte); + cpu_stb_data_ra(env, dest, byte, ra); dest++; l--; } @@ -142,27 +142,26 @@ uint32_t HELPER(nc)(CPUS390XState *env, uint32_t l, uint64_t dest, uint32_t HELPER(xc)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src) { - int i; - unsigned char x; - uint32_t cc = 0; + uintptr_t ra = GETPC(); + uint8_t cc = 0; + uint32_t i; HELPER_LOG("%s l %d dest %" PRIx64 " src %" PRIx64 "\n", __func__, l, dest, src); /* xor with itself is the same as memset(0) */ if (src == dest) { - fast_memset(env, dest, 0, l + 1); + fast_memset(env, dest, 0, l + 1, ra); return 0; } for (i = 0; i <= l; i++) { - x = cpu_ldub_data(env, dest + i) ^ cpu_ldub_data(env, src + i); - if (x) { - cc = 1; - } - cpu_stb_data(env, dest + i, x); + uint8_t x = cpu_ldub_data_ra(env, dest + i, ra); + x ^= cpu_ldub_data_ra(env, src + i, ra); + cc |= x; + cpu_stb_data_ra(env, dest + i, x, ra); } - return cc; + return cc != 0; } /* or on array */ @@ -196,7 +195,7 @@ void HELPER(mvc)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src) /* mvc with source pointing to the byte after the destination is the same as memset with the first source byte */ if (dest == (src + 1)) { - fast_memset(env, dest, cpu_ldub_data(env, src), l + 1); + fast_memset(env, dest, cpu_ldub_data(env, src), l + 1, 0); return; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 6aa9c90..a770407 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4166,7 +4166,6 @@ static ExitStatus op_xc(DisasContext *s, DisasOps *o) /* But in general we'll defer to a helper. */ o->in2 = get_address(s, 0, b2, d2); t32 = tcg_const_i32(l); - potential_page_fault(s); gen_helper_xc(cc_op, cpu_env, t32, o->addr1, o->in2); tcg_temp_free_i32(t32); set_cc_static(s);