From nobody Wed Nov 5 17:23:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496797581096683.1369060598641; Tue, 6 Jun 2017 18:06:21 -0700 (PDT) Received: from localhost ([::1]:40711 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIPQR-0001fc-GS for importer@patchew.org; Tue, 06 Jun 2017 21:06:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOu5-0003w9-9U for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOu4-0002S6-7i for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:53 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:36042) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOu4-0002Rd-43 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:52 -0400 Received: by mail-qt0-x241.google.com with SMTP id s33so19305660qtg.3 for ; Tue, 06 Jun 2017 17:32:52 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:32:50 -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=Cq5lpFOkQv00k1Y5uM+OanvEhv6Ud2DUyq4uSjF7g80=; b=Vm0HUXBJh9UXZKM87IBdy72JEaK+MyVeFRAe1fRf4tZ4sUcN/CRZupM6AdeE38OWd5 WZVWxthuX20NJF8tyiUv1TDv4x/JkvO1RIX96XpnBug/zqLUxJ8JPfVglGLsn0YHwLc3 4Iu4Vqtz8gLyLiTRqOs2eFRcT/XgKuOhXCZdHm2nyeGUQKecFunCkfILNfxsHRrEPc0T WvPXKhxLqvL8zrHvMrFReHtFyJwDD8wC/7AgRBIUATorBCLLes+InqwS1VoiaNUtCgvT SN/rJHNXCEg6JyP1CHU12cGhxftWP8AhuIZu1NzZgbG8x0SZQUXYgR8WIvwT+lgq5syI Ta5Q== 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=Cq5lpFOkQv00k1Y5uM+OanvEhv6Ud2DUyq4uSjF7g80=; b=uNC2onRZV/N/vd4OHTMdFJSQU6JpXY/1JVBkiPLcQbzqG5gpjWk1TNbfI0/Ybh4qMA VZZNg9X5EG5+OTP0kC8IzVJ8VB+4bCJ8tOBr62/5OXuX2zRjbudLZgXg6TjAsvfnyNL3 J8PVTvpkg7Vkwn02Sikh88q+qfWvESbXhlk43XpCehFx7jlfZ5T9IBVjPtd0oM3Qyg7x dvfuR5s5a2KKUS5NMGDitt3klwOMjMtR4dOqE67lI1Ww4XatgAsvEB6qliBhdsz71OnC +anC3vlOfBBWypNniWzSHWz1/ZjSUIULAFSftYKf//3KW+LdrV51XeDwuLR8uSFE+JtI 9BJw== X-Gm-Message-State: AKS2vOyaRGKslEVKU3DrWarjV3nYJ6y5brxlBhxH8+/JVuB7NWt7VWdP cf2wBNuYldtuu2zQU4k= X-Received: by 10.200.8.169 with SMTP id v38mr30839920qth.213.1496795571381; Tue, 06 Jun 2017 17:32:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:31:15 -0700 Message-Id: <20170607003119.14778-67-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 66/70] target/s390x: implement LOAD PAIR FROM QUADWORD 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aurelien Jarno Signed-off-by: Aurelien Jarno Message-Id: <20170604202034.16615-2-aurelien@aurel32.net> Signed-off-by: Richard Henderson --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 2 ++ target/s390x/mem_helper.c | 27 +++++++++++++++++++++++++++ target/s390x/translate.c | 7 +++++++ 4 files changed, 37 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 11a545e..054ccd6 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -103,6 +103,7 @@ DEF_HELPER_FLAGS_2(sfas, TCG_CALL_NO_WG, void, env, i64) DEF_HELPER_FLAGS_1(popcnt, TCG_CALL_NO_RWG_SE, i64, i64) DEF_HELPER_FLAGS_1(stfl, TCG_CALL_NO_RWG, void, env) DEF_HELPER_2(stfle, i32, env, i64) +DEF_HELPER_FLAGS_2(lpq, TCG_CALL_NO_WG, i64, env, i64) =20 #ifndef CONFIG_USER_ONLY DEF_HELPER_3(servc, i32, env, i64, i64) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 9976d29..32dee40 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -517,6 +517,8 @@ /* LOAD PAIR DISJOINT */ D(0xc804, LPD, SSF, ILA, 0, 0, new_P, r3_P32, lpd, 0, MO_TEUL) D(0xc805, LPDG, SSF, ILA, 0, 0, new_P, r3_P64, lpd, 0, MO_TEQ) +/* LOAD PAIR FROM QUADWORD */ + C(0xe38f, LPQ, RXY_a, Z, 0, a2, r1_P, 0, lpq, 0) /* LOAD POSITIVE */ C(0x1000, LPR, RR_a, Z, 0, r2_32s, new, r1_32, abs, abs32) C(0xb900, LPGR, RRE, Z, 0, r2, r1, 0, abs, abs64) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index be89cc4..f48908c 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1665,6 +1665,33 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t ad= dr) } #endif =20 +/* load pair from quadword */ +uint64_t HELPER(lpq)(CPUS390XState *env, uint64_t addr) +{ + uintptr_t ra =3D GETPC(); + uint64_t hi, lo; + + if (parallel_cpus) { +#ifndef CONFIG_ATOMIC128 + cpu_loop_exit_atomic(ENV_GET_CPU(env), ra); +#else + int mem_idx =3D cpu_mmu_index(env, false); + TCGMemOpIdx oi =3D make_memop_idx(MO_TEQ | MO_ALIGN_16, mem_idx); + Int128 v =3D helper_atomic_ldo_be_mmu(env, addr, oi, ra); + hi =3D int128_gethi(v); + lo =3D int128_getlo(v); +#endif + } else { + check_alignment(env, addr, 16, ra); + + hi =3D cpu_ldq_data_ra(env, addr + 0, ra); + lo =3D cpu_ldq_data_ra(env, addr + 8, ra); + } + + env->retxl =3D lo; + return hi; +} + /* Execute instruction. This instruction executes an insn modified with the contents of r1. It does not change the executed instruction in mem= ory; it does not change the program counter. diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 9f3443e..10019ed 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2909,6 +2909,13 @@ static ExitStatus op_lpd(DisasContext *s, DisasOps *= o) return NO_EXIT; } =20 +static ExitStatus op_lpq(DisasContext *s, DisasOps *o) +{ + gen_helper_lpq(o->out, cpu_env, o->in2); + return_low128(o->out2); + return NO_EXIT; +} + #ifndef CONFIG_USER_ONLY static ExitStatus op_lura(DisasContext *s, DisasOps *o) { --=20 2.9.4