From patchwork Wed May 24 19:22:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9746759 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 B49E5601C2 for ; Wed, 24 May 2017 19:24:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3CD1289D0 for ; Wed, 24 May 2017 19:24:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96A43289CE; Wed, 24 May 2017 19:24:31 +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 0E1B1289CE for ; Wed, 24 May 2017 19:24:31 +0000 (UTC) Received: from localhost ([::1]:56450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbtW-0001k9-6v for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 May 2017 15:24:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbs8-0001hl-IR for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDbs7-0000xi-He for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:04 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:35372) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDbs7-0000wa-Dw for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:03 -0400 Received: by mail-qt0-x244.google.com with SMTP id r58so27541254qtb.2 for ; Wed, 24 May 2017 12:23:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=lGDvUp5XrZvKX4F6cIJ/sXxo/+YbSSLgRWjN09z7M5Y=; b=OCNxOG0zZHBdlc9Xz77uy89gLhzvxV7BiNatZ1SClgTWfkjWB6PY4tLsBbvAAfyAu2 n9iKgjcCWI8tOvtkZkj1TIq3AW4Nph/K5ztPR8BxGbAvAlcDii5EEwS+M5nyPRsXuS2l veq/xnH2DAjNLPXxHe13b5VnBjPxlJGVcttdmKxoMlp5dNNUUcyrLVGrRVm+gOkc8kk/ W4ygzMxUtiOWuToinQ16ygHp/mMgWmdJ1eROx7esrOLu97HKNst2GUgOXrhpn/8u9j+X B1yhDHZRuPQYpinO9dpyEzqCq+HhSsk9+n5X6jJp4Ui/yEBnbqux3Se8LxEHiMn7NYBs tcYQ== 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:cc:subject:date:message-id :in-reply-to:references; bh=lGDvUp5XrZvKX4F6cIJ/sXxo/+YbSSLgRWjN09z7M5Y=; b=Yg6JIntV/LLPH1cCQ2bUl8yl8XcGG8z9kb4kF2Wjj008DwWggi1tFxnRYn+q3GXuHY zEhZ2iFjywofQy8Zc8Uql9iEBCaJOaAAW5prAsNw1yxkJPxpFtRSow44dcC/L0w/lxiy kll4R2Gw4MRRQX9jMKCgGFchy53dYy7bJk27dyYksvf0417UAQKydYGSKyKumutqS03p GLbF1lCwrX3ZTb+YSdXMh77SrMC4z3R1OAI8WOb1KEonEN0j0ZPvBb+liYqzrJsuczlH 4l7ddy1jJL27S5SZe8U1Yk1yt3ZvmTile50jcoKU5ZaITozGMjB5xDcLZxteIGO2Fg3z T1Kw== X-Gm-Message-State: AODbwcDehU2sfsWKsUXfwwXUFgXpT8dP6Q1GSQUorTiJGoWSyNBKHri9 jFv2LVKuckHw3Q== X-Received: by 10.200.45.157 with SMTP id p29mr34664845qta.139.1495653782793; Wed, 24 May 2017 12:23:02 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id b23sm3296240qkb.31.2017.05.24.12.23.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 12:23:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 12:22:21 -0700 Message-Id: <20170524192246.15905-9-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170524192246.15905-1-rth@twiddle.net> References: <20170524192246.15905-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::244 Subject: [Qemu-devel] [PATCH v2 08/33] 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: , Cc: thuth@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Reviewed-by: Thomas Huth Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- 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 50689bb..3e75cae 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -268,16 +268,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) { @@ -292,6 +292,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 0f9148a..34ccc22 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1928,7 +1928,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);