From patchwork Sun Sep 9 21:04:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182716 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 DD3BA2C00A0 for ; Mon, 10 Sep 2012 08:57:58 +1000 (EST) Received: from localhost ([::1]:51904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojK-000079-8z for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:07:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAoiS-0006qm-73 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:06:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAoiQ-0005vA-W9 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:06:52 -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 1TAoiQ-0005pO-QI for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:06:50 -0400 Received: by mail-pz0-f45.google.com with SMTP id n15so968311dad.4 for ; Sun, 09 Sep 2012 14:06:50 -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=hi6sf9iEKrxkF7g+iFI+zYhK7QowdF+kDJBh89Vbh8Q=; b=Pkw5FGkkkgDCcl2xuwgYs/AlnFjJfb9hg1EjvbLh8zSoi2k7oY5P6j9XNjukGw461D fPcUMPSWIy/DRNfjyLWBy+sb0FAnegpedOqhA9Bxg8oTxhZLJP1RJ7/033fNfvZRjUHw xpxMLuCZTCa4751oHO09shqqeFil78IJMAuvMQSEJhu1jwnJGS8t08/JzuTD0awSQU79 /SxG38Yfwr4yNVGwMbz62JtPUAzSfp6JRpUtLhNIfaBZT3jq8JlOmoMZi29OztC4la77 mXeA95x7a/jXnKhip6I6dmAvr1IRncXuO9qm8w3r+FxrFtV5ikNC2xs1u9Ox9IiK/r7Q Lplg== Received: by 10.68.218.196 with SMTP id pi4mr2025347pbc.128.1347224810552; Sun, 09 Sep 2012 14:06:50 -0700 (PDT) Received: from anchor.twiddle.home ([173.160.232.49]) by mx.google.com with ESMTPS id tw5sm662053pbc.48.2012.09.09.14.06.49 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:06:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:04:38 -0700 Message-Id: <1347224784-19472-21-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 020/126] target-s390: Convert LOAD AND TEST 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 | 7 +++++++ target-s390x/translate.c | 37 ++++++++++--------------------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 6b08340..06d0ad8 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -126,6 +126,13 @@ C(0xe371, LAY, RXY_a, LD, 0, a2, 0, r1, mov2, 0) /* LOAD ADDRESS RELATIVE LONG */ C(0xc000, LARL, RIL_b, Z, 0, ri2, 0, r1, mov2, 0) +/* LOAD AND TEST */ + C(0x1200, LTR, RR_a, Z, 0, r2_o, 0, cond_r1r2_32, mov2, s32) + C(0xb902, LTGR, RRE, Z, 0, r2_o, 0, r1, mov2, s64) + C(0xb912, LTGFR, RRE, Z, 0, r2_32s, 0, r1, mov2, s64) + C(0xe312, LT, RXY_a, EI, 0, a2, new, r1_32, ld32s, s64) + C(0xe302, LTG, RXY_a, EI, 0, a2, r1, 0, ld64, s64) + C(0xe332, LTGF, RXY_a, GIE, 0, a2, r1, 0, ld32s, s64) /* LOAD BYTE */ C(0xb926, LBR, RRE, EI, 0, r2_8s, 0, r1_32, mov2, 0) C(0xb906, LGBR, RRE, EI, 0, r2_8s, 0, r1, mov2, 0) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index e9c9f34..1c83009 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1344,23 +1344,6 @@ static void disas_e3(DisasContext* s, int op, int r1, int x2, int b2, int d2) op, r1, x2, b2, d2); addr = get_address(s, x2, b2, d2); switch (op) { - case 0x2: /* LTG R1,D2(X2,B2) [RXY] */ - case 0x4: /* LG r1,d2(x2,b2) */ - tcg_gen_qemu_ld64(regs[r1], addr, get_mem_index(s)); - if (op == 0x2) { - set_cc_s64(s, regs[r1]); - } - break; - case 0x12: /* LT R1,D2(X2,B2) [RXY] */ - tmp2 = tcg_temp_new_i64(); - tmp32_1 = tcg_temp_new_i32(); - tcg_gen_qemu_ld32s(tmp2, addr, get_mem_index(s)); - tcg_gen_trunc_i64_i32(tmp32_1, tmp2); - store_reg32(r1, tmp32_1); - set_cc_s32(s, tmp32_1); - tcg_temp_free_i64(tmp2); - tcg_temp_free_i32(tmp32_1); - break; case 0xd: /* DSG R1,D2(X2,B2) [RXY] */ case 0x1d: /* DSGF R1,D2(X2,B2) [RXY] */ tmp2 = tcg_temp_new_i64(); @@ -3176,16 +3159,6 @@ static void disas_s390_insn(DisasContext *s) store_reg32(r1, tmp32_1); tcg_temp_free_i32(tmp32_1); break; - case 0x12: /* LTR R1,R2 [RR] */ - insn = ld_code2(s->pc); - decode_rr(s, insn, &r1, &r2); - tmp32_1 = load_reg32(r2); - if (r1 != r2) { - store_reg32(r1, tmp32_1); - } - set_cc_s32(s, tmp32_1); - tcg_temp_free_i32(tmp32_1); - break; case 0x13: /* LCR R1,R2 [RR] */ insn = ld_code2(s->pc); decode_rr(s, insn, &r1, &r2); @@ -4383,6 +4356,16 @@ static void cout_nz64(DisasContext *s, DisasOps *o) gen_op_update1_cc_i64(s, CC_OP_NZ, o->out); } +static void cout_s32(DisasContext *s, DisasOps *o) +{ + gen_op_update1_cc_i64(s, CC_OP_LTGT0_32, o->out); +} + +static void cout_s64(DisasContext *s, DisasOps *o) +{ + gen_op_update1_cc_i64(s, CC_OP_LTGT0_64, o->out); +} + static void cout_subs32(DisasContext *s, DisasOps *o) { gen_op_update3_cc_i64(s, CC_OP_SUB_32, o->in1, o->in2, o->out);