From patchwork Thu Sep 27 23:32:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187548 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 E5B732C00B5 for ; Fri, 28 Sep 2012 09:32:21 +1000 (EST) Received: from localhost ([::1]:60384 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNZ5-0008C9-Cf for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 19:32:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNYy-0008BB-2l for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:32:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THNYx-00031X-2e for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:32:12 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:47162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNYw-00031Q-So for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:32:11 -0400 Received: by padfb10 with SMTP id fb10so1765126pad.4 for ; Thu, 27 Sep 2012 16:32:10 -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=lfkLSTZuDvBbMAhCMI7Xow3U6x4n0WatHNti1bssTJE=; b=h/J7yj8SvYR0n3GX1slAdeshhhuAuwo0lpZoNqmot0WCq0y7M1BElxJ5PAlI3yWO/2 NwukXwZu2DwABupCkpj7RUNUGLca0rpfw5+arzyhmX3837EuOEro6cpIaU9Ru3BJ+/Vv ZkYdovyZGKhK4psS+Z0nDSGYK6lHmUba1YZoBSQnlBKyaa14B741oxSJLUwjYi4aa/F8 vcCAu2QOQPe1La1DtSEvfes450ddt0xoJz/Sw9LGtC/O8PCbfTU+sUudOJ3aJZyqJruY ARAgLgU3xHwDCDYEJcRhVLK0gLQ/L91nzI7pmN6ajV1t8YrKRDFugbvmjJ56Gxq7usyN qv5A== Received: by 10.66.77.10 with SMTP id o10mr13149351paw.6.1348788730115; Thu, 27 Sep 2012 16:32:10 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id po4sm4547504pbb.13.2012.09.27.16.32.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 16:32:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 16:32:06 -0700 Message-Id: <1348788726-24396-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 041/147] target-s390: Convert MOVE LONG 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 | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 7a0c999..995c0f6 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -246,6 +246,9 @@ C(0xb900, LPGR, RRE, Z, 0, r2, r1, 0, abs, abs64) C(0xb910, LPGFR, RRE, Z, 0, r2_32s, r1, 0, abs, abs64) +/* MOVE LONG */ + C(0x0e00, MVCL, RR_a, Z, 0, 0, 0, 0, mvcl, 0) + /* MULTIPLY */ C(0x1c00, MR, RR_a, Z, r1p1_32s, r2_32s, new, r1_D32, mul, 0) C(0x5c00, M, RX_a, Z, r1p1_32s, m2_32s, new, r1_D32, mul, 0) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index d0adf5a..52aac3d 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2371,17 +2371,6 @@ static void disas_s390_insn(CPUS390XState *env, DisasContext *s) LOG_DISAS("opc 0x%x\n", opc); switch (opc) { - case 0xe: /* MVCL R1,R2 [RR] */ - insn = ld_code2(env, s->pc); - decode_rr(s, insn, &r1, &r2); - tmp32_1 = tcg_const_i32(r1); - tmp32_2 = tcg_const_i32(r2); - potential_page_fault(s); - gen_helper_mvcl(cc_op, cpu_env, tmp32_1, tmp32_2); - set_cc_static(s); - tcg_temp_free_i32(tmp32_1); - tcg_temp_free_i32(tmp32_2); - break; case 0x28: /* LDR R1,R2 [RR] */ insn = ld_code2(env, s->pc); decode_rr(s, insn, &r1, &r2); @@ -3607,6 +3596,18 @@ static ExitStatus op_mov2(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_mvcl(DisasContext *s, DisasOps *o) +{ + TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); + TCGv_i32 r2 = tcg_const_i32(get_field(s->fields, r2)); + potential_page_fault(s); + gen_helper_mvcl(cc_op, cpu_env, r1, r2); + tcg_temp_free_i32(r1); + tcg_temp_free_i32(r2); + set_cc_static(s); + return NO_EXIT; +} + static ExitStatus op_mul(DisasContext *s, DisasOps *o) { tcg_gen_mul_i64(o->out, o->in1, o->in2);