From patchwork Sun Sep 9 21:05:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182729 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 A73FD2C0087 for ; Mon, 10 Sep 2012 09:07:25 +1000 (EST) Received: from localhost ([::1]:59977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAqb5-00040B-Nj for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 19:07:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAoio-0007vt-Hc for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAoin-00063F-HS for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:14 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:63857) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAoin-0005xl-C7 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:13 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so292285pbb.4 for ; Sun, 09 Sep 2012 14:07:13 -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=bY+JYN25q6qSZIYh/h3gcD/9ED57u9PFKHxF9kn68C4=; b=QadIImR/3nyOwTCyHoNV/coTzfny07BJxPRRi4PJzB9eSm+l5fbKsFuD9tMQfMjPTA 0djTv49BR+7+VEjHIUwUuCuFBf4QrwGuTGpET8434xWH6teqIWEKg9mxywo6ZxX7k3mH Xvq+nwPHPFi7L1Db6jZnNTPy/69EHFal8ly0tbTYw+HF0Rr4cXgc+DvEunZ2xaLbm79H /pxhb8Qyr1lSOoiftlkXYiKsi52kdcggn6+dXTjzYFzMODNpuo97RyrQMewqPbTzyhYB qdubxQLdLnZAkQqMXNV46UVGcJsgRNevxgOGpe54F4bw5of2z0160P/p/GiLAxkWLd8r yyvw== Received: by 10.68.224.161 with SMTP id rd1mr2058785pbc.133.1347224833141; Sun, 09 Sep 2012 14:07:13 -0700 (PDT) Received: from anchor.twiddle.home ([173.160.232.49]) by mx.google.com with ESMTPS id tw5sm662053pbc.48.2012.09.09.14.07.12 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:04 -0700 Message-Id: <1347224784-19472-47-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1347224784-19472-1-git-send-email-rth@twiddle.net> References: <1347224784-19472-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.160.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 046/126] target-s390: Convert SHIFT DOUBLE 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 | 8 ++++++++ target-s390x/translate.c | 30 ------------------------------ 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index fd94333..103c1d2 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -335,6 +335,14 @@ C(0x8800, SRL, RS_a, Z, r1_32u, sh32, new, r1_32, srl, 0) C(0xebde, SRLK, RSY_a, DO, r3_32u, sh32, new, r1_32, srl, 0) C(0xeb0c, SRLG, RSY_a, Z, r3_o, sh64, r1, 0, srl, 0) +/* SHIFT LEFT DOUBLE */ + D(0x8f00, SLDA, RS_a, Z, r1_P32, sh64, new, r1_P32, sla, 0, 31) +/* SHIFT LEFT DOUBLE LOGICAL */ + C(0x8d00, SLDL, RS_a, Z, r1_P32, sh64, new, r1_P32, sll, 0) +/* SHIFT RIGHT DOUBLE */ + C(0x8e00, SRDA, RS_a, Z, r1_P32, sh64, new, r1_P32, sra, s64) +/* SHIFT RIGHT DOUBLE LOGICAL */ + C(0x8c00, SRDL, RS_a, Z, r1_P32, sh64, new, r1_P32, srl, 0) /* STORE */ C(0x5000, ST, RX_a, Z, r1_o, a2, 0, 0, st32, 0) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index c37c385..e78e4bb 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2281,36 +2281,6 @@ static void disas_s390_insn(DisasContext *s) LOG_DISAS("opc 0x%x\n", opc); switch (opc) { - case 0x8c: /* SRDL R1,D2(B2) [RS] */ - case 0x8d: /* SLDL R1,D2(B2) [RS] */ - case 0x8e: /* SRDA R1,D2(B2) [RS] */ - insn = ld_code4(s->pc); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); /* shift */ - tmp2 = tcg_temp_new_i64(); - tmp32_1 = load_reg32(r1); - tmp32_2 = load_reg32(r1 + 1); - tcg_gen_concat_i32_i64(tmp2, tmp32_2, tmp32_1); /* operand */ - switch (opc) { - case 0x8c: - tcg_gen_shr_i64(tmp2, tmp2, tmp); - break; - case 0x8d: - tcg_gen_shl_i64(tmp2, tmp2, tmp); - break; - case 0x8e: - tcg_gen_sar_i64(tmp2, tmp2, tmp); - set_cc_s64(s, tmp2); - break; - } - tcg_gen_shri_i64(tmp, tmp2, 32); - tcg_gen_trunc_i64_i32(tmp32_1, tmp); - store_reg32(r1, tmp32_1); - tcg_gen_trunc_i64_i32(tmp32_2, tmp2); - store_reg32(r1 + 1, tmp32_2); - tcg_temp_free_i64(tmp); - tcg_temp_free_i64(tmp2); - break; case 0x98: /* LM R1,R3,D2(B2) [RS] */ case 0x90: /* STM R1,R3,D2(B2) [RS] */ insn = ld_code4(s->pc);