From patchwork Fri May 12 23:40:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9724931 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 CFAAA60382 for ; Fri, 12 May 2017 23:45:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB7602889A for ; Fri, 12 May 2017 23:45:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF8522889E; Fri, 12 May 2017 23:45:26 +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 8AD712889A for ; Fri, 12 May 2017 23:45:25 +0000 (UTC) Received: from localhost ([::1]:55702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9KFQ-00055u-MZ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 12 May 2017 19:45:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9KAX-0001Em-DO for qemu-devel@nongnu.org; Fri, 12 May 2017 19:40:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9KAW-000429-9v for qemu-devel@nongnu.org; Fri, 12 May 2017 19:40:21 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:36697) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d9KAW-00041I-6L for qemu-devel@nongnu.org; Fri, 12 May 2017 19:40:20 -0400 Received: by mail-qk0-x241.google.com with SMTP id y128so9824539qka.3 for ; Fri, 12 May 2017 16:40:20 -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=FetVDBL2kCMh5gCMiBA8wV0QsE1eF71QfEVOHyx4lsA=; b=jisoWmvkfwezLqo93lqfaiaYLP3Py8rPh9HQwFudjw3WXUaDcsj4zI6bk0uMh/rwJC cJCOgBo//CqOFfpiQh950A82IjfR0rahXUsn5M8QpQ4BDyWtcM2urTBfYDQ977ujfaP4 zn0uuP13d7xu9NOaBLt8Dnqc/vWdsi1MlUGptcgU0gCCXsyHa/PCFrIQVWJ4LePgmNFz RZB04DtIun9YJZrd4HN6mxj065La56hRQ/orx7uxqAF9KeAqQE9S+BbKY+HgvlJK8/k8 jRKZsk6mvzpWj6gAZsPHMXJIjR4SxOEmjTWMJNX4nDOPvfkpgi+1Ry9SaGqTM+RVmLHE p+pw== 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=FetVDBL2kCMh5gCMiBA8wV0QsE1eF71QfEVOHyx4lsA=; b=ba39f5hUBAEqRoxRlCg795fnwJl3ipACZStpanam8fICJjijGDeKCLus4zQm3M/bWM HrFP7Ori8ki5sGgSUUtrKWIovj0sBeEBLKIZFXdeR5nW1NoM+pAPd/Na3JOVCCqPDzFF 6aGSf7cin6HUo+0zBq83VcBhwZHJbJ8nyZ6FpI66u7jwOkM59W4Nrv0Uhm9EfKoiwdif onyE7FQkK8imSRDcZ15O5zw7MEU/najGtm4SI5u1ZGuKJaPK/bFoGDt+0jZHe7RAQGVx dh8e05fUG4HdU7Mt5Fle5mUrEdjf77TUKZR1jLxQ9wbopCOQrI4tQE2Znnyon5cWNEFa YbFQ== X-Gm-Message-State: AODbwcDT8b31XLKOisOolp8XYHuuniDD6Dj01uZqu3pqadj+AanE90An t9EJV3wvh4WSWg== X-Received: by 10.55.119.2 with SMTP id s2mr5844295qkc.219.1494632419676; Fri, 12 May 2017 16:40:19 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id z65sm3367460qkz.29.2017.05.12.16.40.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 May 2017 16:40:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 12 May 2017 16:40:04 -0700 Message-Id: <20170512234009.32557-5-rth@twiddle.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170512234009.32557-1-rth@twiddle.net> References: <20170512234009.32557-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] [PULL 4/9] target/s390x: Implement LOAD PAIR DISJOINT 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: Eric Bischoff , stefanha@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Bischoff Reviewed-by: Aurelien Jarno Signed-off-by: Eric Bischoff Message-Id: <20170228120134.7921-1-ebischoff@suse.com> [rth: Combine the two via insn->data; free the address temps.] Signed-off-by: Richard Henderson --- target/s390x/insn-data.def | 4 +++- target/s390x/translate.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 43c5707..0909060 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 */ + 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 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 2b66a4e..522a5e3 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2559,6 +2559,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); @@ -2759,6 +2760,31 @@ static ExitStatus op_lm64(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_lpd(DisasContext *s, DisasOps *o) +{ + TCGv_i64 a1, a2; + TCGMemOp mop = s->insn->data; + + /* In a parallel context, stop the world and single step. */ + if (parallel_cpus) { + potential_page_fault(s); + gen_exception(EXCP_ATOMIC); + return EXIT_NORETURN; + } + + /* In a serial context, perform the two loads ... */ + a1 = get_address(s, 0, get_field(s->fields, b1), get_field(s->fields, d1)); + a2 = get_address(s, 0, get_field(s->fields, b2), get_field(s->fields, d2)); + tcg_gen_qemu_ld_i64(o->out, a1, get_mem_index(s), mop | MO_ALIGN); + tcg_gen_qemu_ld_i64(o->out2, a2, get_mem_index(s), mop | MO_ALIGN); + tcg_temp_free_i64(a1); + tcg_temp_free_i64(a2); + + /* ... and indicate that we performed them while interlocked. */ + gen_op_movi_cc(s, 0); + return NO_EXIT; +} + #ifndef CONFIG_USER_ONLY static ExitStatus op_lura(DisasContext *s, DisasOps *o) { @@ -4430,6 +4456,22 @@ static void wout_r1_D32(DisasContext *s, DisasFields *f, DisasOps *o) } #define SPEC_wout_r1_D32 SPEC_r1_even +static void wout_r3_P32(DisasContext *s, DisasFields *f, DisasOps *o) +{ + int r3 = 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 = 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);