From patchwork Wed Jun 21 21:00:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 779115 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wtHFb07kxz9s72 for ; Thu, 22 Jun 2017 07:01:38 +1000 (AEST) Received: from localhost ([::1]:55941 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNmkn-0001jx-MT for incoming@patchwork.ozlabs.org; Wed, 21 Jun 2017 17:01:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNmkC-0001jV-BK for qemu-devel@nongnu.org; Wed, 21 Jun 2017 17:00:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNmk8-0006RS-Fp for qemu-devel@nongnu.org; Wed, 21 Jun 2017 17:00:56 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:53149) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dNmk8-0006Qm-4t for qemu-devel@nongnu.org; Wed, 21 Jun 2017 17:00:52 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MFLHA-1dc6693VS8-00EPVz; Wed, 21 Jun 2017 23:00:50 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 21 Jun 2017 23:00:43 +0200 Message-Id: <20170621210047.24083-2-laurent@vivier.eu> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170621210047.24083-1-laurent@vivier.eu> References: <20170621210047.24083-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K0:11miQdldQFsXF1H6fK0ONFFF4Jy3B3kmNBlqCc7otujns4f9Ffv GwR3Sh1ykOSWFdSNJqIk2oll0I4LfPpkRP365X0zMmQ/OioI7fH/NLmh56JNNAbZthkFA8K hcy8/56boOfiO2T9g6LAHKvPtKxq1lsJWziwk7fPPOEB0/4wdVeCsf6svra9mdZc7L97tHH zuvWGQjw4UQ7MH8EUV+rA== X-UI-Out-Filterresults: notjunk:1; V01:K0:pnPIm4E12yo=:nMc0/GLQqivvcdLHRkn8bS ZZkfbtpwJU5QRH6v0s25G4Jm1KSPphyJCyPiYFKORg/zSB1PN03XGL9hebsQdPkoweAVIoA1P rDtG7ClGf+gO/Lsf685+97hLcWRZssKWCdmR8fEzSowVEgogejBC+s3EXWIOzJvvIN3Ao3XHL cza3lRWjENjVRcc+WEX7U113TG2Yhr6k3o3urrZI7XL6ZKOd/SxDDvvttzuGKo8ivQ5HJIgHU IerRnvBKwYpV60DYlqQP2kikHNA6+scNcMvmYmup44bDecDmqOOv2A3Q4em3BCRw1HNnjKLII NuexPaGaxKncqhrAWtTX9VagjIBn9YtKjp6fyO5K0bbaXzOG/hn0V6+eBl/Mxsd8kZTmN/nEa Fgsjn7NKFqPTo/rnqr6KdcJM2bA6q+P//te6kiBcjQTn/5Cyis60we35l1esY+VOoL+wGO47n V84BQZfsXy31eqs36zlFKdplnWIcC0eno2niz/a6QEUT/D3ZNZnYtbNQ3/F/+8Dwub5g6VTTV 8/mNDrVLG1dafAMcKNBWUrs62TLlEh3BZb+nPm9pN3hfFB+TC+34zgp37Z2/ipzwhheN/cNSb k5sbNs+MQVt0AFWmr1YsUsN0GVVf/crcbudwfQRbWWbiCl0cG0HewnxphECVT/fqNWajc1/6l H50NZDhnfC7xkJCt9nKqAytCbRl3W/Ck6fU2EgdzV6mIpAPCkpjmbyue0w647/jV6x+GHfPaw vwN8SNKZrD3RwsxM X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 1/5] target-m68k: move fmove CR to a function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Move code of fmove to/from control register to a function Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20170620205121.26515-2-laurent@vivier.eu> --- target/m68k/translate.c | 56 +++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index dfecfb6..c9a5fe4 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4099,6 +4099,35 @@ DISAS_INSN(trap) gen_exception(s, s->pc - 2, EXCP_TRAP0 + (insn & 0xf)); } +static void gen_op_fmove_fcr(CPUM68KState *env, DisasContext *s, + uint32_t insn, uint32_t ext) +{ + int mask = (ext >> 10) & 7; + int is_write = (ext >> 13) & 1; + TCGv val; + + switch (mask) { + case 1: /* FPIAR */ + case 2: /* FPSR */ + default: + qemu_log_mask(LOG_UNIMP, "Unimplemented: fmove to/from control %d", + mask); + goto undef; + case 4: /* FPCR */ + if (is_write) { + val = tcg_const_i32(0); + DEST_EA(env, insn, OS_LONG, val, NULL); + tcg_temp_free(val); + } + /* Not implemented. Ignore register update */ + break; + } + return; +undef: + s->pc -= 2; + disas_undef_fpu(env, s, insn); +} + /* ??? FP exceptions are not implemented. Most exceptions are deferred until immediately before the next FP instruction is executed. */ DISAS_INSN(fpu) @@ -4177,32 +4206,9 @@ DISAS_INSN(fpu) tcg_temp_free_i32(tmp32); return; case 4: /* fmove to control register. */ - switch ((ext >> 10) & 7) { - case 4: /* FPCR */ - /* Not implemented. Ignore writes. */ - break; - case 1: /* FPIAR */ - case 2: /* FPSR */ - default: - cpu_abort(NULL, "Unimplemented: fmove to control %d", - (ext >> 10) & 7); - } - break; case 5: /* fmove from control register. */ - switch ((ext >> 10) & 7) { - case 4: /* FPCR */ - /* Not implemented. Always return zero. */ - tmp32 = tcg_const_i32(0); - break; - case 1: /* FPIAR */ - case 2: /* FPSR */ - default: - cpu_abort(NULL, "Unimplemented: fmove from control %d", - (ext >> 10) & 7); - goto undef; - } - DEST_EA(env, insn, OS_LONG, tmp32, NULL); - break; + gen_op_fmove_fcr(env, s, insn, ext); + return; case 6: /* fmovem */ case 7: {