From patchwork Tue May 23 03:02:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9741791 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 8E2C960388 for ; Tue, 23 May 2017 03:10:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BCEB2878F for ; Tue, 23 May 2017 03:10:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7072528797; Tue, 23 May 2017 03:10:03 +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 BD0CD28793 for ; Tue, 23 May 2017 03:10:02 +0000 (UTC) Received: from localhost ([::1]:45874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD0Cv-0001cv-Fa for patchwork-qemu-devel@patchwork.kernel.org; Mon, 22 May 2017 23:10:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06b-0005e9-7u for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06a-0003lx-Cz for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:29 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:35840) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06a-0003lN-9k for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:28 -0400 Received: by mail-qk0-x241.google.com with SMTP id y128so21473504qka.3 for ; Mon, 22 May 2017 20:03:28 -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=hdHWeOCv2HilyzONPEC6/AODU3C/PwX6VAhp2SzmBHE=; b=gGz2dRJV0W+nX77NG1PcdHghyeCKgzbQNk7m+qoNLOA1ZPHAHcoIRAMHt+MdpOlxYW eEUd69sfSK7n30LoAeZb0vnBVouB7Q2Mdw68wxSkOlnJygdV08i/xVzy6pH9TDDkz9hB iV5BXNXRhWBuICLNkvWEpPCt8ukNsByMI9MF+lhtXJPiTpvmWdTOkLxWDWzFS5Vuqpn1 TsWBAxhEUdDyCmMCNzsX6lRP/ulpahgDuMxMh9kyRPX7QwfhqHXZBu6GTrwjgtvnC3ou WoNfVALoQWaygc8IKS88qRNfmkOxHY2nPtBqqGVLXVdRBZsV2rL9xviTG9+8oepdLIp7 hpzA== 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=hdHWeOCv2HilyzONPEC6/AODU3C/PwX6VAhp2SzmBHE=; b=ES34Z4RbNb1unnPxeEzp4hpMzavWsV7+8fedwrtR1dcP/WSW8LCa1BaOUgaLf5WkI0 rFPIpFg6UsDC1b3jG9kkhKBiKwTAFAW+fUnlLL928eKFe1HaAbsdeIM06/n+C+2+5KjW QpmNGDhi2/RslQG9IRzzOnclanXn9oLexIlGCAVZOIyzUPQAcp6eeU6TrkWcn2iEc687 BwavfTAeql/IZwg1UpEbNZleeRJdbr2K/qUTSkRGhA8xUgsjZmGwRY/6ZFLVfH3kjp0C 0Ni9gb3WrCGUostrvdjH4MrBNIMzedzkCCH+F2zePyTpXkMhZlduYuzaHxRKmICPNQ8A 6K+w== X-Gm-Message-State: AODbwcBQzF94eL4M2YcqYzUTavqFwA4UElrjKUPLD3D0knY2V+bpOvKs 6e/jYW3JDi0tRJYA+4A= X-Received: by 10.55.116.66 with SMTP id p63mr22752383qkc.250.1495508607463; Mon, 22 May 2017 20:03:27 -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.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:02:49 -0700 Message-Id: <20170523030312.6360-9-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::241 Subject: [Qemu-devel] [PATCH 08/31] target/s390x: Use unwind data for helper_clm 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Aurelien Jarno --- target/s390x/mem_helper.c | 11 ++++++----- target/s390x/translate.c | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index d04850b..5f38ac3 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -243,16 +243,16 @@ uint32_t HELPER(clc)(CPUS390XState *env, uint32_t l, uint64_t s1, uint64_t s2) uint32_t HELPER(clm)(CPUS390XState *env, uint32_t r1, uint32_t mask, uint64_t addr) { - uint8_t r, d; - uint32_t cc; + uintptr_t ra = GETPC(); + uint32_t cc = 0; HELPER_LOG("%s: r1 0x%x mask 0x%x addr 0x%" PRIx64 "\n", __func__, r1, mask, addr); - cc = 0; + while (mask) { if (mask & 8) { - d = cpu_ldub_data(env, addr); - r = (r1 & 0xff000000UL) >> 24; + uint8_t d = cpu_ldub_data_ra(env, addr, ra); + uint8_t r = extract32(r1, 24, 8); HELPER_LOG("mask 0x%x %02x/%02x (0x%" PRIx64 ") ", mask, r, d, addr); if (r < d) { @@ -267,6 +267,7 @@ uint32_t HELPER(clm)(CPUS390XState *env, uint32_t r1, uint32_t mask, mask = (mask << 1) & 0xf; r1 <<= 8; } + HELPER_LOG("\n"); return cc; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index aefbc90..84f09b1 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1930,7 +1930,6 @@ static ExitStatus op_clm(DisasContext *s, DisasOps *o) TCGv_i32 m3 = tcg_const_i32(get_field(s->fields, m3)); TCGv_i32 t1 = tcg_temp_new_i32(); tcg_gen_extrl_i64_i32(t1, o->in1); - potential_page_fault(s); gen_helper_clm(cc_op, cpu_env, t1, m3, o->in2); set_cc_static(s); tcg_temp_free_i32(t1);