From patchwork Tue May 23 03:02:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 765698 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 3wX0qz6qk8z9sNk for ; Tue, 23 May 2017 13:09:35 +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="jFPI7vfz"; dkim-atps=neutral Received: from localhost ([::1]:45875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD0CT-0001gq-EQ for incoming@patchwork.ozlabs.org; Mon, 22 May 2017 23:09:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06Z-0005bz-32 for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06Y-0003jg-5m for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:27 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:33127) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06Y-0003jL-1j for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:26 -0400 Received: by mail-qt0-x242.google.com with SMTP id a46so20683521qte.0 for ; Mon, 22 May 2017 20:03:25 -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=SSKzlsRCclFwh8W960Q/f2OpLNXlcS4w1U0PJPbtGAE=; b=jFPI7vfzslBon8k6xH70/EBYgSzTBw9iD8UZZC75LGudU7v13aN6Rr9e2j2GyfV2Tt 5hwaoR1c7dGpiD1Kerla2iNwuBMKUOj/NaYoz5bKU/0skGhpn1zifMmxuGHYzrwoL8kE Ato7ZqoR9N23b68hFgCZaCgBjnWFhEg2QEkKcaVWIkyd1zz9QUoW/Uq5IXVVoifKve/y Tki4D5kCrt3j21zlatoc1OMP2SYv9FKyI9FkhoBoBoPKzXX+4KcrYImbAy8+gUPwyfCq URmU90O9hogukqYpPPznf8VltfZF6cYv3yC1tJVZbo1+o/fYUnaRJN60IyhyfnPQ8ZiB NEyg== 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=SSKzlsRCclFwh8W960Q/f2OpLNXlcS4w1U0PJPbtGAE=; b=PMMecsgcNMm5tUxWktxeQ7Aa0cvCVA5Y1DcSPpdKLccXt4+EOJRaNV3Pagnqwp7lfr p65i21GY5WmaproNeaXJKVnIFVS+rIPDikgYmTv1S2v4O0nkq3p/7NirXgTDi4RM9JEY n3uQvEqeehjFyZm2zk4tOJggDakUx0VHh6UnMbwuI25w1amuIDYatrofVsIzWjRqPjCF 0ei4wfrJ7PXiDoOeB1tQGeivGX8gQPSMjaWV6Fbf8jUqJJnr2TCNq65NoOxc9Zh/PiTQ BArTHR0BnZusvT3JJ4txY4CRawkRcEl7+gdXeWJPAPACYqdpmdUbaAuxP5hjPY7cNxnD Fq4w== X-Gm-Message-State: AODbwcDGGSLjZqlN/2UKtlH8xf7/0if41s8ua2/RaYuuQGV4/XjnN7DT SuWiLMl43WFQ4O3+OQw= X-Received: by 10.200.9.76 with SMTP id z12mr26837559qth.102.1495508605208; Mon, 22 May 2017 20:03:25 -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.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:02:47 -0700 Message-Id: <20170523030312.6360-7-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::242 Subject: [Qemu-devel] [PATCH 06/31] target/s390x: Use unwind data for helper_mvc 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 | 19 ++++++++++--------- target/s390x/translate.c | 1 - 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index e75c2de0..0295485 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -91,7 +91,7 @@ static void fast_memset(CPUS390XState *env, uint64_t dest, uint8_t byte, } static void fast_memmove(CPUS390XState *env, uint64_t dest, uint64_t src, - uint32_t l) + uint32_t l, uintptr_t ra) { int mmu_idx = cpu_mmu_index(env, false); @@ -110,7 +110,7 @@ static void fast_memmove(CPUS390XState *env, uint64_t dest, uint64_t src, /* We failed to get access to one or both whole pages. The next read or write access will likely fill the QEMU TLB for the next iteration. */ - cpu_stb_data(env, dest, cpu_ldub_data(env, src)); + cpu_stb_data_ra(env, dest, cpu_ldub_data_ra(env, src, ra), ra); src++; dest++; l--; @@ -187,27 +187,28 @@ uint32_t HELPER(oc)(CPUS390XState *env, uint32_t l, uint64_t dest, /* memmove */ void HELPER(mvc)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src) { - int i = 0; + uintptr_t ra = GETPC(); + uint32_t i; HELPER_LOG("%s l %d dest %" PRIx64 " src %" PRIx64 "\n", __func__, l, dest, 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, 0); + if (dest == src + 1) { + fast_memset(env, dest, cpu_ldub_data_ra(env, src, ra), l + 1, ra); return; } /* mvc and memmove do not behave the same when areas overlap! */ - if ((dest < src) || (src + l < dest)) { - fast_memmove(env, dest, src, l + 1); + if (dest < src || src + l < dest) { + fast_memmove(env, dest, src, l + 1, ra); return; } /* slow version with byte accesses which always work */ for (i = 0; i <= l; i++) { - cpu_stb_data(env, dest + i, cpu_ldub_data(env, src + i)); + cpu_stb_data_ra(env, dest + i, cpu_ldub_data_ra(env, src + i, ra), ra); } } @@ -373,7 +374,7 @@ void HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2) { /* XXX missing r0 handling */ env->cc_op = 0; - fast_memmove(env, r1, r2, TARGET_PAGE_SIZE); + fast_memmove(env, r1, r2, TARGET_PAGE_SIZE, 0); } /* string copy (c is string terminator) */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 6a51d56..66f3cd6 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2871,7 +2871,6 @@ static ExitStatus op_movx(DisasContext *s, DisasOps *o) static ExitStatus op_mvc(DisasContext *s, DisasOps *o) { TCGv_i32 l = tcg_const_i32(get_field(s->fields, l1)); - potential_page_fault(s); gen_helper_mvc(cpu_env, l, o->addr1, o->in2); tcg_temp_free_i32(l); return NO_EXIT;