From patchwork Wed Aug 17 20:54:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryce Lanham X-Patchwork-Id: 110472 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A4D82B6FA6 for ; Thu, 18 Aug 2011 09:47:59 +1000 (EST) Received: from localhost ([::1]:50222 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtnA1-0000cl-QX for incoming@patchwork.ozlabs.org; Wed, 17 Aug 2011 16:56:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:51727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn9Y-0007gs-Qk for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:56:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qtn9K-00087C-Nj for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:55:48 -0400 Received: from mail-iy0-f171.google.com ([209.85.210.171]:63115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn9K-0007rc-KL for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:55:42 -0400 Received: by iyf13 with SMTP id 13so2655713iyf.30 for ; Wed, 17 Aug 2011 13:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=AKA0b/EGpkbS1ld5EcIYIWpHMhCqMfBB40qS54WGnAk=; b=Xvs0YWB97txC31iQGvuS12g1hj//g5uDyc19Crlz0tiBPaHVh3+Rl4oK63IXvVbPSR 4XVqX/tXikN5Nl+qIKKyxm0s8vsw1mYowbff10OzwKxix32b7T1H+UynTONp+3gJQxne M1zEWwYsILjFcG8oIfGP5A0e/dA8CI80tdmgs= Received: by 10.231.2.195 with SMTP id 3mr3051143ibk.35.1313614487863; Wed, 17 Aug 2011 13:54:47 -0700 (PDT) Received: from localhost.localdomain (betelgeuse.cs.uchicago.edu [128.135.24.226]) by mx.google.com with ESMTPS id h12sm228311ibe.3.2011.08.17.13.54.46 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Aug 2011 13:54:46 -0700 (PDT) From: Bryce Lanham To: qemu-devel@nongnu.org Date: Wed, 17 Aug 2011 15:54:15 -0500 Message-Id: <1313614456-29404-11-git-send-email-blanham@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1313614456-29404-1-git-send-email-blanham@gmail.com> References: <1313614456-29404-1-git-send-email-blanham@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.171 Cc: Laurent Vivier Subject: [Qemu-devel] [PATCH 110/111] m68k: add movec instruction 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 From: Laurent Vivier Signed-off-by: Laurent Vivier --- target-m68k/helpers.h | 3 ++- target-m68k/translate.c | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/target-m68k/helpers.h b/target-m68k/helpers.h index 373660e..d321874 100644 --- a/target-m68k/helpers.h +++ b/target-m68k/helpers.h @@ -48,7 +48,8 @@ DEF_HELPER_2(xflag_lt_i8, i32, i32, i32) DEF_HELPER_2(xflag_lt_i16, i32, i32, i32) DEF_HELPER_2(xflag_lt_i32, i32, i32, i32) DEF_HELPER_2(set_sr, void, env, i32) -DEF_HELPER_3(movec, void, env, i32, i32) +DEF_HELPER_3(movec_to, void, env, i32, i32) +DEF_HELPER_2(movec_from, i32, env, i32) DEF_HELPER_1(exts32_FP0, void, env) DEF_HELPER_1(extf32_FP0, void, env) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 71cbffb..b4b36f7 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -3532,7 +3532,11 @@ DISAS_INSN(movec) } else { reg = DREG(ext, 12); } - gen_helper_movec(cpu_env, tcg_const_i32(ext & 0xfff), reg); + if (insn & 1) { + gen_helper_movec_to(cpu_env, tcg_const_i32(ext & 0xfff), reg); + } else { + gen_helper_movec_from(reg, cpu_env, tcg_const_i32(ext & 0xfff)); + } gen_lookup_tb(s); } @@ -4435,7 +4439,7 @@ void register_m68k_insns (CPUM68KState *env) INSN(move_to_ccr, 44c0, ffc0, M68000); INSN(not, 4680, fff8, CF_ISA_A); INSN(not, 4600, ff00, M68000); - INSN(undef, 46c0, ffc0, M68000); + INSN(move_to_sr, 46c0, ffc0, M68000); INSN(move_to_sr, 46c0, ffc0, CF_ISA_A); INSN(nbcd, 4800, ffc0, M68000); INSN(linkl, 4808, fff8, M68000); @@ -4481,7 +4485,8 @@ void register_m68k_insns (CPUM68KState *env) INSN(rte, 4e73, ffff, M68000); INSN(rts, 4e75, ffff, CF_ISA_A); INSN(rts, 4e75, ffff, M68000); - INSN(movec, 4e7b, ffff, CF_ISA_A); + INSN(movec, 4e7a, fffe, CF_ISA_A); + INSN(movec, 4e7a, fffe, M68000); INSN(jump, 4e80, ffc0, CF_ISA_A); INSN(jump, 4e80, ffc0, M68000); INSN(jump, 4ec0, ffc0, CF_ISA_A);