From patchwork Wed Jun 7 00:30:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9770441 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 00A1660234 for ; Wed, 7 Jun 2017 01:22:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D528A2654B for ; Wed, 7 Jun 2017 01:22:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9DA327E63; Wed, 7 Jun 2017 01:22:42 +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 5F68D2654B for ; Wed, 7 Jun 2017 01:22:42 +0000 (UTC) Received: from localhost ([::1]:40695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIPOh-0007pF-OM for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Jun 2017 21:04:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOtk-0003Pt-87 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOti-0002Dj-BP for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:32 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:36027) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOti-0002Dd-82 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:30 -0400 Received: by mail-qt0-x241.google.com with SMTP id s33so19305037qtg.3 for ; Tue, 06 Jun 2017 17:32:30 -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=D/b4PjCdQu0RYNyCDMQLndJJMv4w2S+AO1qodNncADQ=; b=OGLT5RXS9mSVgka5FeqjcNXeOj+PPcTTx1Oxq4TckGvfxdqu+Db1EbTNtYAbyEiBH0 Q9/cxpDQqOFzLBFIYa4Cw8X3cPNifErWyQ5q9eQ5i0FMA7KjhF3O6qMvs40lOeei1X0j HzREEcl/3K/mmWYuJboOvIJuzi5OjTeJWBLMjzgFS1+jnnBX4q5CBPLCEC8a/MtVNjJV o3oq+mCvp2VzQW8FqSRwxH4H6UrYSU0CnuJEqTuLCIHIiq1fspE7CV5uLnyCXGelsenh sFfHPVauiJPhfG8GlzDQRDVz6PhygalD0WX59sOz1Qr4hOMkr97OIKW7gtY/L1jn17uV 5a5A== 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=D/b4PjCdQu0RYNyCDMQLndJJMv4w2S+AO1qodNncADQ=; b=R697372qoFH0SwRXhLgxZdcQLbcbauTnMCHJmUL4O/dpdH/lDrJ0OWgMbAAzp2Od5F vYznRz6qguWSaUtBc95vMdqOnHoJ3pEqIqhoDhO4UU19yE97WpcCWUsC3+5umExGvB7l yqH35gmR5CG3eiwCCNF3ZgzgHRouFXrReEpHueaoMn/Hr73fuuXDKEDGdyQb0tipo9YW H0+cU6vGUg5rMp2w8kGU6ggnv/vha18eXxzlxoda6GSd1RNZSmX4WyqkXHwmltELch3r RXOQAdTSZlHS2EcWGfxuFloImLKnxzVo1Sqsq4gTonhgVl5WhlMCePZNMlPr9i4xNJBo VXwQ== X-Gm-Message-State: AODbwcDhDA7Z/DntjKLZ8ZLbiXvpkbZLj2/H/HUQ8XeANzQxJ2ygbvAn R3q/UxVSeYiLQ30KhmA= X-Received: by 10.237.47.69 with SMTP id l63mr2164429qtd.196.1496795549548; Tue, 06 Jun 2017 17:32:29 -0700 (PDT) Received: from bigtime.twiddle.net.com (71-217-91-69.tukw.qwest.net. [71.217.91.69]) by smtp.gmail.com with ESMTPSA id m47sm29286qtc.36.2017.06.06.17.32.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:32:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:59 -0700 Message-Id: <20170607003119.14778-51-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170607003119.14778-1-rth@twiddle.net> References: <20170607003119.14778-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] [PULL v2 50/70] target/s390x: implement MOVE ZONES 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: peter.maydell@linaro.org, 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 From: Aurelien Jarno Reviewed-by: Richard Henderson Signed-off-by: Aurelien Jarno Message-Id: <20170531220129.27724-14-aurelien@aurel32.net> Signed-off-by: Richard Henderson --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 2 ++ target/s390x/mem_helper.c | 13 +++++++++++++ target/s390x/translate.c | 8 ++++++++ 4 files changed, 24 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 385ce9a..a537e51 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -16,6 +16,7 @@ DEF_HELPER_4(clst, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_4(mvn, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_FLAGS_4(mvo, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_FLAGS_4(mvpg, TCG_CALL_NO_WG, i32, env, i64, i64, i64) +DEF_HELPER_FLAGS_4(mvz, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_4(mvst, i64, env, i64, i64, i64) DEF_HELPER_4(ex, void, env, i32, i64, i64) DEF_HELPER_FLAGS_4(stam, TCG_CALL_NO_WG, void, env, i32, i64, i32) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 45aaf11..7fb2e25 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -586,6 +586,8 @@ /* Really format SS_b, but we pack both lengths into one argument for the helper call, so we might as well leave one 8-bit field. */ C(0xf100, MVO, SS_a, Z, la1, a2, 0, 0, mvo, 0) +/* MOVE ZONES */ + C(0xd300, MVZ, SS_a, Z, la1, a2, 0, 0, mvz, 0) /* MULTIPLY */ C(0x1c00, MR, RR_a, Z, r1p1_32s, r2_32s, new, r1_D32, mul, 0) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index facac4b..10754dd 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -287,6 +287,19 @@ void HELPER(mvo)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src) } } +/* move zones */ +void HELPER(mvz)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src) +{ + uintptr_t ra = GETPC(); + int i; + + for (i = 0; i <= l; i++) { + uint8_t b = cpu_ldub_data_ra(env, dest + i, ra) & 0x0f; + b |= cpu_ldub_data_ra(env, src + i, ra) & 0xf0; + cpu_stb_data_ra(env, dest + i, b, ra); + } +} + /* compare unsigned byte arrays */ static uint32_t do_helper_clc(CPUS390XState *env, uint32_t l, uint64_t s1, uint64_t s2, uintptr_t ra) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 7be1c70..a21de09 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3019,6 +3019,14 @@ static ExitStatus op_mvst(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_mvz(DisasContext *s, DisasOps *o) +{ + TCGv_i32 l = tcg_const_i32(get_field(s->fields, l1)); + gen_helper_mvz(cpu_env, l, o->addr1, o->in2); + tcg_temp_free_i32(l); + return NO_EXIT; +} + static ExitStatus op_mul(DisasContext *s, DisasOps *o) { tcg_gen_mul_i64(o->out, o->in1, o->in2);