From patchwork Sun Sep 9 21:04:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182700 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 5AF5A2C0084 for ; Mon, 10 Sep 2012 08:37:32 +1000 (EST) Received: from localhost ([::1]:58904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAom8-0003tj-2x for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:10:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAoie-0007RX-7V for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAoid-0005zO-0x for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:04 -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 1TAoic-0005xl-R0 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:02 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so292285pbb.4 for ; Sun, 09 Sep 2012 14:07:02 -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=RfbANbe1gmGqH/MKK7DIuEjZR5BGbiz54Q02K0tdSnA=; b=VvsSQxJ7E9w8d82OdQSTCTyCTQk7o6sn3fb+wgZlaKc3NrZfVRy+0OHsgumRQLACO9 mDjWCEr1o2+8ID2Kqa1NWOu4pV+b3EVYgatDHG5nX1ko6lQNkaq9/N7sM+7GeRLpXmSk wCj8VKFu+Z8j9yOEvf/6pjN+nbQiv+8DwIwZ4JFMynIfWY+oDX+3FpEESL5gfoDDCKNF h9djsK/j1cLwn0qDQSCsjlUBu0oclncvzYOYPqeZinh0lFxZwmnBdtXH51uevDz/IKJ8 vr9nYoDBVWiJRqvOSl8c7d3YCe4TIUsK4D1GrDP9UQsAtsZQJWoyFkB/JZSLKQ/fMIcH 6bTw== Received: by 10.68.130.201 with SMTP id og9mr2030109pbb.12.1347224822602; Sun, 09 Sep 2012 14:07:02 -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.01 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:04:52 -0700 Message-Id: <1347224784-19472-35-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 034/126] 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 ab014ff..3c3a8f7 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 00b6266..0752c67 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2364,17 +2364,6 @@ static void disas_s390_insn(DisasContext *s) LOG_DISAS("opc 0x%x\n", opc); switch (opc) { - case 0xe: /* MVCL R1,R2 [RR] */ - insn = ld_code2(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(s->pc); decode_rr(s, insn, &r1, &r2); @@ -3554,6 +3543,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);