From patchwork Sat Dec 24 11:40:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 708655 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tm3VK6VZWz9t0G for ; Sat, 24 Dec 2016 22:50:33 +1100 (AEDT) Received: from localhost ([::1]:43166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKkqN-0007AX-Py for incoming@patchwork.ozlabs.org; Sat, 24 Dec 2016 06:50:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKkh6-0007SI-Hf for qemu-devel@nongnu.org; Sat, 24 Dec 2016 06:40:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cKkh3-00083T-DO for qemu-devel@nongnu.org; Sat, 24 Dec 2016 06:40:56 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:64919) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cKkh3-000827-2Q for qemu-devel@nongnu.org; Sat, 24 Dec 2016 06:40:53 -0500 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Lm4KP-1cuMYc1J57-00ZdQ5; Sat, 24 Dec 2016 12:40:43 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 24 Dec 2016 12:40:30 +0100 Message-Id: <1482579633-3393-10-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482579633-3393-1-git-send-email-laurent@vivier.eu> References: <1482579633-3393-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:psecaG/eizTlFRZIYm8OK+UkuDAupw7T4QRoNaHZCspAtXjU1/A wtutSkcfQdkG4rBDF65496QfiMnsUryTrHbVT221TFEuoS6GknBLjFWkzwJPKj6Wgwgg40m 6+WUE0/rJ458NkeaVIi/J0Cg45GaZKGmGb2/yu/yn3SgQrpGpROh2qV53u6kkdXxYmV8508 +deY4NNtoB/RpBLqeWkWw== X-UI-Out-Filterresults: notjunk:1; V01:K0:aQyDR5j47WQ=:VLaPJ7L5SXmafKxYWXHyfj G4QV0GT1cZ4NsLep6GXHckkiY6XpwEkCV2DZ4d6UBZmQguFj5NuCpZzGlw93SYeRmkVsaI7UK 0IHH4QVm1AWRxcxhp+udinHa95S/WrZ1JRvunN3qjo5Ubz0dB5c/8NnXtb+FHcQVrujyy5/UD HT8tDGdwj1mAiWY5Ruw+PP5X8VXFQM5tc00cpdf+ASqnvk0Dn9i86VZieSsBNDHr7sOTq370Y VtJs79e4y3MslGndvBateechnLgfkhQAyJ9Z+cR8iCq2HU2MmXpDIF7eMU5CqPJqdg02AxViK PZ+2mgyiVyZjUR1YuDaTrrayG/Rs69Ioj9ZqSVFvXIih1by91p6hLboX53ADAszIKtlyYMgQZ ceojX7Qm7lWDJfC8OGh+BErxmvhQxKd6067mbFXM/T6H4uxLF05wagEFe6jC/Ar5czVXQlAd1 2htyCseU6XgPdGofI4rABVBb+0fH9p8h4Rzj8hzusEfPnYPHn5yh3TuU0iZdvL+hHfY48453I DSS1qVFC6Sl6KAaEvHM9Ma5bLczLGFwUuGF+WYo4Gh/2yhYNzPqPWigVwJEwEJxgR9FN5QCQO N7dgrpiWjbo9Aok7d7Z3QG6qUW+8fRcPpIAQPOHV9pfxyhgk5zwWhDWlBK7m4yma5lm6nkeak 3fShNiAmyLI09+zfLiKOLajAaCFFVJxjXH9ImjelrVbAUtP59vMGKnll4bEBLCe65qLc= 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] [PULL 09/12] target-m68k: Do not cpu_abort on undefined insns 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 , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Report this properly via exception and, importantly, allow the disassembler the chance to tell us what insn is not handled. Reviewed-by: Laurent Vivier Signed-off-by: Richard Henderson Message-Id: <1478699171-10637-3-git-send-email-rth@twiddle.net> Signed-off-by: Laurent Vivier --- target/m68k/translate.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index acc8182..0417c32 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -1214,10 +1214,12 @@ DISAS_INSN(undef_fpu) DISAS_INSN(undef) { - M68kCPU *cpu = m68k_env_get_cpu(env); - + /* ??? This is both instructions that are as yet unimplemented + for the 680x0 series, as well as those that are implemented + but actually illegal for CPU32 or pre-68020. */ + qemu_log_mask(LOG_UNIMP, "Illegal instruction: %04x @ %08x", + insn, s->pc - 2); gen_exception(s, s->pc - 2, EXCP_UNSUPPORTED); - cpu_abort(CPU(cpu), "Illegal instruction: %04x @ %08x", insn, s->pc - 2); } DISAS_INSN(mulw)