From patchwork Thu Sep 27 23:48:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187570 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 F3AD32C00B5 for ; Fri, 28 Sep 2012 09:48:22 +1000 (EST) Received: from localhost ([::1]:34120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNob-0008OG-6g for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 19:48:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNoT-0008NC-MP for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:48:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THNoS-0008Jw-Dm for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:48:13 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:49745) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNoS-0008Js-7W for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:48:12 -0400 Received: by pbbrp2 with SMTP id rp2so4322623pbb.4 for ; Thu, 27 Sep 2012 16:48:11 -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=2csfeIBaa7wkxwNZRsdNSq5YGhKLQIReeAv2vGkWV2Y=; b=mdHkGQL6hy9CgL29VJ4M3qbe+1y/2vTQP9cFsj/WDEeG3+z9Mec4H8IT9z9T1RY5JX nM7D11s6U7qIykiTIyqgaxqMOeJ5eItjkXyaPHUIbfIRhPV7o1CMy64PZcZS0DRMHitA 41hEj/xNksKX/oAl8KYPIDovu12+Ql5HDr6oSKgR6prFSjvaCoI/CRFqkvJo6P6UVYXv 5YjllvAZlPY1zGNMBVkg59MIYFaMvG6ozn/gvDdqoZaXhYPG9hfP3W6DwD1IuVySBxKD 5rFrrwEBMP0pBpuNDsBa72hSAZ2VOnz8xyDwaqmsfFNsKT5kU7hc/NKs0oz+o6Ld72O3 mEIQ== Received: by 10.68.218.226 with SMTP id pj2mr15902772pbc.33.1348789691496; Thu, 27 Sep 2012 16:48:11 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id ty1sm4552271pbc.76.2012.09.27.16.48.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 16:48:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 16:48:08 -0700 Message-Id: <1348789688-25059-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.160.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 056/147] target-s390: Convert NI, XI, OI 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 | 6 ++++++ target-s390x/translate.c | 25 ------------------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index c971308..2383a36 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -61,6 +61,8 @@ D(0xa505, NIHL, RI_a, Z, r1_o, i2_16u, r1, 0, andi, 0, 0x1020) D(0xa506, NILH, RI_a, Z, r1_o, i2_16u, r1, 0, andi, 0, 0x1010) D(0xa507, NILL, RI_a, Z, r1_o, i2_16u, r1, 0, andi, 0, 0x1000) + C(0x9400, NI, SI, Z, m1_8u, i2_8u, new, m1_8, and, nz64) + C(0xeb54, NIY, SIY, LD, m1_8u, i2_8u, new, m1_8, and, nz64) /* BRANCH AND SAVE */ C(0x0d00, BASR, RR_a, Z, 0, r2_nz, r1, 0, bas, 0) @@ -160,6 +162,8 @@ /* EXCLUSIVE OR IMMEDIATE */ D(0xc006, XIHF, RIL_a, EI, r1_o, i2_32u, r1, 0, xori, 0, 0x2020) D(0xc007, XILF, RIL_a, EI, r1_o, i2_32u, r1, 0, xori, 0, 0x2000) + C(0x9700, XI, SI, Z, m1_8u, i2_8u, new, m1_8, xor, nz64) + C(0xeb57, XIY, SIY, LD, m1_8u, i2_8u, new, m1_8, xor, nz64) /* EXECUTE */ C(0x4400, EX, RX_a, Z, r1_o, a2, 0, 0, ex, 0) @@ -327,6 +331,8 @@ D(0xa509, OIHL, RI_a, Z, r1_o, i2_16u, r1, 0, ori, 0, 0x1020) D(0xa50a, OILH, RI_a, Z, r1_o, i2_16u, r1, 0, ori, 0, 0x1010) D(0xa50b, OILL, RI_a, Z, r1_o, i2_16u, r1, 0, ori, 0, 0x1000) + C(0x9600, OI, SI, Z, m1_8u, i2_8u, new, m1_8, or, nz64) + C(0xeb56, OIY, SIY, LD, m1_8u, i2_8u, new, m1_8, or, nz64) /* ROTATE LEFT SINGLE LOGICAL */ C(0xeb1d, RLL, RSY_a, Z, r3_o, sh32, new, r1_32, rll32, 0) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 2661868..331580f 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2233,31 +2233,6 @@ static void disas_s390_insn(CPUS390XState *env, DisasContext *s) LOG_DISAS("opc 0x%x\n", opc); switch (opc) { - case 0x94: /* NI D1(B1),I2 [SI] */ - case 0x96: /* OI D1(B1),I2 [SI] */ - case 0x97: /* XI D1(B1),I2 [SI] */ - insn = ld_code4(env, s->pc); - tmp = decode_si(s, insn, &i2, &b1, &d1); - tmp2 = tcg_temp_new_i64(); - tcg_gen_qemu_ld8u(tmp2, tmp, get_mem_index(s)); - switch (opc) { - case 0x94: - tcg_gen_andi_i64(tmp2, tmp2, i2); - break; - case 0x96: - tcg_gen_ori_i64(tmp2, tmp2, i2); - break; - case 0x97: - tcg_gen_xori_i64(tmp2, tmp2, i2); - break; - default: - tcg_abort(); - } - tcg_gen_qemu_st8(tmp2, tmp, get_mem_index(s)); - set_cc_nz_u64(s, tmp2); - tcg_temp_free_i64(tmp); - tcg_temp_free_i64(tmp2); - break; case 0x9a: /* LAM R1,R3,D2(B2) [RS] */ insn = ld_code4(env, s->pc); decode_rs(s, insn, &r1, &r3, &b2, &d2);