From patchwork Tue Jun 20 20:51:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 778470 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 3wsg5r1Frlz9s0m for ; Wed, 21 Jun 2017 06:52:47 +1000 (AEST) Received: from localhost ([::1]:50607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNQ8h-0008AL-27 for incoming@patchwork.ozlabs.org; Tue, 20 Jun 2017 16:52:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNQ7z-0008AD-KA for qemu-devel@nongnu.org; Tue, 20 Jun 2017 16:52:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNQ7u-0004C3-RN for qemu-devel@nongnu.org; Tue, 20 Jun 2017 16:51:59 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:65270) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dNQ7u-0004BV-Gp for qemu-devel@nongnu.org; Tue, 20 Jun 2017 16:51:54 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MekDA-1d86A12Ong-00OHN7; Tue, 20 Jun 2017 22:51:25 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 20 Jun 2017 22:51:16 +0200 Message-Id: <20170620205121.26515-2-laurent@vivier.eu> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170620205121.26515-1-laurent@vivier.eu> References: <20170620205121.26515-1-laurent@vivier.eu> X-Provags-ID: V03:K0:E2HMgsM9ey8TRXeZGHpIDdqyZ+yLE9tCiNEZFSOJW5pnAXK7Kdi OaLMS2SeFNhtD4KtB1ZJKY/9n+3lzkFUvbwBNV30T16Es80YkjRJ2sFgV9aiLi64kslW8f8 el7qjmgix/c7Zt06l5rsyqQqA9bF5GqMKDh3LjJrtvVh4dcSwco7/pWaFuvotgknfRxJrOP 20K3odzPUKKSvsmpIH6Rg== X-UI-Out-Filterresults: notjunk:1; V01:K0:DjWydL0t6jw=:liTvDadQCg6BHjs9c3tc2s siv2BH3OQpVbFpxCiViCEZgorbflvDitqYJ/lnQVnO2q4AvBtk81KWKAuSjkgPSzKdvaUnaCR uUoLNZJs/LloLGGQLg/C11p4fALLHdyHiv+pJ7u5oghVFQUVc77bcrtjIPJxoZOgDet1YqPvd 49VTpvpGpg6RJ6BUoRSzToLJ4RgHy/pP5CV4UqU86+6NFDI2rRQMlWxM5BYOq25xuN3nc4BIy hQL0cyjZZZC6my+ta4QasTtj23cog5Y+tQ6PQbVXMfqgjBFWa5m/neIrGGx4qHkheWq+IH7Po /RqC080DomK2Yl46jfvlAmBLeEKh6kZJ4aEfnDwfDw1pzgeXRE8Encoel1ZEbde0e5RAFnZgi xVzk0eRfanYviDnpXRE5kyE7CDDJPzJAZRWJ55fyAKwCqUS08VbXS1Mxydy91S3JfE0FvHW7I iwt6HkKXYkQBhO13j7Fg83NEqjU+n6eyyhNNHwudzWsz2xBysY2qcgP1cGiBD+zwDvHskJv3v 3IKpkjZJ4m83Hck6EQWN/ZN6JtvwGkJFWZfWUXUUhrSsERzWN2UZcrahA+WDudMIjiMjKNY/8 lWJxZsghQ1MtqO/KvmbqS41EakG+++tUe8dTfxeD4I98LTg0vzrsLrWWSAaKME+bxqIuSq+zD 05PN3GaIXgyzTTgOGV8JgvWV2Wyesfy94RZjfY5SolsTkQO002dpdMeztZMaJ4S34LSE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PATCH v5 1/6] 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: Thomas Huth , Riku Voipio , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson 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é --- 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: {