From patchwork Fri Sep 28 01:03:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187666 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A2FD12C00A9 for ; Fri, 28 Sep 2012 11:03:47 +1000 (EST) Received: from localhost ([::1]:43297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOzZ-0004py-P4 for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 21:03:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOzS-0004pt-Qm for qemu-devel@nongnu.org; Thu, 27 Sep 2012 21:03:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THOzR-0008W5-E1 for qemu-devel@nongnu.org; Thu, 27 Sep 2012 21:03:38 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:58986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOzR-0008Vz-8E for qemu-devel@nongnu.org; Thu, 27 Sep 2012 21:03:37 -0400 Received: by padfb10 with SMTP id fb10so1813254pad.4 for ; Thu, 27 Sep 2012 18:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=2q1aX/1DeN6a8VBeH/3KUW3pinN0ijlIoFvrMwz2+kI=; b=ulVtBlpHcRKGfSB60VOlSEKgKuq+77/psFY9P2R0ODaa0tbwLz3kq18QHEgfnerJqT AlZabZDusA307TJ3RYGTeNtjxvxBojKKh1eorYFlboANIoXcc4u9Kw7qiROA8Qtps0sx JyI7iMEIeHIhxlquWHIal241W20i8TV+cAXD2/5R5IKllBK/hbrMpyfa5jndXn/BJ4rW gQ5hLxvXnmAlosIc2bzv4ULbi5I4vaweihBEY2rEuWcZ9Due4RgiLcUsmnlwUAbex1g9 BuD3co+6xdpuxvQZ+fnoNAy/HKNQVYoG3ov/x0LXSpug1siJiVVvINKAaWjUPg/frWv4 nl3Q== Received: by 10.66.9.2 with SMTP id v2mr13503692paa.65.1348794216610; Thu, 27 Sep 2012 18:03:36 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id i2sm4562631pav.13.2012.09.27.18.03.35 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 18:03:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 18:03:32 -0700 Message-Id: <1348794212-28195-1-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348785610-23418-1-git-send-email-rth@twiddle.net> References: <1348785610-23418-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 127/147] target-s390: Implement LOAD ON CONDITION X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Richard Henderson --- target-s390x/insn-data.def | 5 +++++ target-s390x/translate.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index b739d70..91ee055 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -390,6 +390,11 @@ C(0xb301, LNEBR, RRE, Z, 0, e2, new, e1, nabsf32, f32) C(0xb311, LNDBR, RRE, Z, 0, f2_o, f1, 0, nabsf64, f64) C(0xb341, LNXBR, RRE, Z, 0, x2_o, x1, 0, nabsf128, f128) +/* LOAD ON CONDITION */ + C(0xb9f2, LOCR, RRF_c, LOC, r1, r2, new, r1_32, loc, 0) + 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 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 0c9df96..130b88e 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2045,6 +2045,36 @@ static ExitStatus op_ld64(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_loc(DisasContext *s, DisasOps *o) +{ + DisasCompare c; + + disas_jcc(s, &c, get_field(s->fields, m3)); + + if (c.is_64) { + tcg_gen_movcond_i64(c.cond, o->out, c.u.s64.a, c.u.s64.b, + o->in2, o->in1); + free_compare(&c); + } else { + TCGv_i32 t32 = tcg_temp_new_i32(); + TCGv_i64 t, z; + + tcg_gen_setcond_i32(c.cond, t32, c.u.s32.a, c.u.s32.b); + free_compare(&c); + + t = tcg_temp_new_i64(); + tcg_gen_extu_i32_i64(t, t32); + tcg_temp_free_i32(t32); + + z = tcg_const_i64(0); + tcg_gen_movcond_i64(TCG_COND_NE, o->out, t, z, o->in2, o->in1); + tcg_temp_free_i64(t); + tcg_temp_free_i64(z); + } + + return NO_EXIT; +} + #ifndef CONFIG_USER_ONLY static ExitStatus op_lctl(DisasContext *s, DisasOps *o) {