From nobody Thu May 2 02:53:45 2024 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; 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 1488281930716641.5881583951934; Tue, 28 Feb 2017 03:38:50 -0800 (PST) Received: from localhost ([::1]:60426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cig7E-0004j9-91 for importer@patchew.org; Tue, 28 Feb 2017 06:38:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cig4p-0002z1-RL for qemu-devel@nongnu.org; Tue, 28 Feb 2017 06:36:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cig4o-0004RZ-7L for qemu-devel@nongnu.org; Tue, 28 Feb 2017 06:36:19 -0500 Received: from charybdis-ext.suse.de ([195.135.221.2]:40704 helo=tegan.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cig4o-0004RV-1J for qemu-devel@nongnu.org; Tue, 28 Feb 2017 06:36:18 -0500 Received: by tegan.suse.de (Postfix, from userid 1000) id 8E506472DB; Tue, 28 Feb 2017 12:36:17 +0100 (CET) From: Eric Bischoff To: Richard Henderson , Alexander Graf Date: Tue, 28 Feb 2017 12:35:35 +0100 Message-Id: <20170228113535.7099-2-ebischoff@suse.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170228113535.7099-1-ebischoff@suse.com> References: <20170228113535.7099-1-ebischoff@suse.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.135.221.2 Subject: [Qemu-devel] [PATCH] Adding support for LPD and LPDG instructions 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: Michal Marek , Miroslav Benes , QEmu developers , Eric Bischoff Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Eric Bischoff LPD =3D LOAD PAIR DISJOINT Third patch --- target/s390x/insn-data.def | 4 ++- target/s390x/translate.c | 63 ++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 075ff59..72d1017 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -504,7 +504,9 @@ C(0xb9e2, LOCGR, RRF_c, LOC, r1, r2, r1, 0, loc, 0) C(0xebf2, LOC, RSY_b, LOC, r1, m2_32u, new, r1_32, loc, 0) C(0xebe2, LOCG, RSY_b, LOC, r1, m2_64, r1, 0, loc, 0) -/* LOAD PAIR DISJOINT TODO */ +/* LOAD PAIR DISJOINT */ + C(0xc804, LPD, SSF, ILA, 0, 0, 0, r3_P32, lpd32, 0) + C(0xc805, LPDG, SSF, ILA, 0, 0, 0, r3_P64, lpd64, 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/translate.c b/target/s390x/translate.c index 01c6217..28a53ec 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2558,6 +2558,7 @@ static ExitStatus op_lctlg(DisasContext *s, DisasOps = *o) tcg_temp_free_i32(r3); return NO_EXIT; } + static ExitStatus op_lra(DisasContext *s, DisasOps *o) { check_privileged(s); @@ -2750,6 +2751,52 @@ static ExitStatus op_lm64(DisasContext *s, DisasOps = *o) return NO_EXIT; } =20 +static ExitStatus op_lpd32(DisasContext *s, DisasOps *o) +{ + TCGv_i64 a1, a2; + + /* In a parallel context, stop the world and single step. */ + if (parallel_cpus) { + potential_page_fault(s); + gen_helper_exit_atomic(cpu_env); + return EXIT_NORETURN; + } + + /* In a serial context, perform the two loads and indicate + that we performed them while interlocked. */ + a1 =3D get_address(s, 0, get_field(s->fields, b1), get_field(s->fields= , d1)); + a2 =3D get_address(s, 0, get_field(s->fields, b2), get_field(s->fields= , d2)); + o->out =3D tcg_temp_new_i64(); + tcg_gen_qemu_ld32s(o->out, a1, get_mem_index(s)); + o->out2 =3D tcg_temp_new_i64(); + tcg_gen_qemu_ld32s(o->out2, a2, get_mem_index(s)); + gen_op_movi_cc(s, 0); + return NO_EXIT; +} + +static ExitStatus op_lpd64(DisasContext *s, DisasOps *o) +{ + TCGv_i64 a1, a2; + + /* In a parallel context, stop the world and single step. */ + if (parallel_cpus) { + potential_page_fault(s); + gen_helper_exit_atomic(cpu_env); + return EXIT_NORETURN; + } + + /* In a serial context, perform the two loads and indicate + that we performed them while interlocked. */ + a1 =3D get_address(s, 0, get_field(s->fields, b1), get_field(s->fields= , d1)); + a2 =3D get_address(s, 0, get_field(s->fields, b2), get_field(s->fields= , d2)); + o->out =3D tcg_temp_new_i64(); + tcg_gen_qemu_ld64(o->out, a1, get_mem_index(s)); + o->out2 =3D tcg_temp_new_i64(); + tcg_gen_qemu_ld64(o->out2, a2, get_mem_index(s)); + gen_op_movi_cc(s, 0); + return NO_EXIT; +} + #ifndef CONFIG_USER_ONLY static ExitStatus op_lura(DisasContext *s, DisasOps *o) { @@ -4420,6 +4467,22 @@ static void wout_r1_D32(DisasContext *s, DisasFields= *f, DisasOps *o) } #define SPEC_wout_r1_D32 SPEC_r1_even =20 +static void wout_r3_P32(DisasContext *s, DisasFields *f, DisasOps *o) +{ + int r3 =3D get_field(f, r3); + store_reg32_i64(r3, o->out); + store_reg32_i64(r3 + 1, o->out2); +} +#define SPEC_wout_r3_P32 SPEC_r3_even + +static void wout_r3_P64(DisasContext *s, DisasFields *f, DisasOps *o) +{ + int r3 =3D get_field(f, r3); + store_reg(r3, o->out); + store_reg(r3 + 1, o->out2); +} +#define SPEC_wout_r3_P64 SPEC_r3_even + static void wout_e1(DisasContext *s, DisasFields *f, DisasOps *o) { store_freg32_i64(get_field(f, r1), o->out); --=20 2.10.2