From patchwork Sun Sep 9 21:05:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182655 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 76D7E2C0095 for ; Mon, 10 Sep 2012 07:12:09 +1000 (EST) Received: from localhost ([::1]:36229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAonX-0006qL-DK for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:12:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAoj7-0008N6-Qe for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAoj6-00069U-LO for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:33 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:63059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAoj6-0005pO-FH for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:32 -0400 Received: by mail-pz0-f45.google.com with SMTP id n15so968311dad.4 for ; Sun, 09 Sep 2012 14:07:32 -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=9ZGN2dij4Zw/eLnHWm75o0p363IGNBPs5tZMRDV7fKg=; b=iL3m8LxZTm8uLD8YLTt7zu9f1Xf3cUf7hL3GE4laWwXybEyCUtv1Gqa5gu7Qc+SMrH KEW4+iJ4sDpc1xetD4hmPwSKrlCtzdLGuaffse4AYAISZ07NCI9tjN+oRuX9ziDQr25O zHgFB9mextmgJtxm4Iv06TbyEwl7DyC/jhe4EDnfiGe4CQA1SMJiCt7AdoEkhC09Bwrm bcureNsMtUGssPIJR1fBSG4BROd3S/QQaIP08Sm7Jc1ODr+LFGIw7C7WMV4Y8oiYTm45 hyfcQBsie+xEGBehrCm94f7KBo2HkqRaTGOH0O++y76lrbW0vXes5rmvTYBklxxZlS0/ q5aw== Received: by 10.68.242.97 with SMTP id wp1mr2062540pbc.159.1347224852211; Sun, 09 Sep 2012 14:07:32 -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.31 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:26 -0700 Message-Id: <1347224784-19472-69-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.210.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 068/126] target-s390: Convert LLGT 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 | 3 +++ target-s390x/translate.c | 49 ++++++---------------------------------------- 2 files changed, 9 insertions(+), 43 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 11903bb..35a52f5 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -285,6 +285,9 @@ D(0xa50d, LLIHL, RI_a, Z, 0, i2_16u_shl, 0, r1, mov2, 0, 32) D(0xa50e, LLILH, RI_a, Z, 0, i2_16u_shl, 0, r1, mov2, 0, 16) D(0xa50f, LLILL, RI_a, Z, 0, i2_16u_shl, 0, r1, mov2, 0, 0) +/* LOAD LOGICAL THIRTY ONE BITS */ + C(0xb917, LLGTR, RRE, Z, 0, r2_o, r1, 0, llgt, 0) + C(0xe317, LLGT, RXY_a, Z, 0, m2_32u, r1, 0, llgt, 0) /* LOAD NEGATIVE */ C(0x1100, LNR, RR_a, Z, 0, r2_32s, new, r1_32, nabs, nabs32) C(0xb901, LNGR, RRE, Z, 0, r2, r1, 0, nabs, nabs64) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 92fb4c7..0d09fcd 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -999,29 +999,6 @@ static void free_compare(DisasCompare *c) } } -static void disas_e3(DisasContext* s, int op, int r1, int x2, int b2, int d2) -{ - TCGv_i64 addr, tmp2; - - LOG_DISAS("disas_e3: op 0x%x r1 %d x2 %d b2 %d d2 %d\n", - op, r1, x2, b2, d2); - addr = get_address(s, x2, b2, d2); - switch (op) { - case 0x17: /* LLGT R1,D2(X2,B2) [RXY] */ - tmp2 = tcg_temp_new_i64(); - tcg_gen_qemu_ld32u(tmp2, addr, get_mem_index(s)); - tcg_gen_andi_i64(tmp2, tmp2, 0x7fffffffULL); - store_reg(r1, tmp2); - tcg_temp_free_i64(tmp2); - break; - default: - LOG_DISAS("illegal e3 operation 0x%x\n", op); - gen_illegal_opcode(s); - break; - } - tcg_temp_free_i64(addr); -} - static void disas_ed(DisasContext *s, int op, int r1, int x2, int b2, int d2, int r1b) { @@ -1798,15 +1775,6 @@ static void disas_b9(DisasContext *s, int op, int r1, int r2) LOG_DISAS("disas_b9: op 0x%x r1 %d r2 %d\n", op, r1, r2); switch (op) { - case 0x17: /* LLGTR R1,R2 [RRE] */ - tmp32_1 = load_reg32(r2); - tmp = tcg_temp_new_i64(); - tcg_gen_andi_i32(tmp32_1, tmp32_1, 0x7fffffffUL); - tcg_gen_extu_i32_i64(tmp, tmp32_1); - store_reg(r1, tmp); - tcg_temp_free_i32(tmp32_1); - tcg_temp_free_i64(tmp); - break; case 0x83: /* FLOGR R1,R2 [RRE] */ tmp = load_reg(r2); tmp32_1 = tcg_const_i32(r1); @@ -1852,17 +1820,6 @@ static void disas_s390_insn(DisasContext *s) op = (insn >> 16) & 0xff; disas_b9(s, op, r1, r2); break; - case 0xe3: - insn = ld_code6(s->pc); - debug_insn(insn); - op = insn & 0xff; - r1 = (insn >> 36) & 0xf; - x2 = (insn >> 32) & 0xf; - b2 = (insn >> 28) & 0xf; - d2 = ((int)((((insn >> 16) & 0xfff) - | ((insn << 4) & 0xff000)) << 12)) >> 12; - disas_e3(s, op, r1, x2, b2, d2 ); - break; case 0xed: insn = ld_code6(s->pc); debug_insn(insn); @@ -2604,6 +2561,12 @@ static ExitStatus op_insi(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_llgt(DisasContext *s, DisasOps *o) +{ + tcg_gen_andi_i64(o->out, o->in2, 0x7fffffff); + return NO_EXIT; +} + static ExitStatus op_ld8s(DisasContext *s, DisasOps *o) { tcg_gen_qemu_ld8s(o->out, o->in2, get_mem_index(s));