From patchwork Tue May 23 03:02:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 765693 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 3wX0ms5dgBz9sNc for ; Tue, 23 May 2017 13:06:53 +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="Ng4swBHu"; dkim-atps=neutral Received: from localhost ([::1]:45865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD09r-0007lj-CP for incoming@patchwork.ozlabs.org; Mon, 22 May 2017 23:06:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06X-0005b4-SK for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06W-0003is-Ve for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:25 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:34192) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06W-0003iZ-Sc for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:24 -0400 Received: by mail-qt0-x241.google.com with SMTP id l39so20703612qtb.1 for ; Mon, 22 May 2017 20:03:24 -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=9lRGJXKoH7uAbfTu690eysU/lFhgUt8nTyTnzsd3W7w=; b=Ng4swBHuMa5/pbWspNISoH+l7g2MJbpdgNgRSnsFeBr6sv0Lh5IB2AtVeJfVAQ9BsZ ncqdoUrM+kIt6192HmhNN7zNhRVmuJ103znKra0wZv7wQ5gVRFO8lcGJd05rniM1F88Q 6YdXoaoDNHYruMOw443IiZF9FnfLquY2KCffDZvDZIMmrYnc6QoSZpvInxOsDBbCNjwh VOgrOHoUwFLj/rRX7TKvL3O/DuZ1b1ELdOEs3oWLTX/GANJWnLZwSzeXICISG2CGo452 Vfp+xXeA8Eoq8mOdpmvYof19d1x4VPArfGucpn5e987Py1DOl1cN4a2elX/F3Nfep2DB DsLQ== 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=9lRGJXKoH7uAbfTu690eysU/lFhgUt8nTyTnzsd3W7w=; b=FY4dTfAPfJYNrGDXbMe0YPbbmx6BSddAoEQWDnUXhzazeLcrf5TORuJMSY5kTJCkIt M/AZ2b6I0nyzf6D10BFFj6w8R+doMciZtmQHWuJNHgwGIsuFisqtc1GSenKDHaKXlYOC QHQv+ZGuDMKP+rV0PANwejxGthtL4KQoyHM9beUPg4OkHDz9K/cvPbU34SG14S0RgN3s ayrzdHfctWG9tDqNz329ZnNEbyaLOgklbcv8K0Ccwwstzly5T9IhuPabIvIt1IwVADG0 aD1k6GRw52vUcUZoHt5emWxRSy1M9+LVxOSV4KyU0e1aM4xoJqZh43uJjz+Gj918ENCK 3NMg== X-Gm-Message-State: AODbwcCtW0BmqfG16MYbk9slsjpPgPAiRkHFDRfYoCxi1wtITqjYVfwl go1I8CdRAo07V5LOwcE= X-Received: by 10.200.56.56 with SMTP id q53mr23540082qtb.36.1495508604048; Mon, 22 May 2017 20:03:24 -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.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:02:46 -0700 Message-Id: <20170523030312.6360-6-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::241 Subject: [Qemu-devel] [PATCH 05/31] target/s390x: Use unwind data for helper_oc 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 Reviewed-by: Aurelien Jarno --- target/s390x/mem_helper.c | 18 +++++++++--------- target/s390x/translate.c | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index e0a6fad..e75c2de0 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -168,20 +168,20 @@ uint32_t HELPER(xc)(CPUS390XState *env, uint32_t l, uint64_t dest, uint32_t HELPER(oc)(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); + 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; } /* memmove */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index a770407..6a51d56 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3082,7 +3082,6 @@ static ExitStatus op_negf128(DisasContext *s, DisasOps *o) static ExitStatus op_oc(DisasContext *s, DisasOps *o) { TCGv_i32 l = tcg_const_i32(get_field(s->fields, l1)); - potential_page_fault(s); gen_helper_oc(cc_op, cpu_env, l, o->addr1, o->in2); tcg_temp_free_i32(l); set_cc_static(s);