From nobody Tue Oct 28 12:15:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151493717799215.435929812476843; Tue, 2 Jan 2018 15:52:57 -0800 (PST) Received: from localhost ([::1]:59759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWMb-0007xf-7Q for importer@patchew.org; Tue, 02 Jan 2018 18:52:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBR-00077t-VP for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBP-000394-8Z for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:26 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:53067) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBO-00038M-Ut for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:23 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Ld1hk-1fEgca0tRw-00iAzN; Wed, 03 Jan 2018 00:41:20 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:41:00 +0100 Message-Id: <20180102234108.32713-10-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180102234108.32713-1-laurent@vivier.eu> References: <20180102234108.32713-1-laurent@vivier.eu> X-Provags-ID: V03:K0:SQVuqzbYvVki+UBJtyLRsB+xzhtaam7x9+53dcWfbjDnI3dkH7t ll7NKzTOOVmbkFUVzuKQFEB2thwTU/QnYAuyOgJsHD1KJXm+5pt0FukIKR303vLzNKx4i1I +JEz6qNNbvWFUsJGb6LrqrYBXGAgcyoyq6ui/X4zBKN/ywLyE5bZXTkMHeX9iwXS8pZKIGc Ieb0Ho5xlO9gGH9fyFDlw== X-UI-Out-Filterresults: notjunk:1;V01:K0:1L8n1Fwt9io=:JExEGmSIhybaaXGQKaYGSs d4RjdKtlIZsCBDP5d1L/2b296prMZL/DBlabvHDLoCUvb+UoU9njzfp7XHPKiOFI/qif7HXn4 UZdXoi/BW2Xu1zkgBBmvKUkMdJyC8OODPLjh/yBdEqQOmZk48/eNm6bXjWODuLC+xr5iVN+sX 1V71MAogzzHH0ikAopOTli97ouk5bYRve6DnGdPmMwYSpNe8AJ41+SN0t+4FA/KxxVNdpU9Y2 oAXnC9sda7JnzC77oc8ej5fkh3u7b+hakRd9rYAiR3s0kOB0gzORA7wyg52yqdIAG/YL4tnr+ vEDqORRHNiOHMQ8wteGf18ohqxof3sF1SAjOcNGT5db3QWkiJmVmaZukVlcA3ntw0snIkzdgj BeP6URNl9nTo2u/fDFVXOzAihfJLT63I2lSWVdkfjnIo6Y7buOvKij13cfBNGQcXdLFNpYVDI GzHAIqlZu4VXssxfT+UUM28C9GLkTRL1kovzao0MhhduSrKuWgGugxDm5nwr6MI0zdr9ww1gK 7vk5mjGbxnyJw4C5cXqAIn7+9QHfiQ4b35MmXuU2RV0sqig6QhUIFTDk39s3dksWe1Jw3V2sb Ywus0xV+rNIYQD0VrI7IX8ClWDEItqaiv3dx9/bB/OTAJCqKflHXnvtord7DyFUlZMYt8a0fM 2XKHLS/O5gYwWk+8Ft4WkGHsGTt8zAJrFS8h4uW9zZYRqIw09or5G7Uqi5vk8ZkCzV1R+u8J3 MriMrbu7SBwHf0iN6ZsLYVo2+rjMLykeIaaW+g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PATCH v6 09/17] target/m68k: softmmu cleanup 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 , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" don't compile supervisor only instructions in linux-user mode Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 662a518f16..ae3fd3db26 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4392,6 +4392,7 @@ DISAS_INSN(move_from_sr) DEST_EA(env, insn, OS_WORD, sr, NULL); } =20 +#if defined(CONFIG_SOFTMMU) DISAS_INSN(move_to_sr) { if (IS_USER(s)) { @@ -4424,6 +4425,11 @@ DISAS_INSN(move_to_usp) =20 DISAS_INSN(halt) { + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + gen_exception(s, s->pc, EXCP_HALT_INSN); } =20 @@ -4507,6 +4513,7 @@ DISAS_INSN(wdebug) /* TODO: Implement wdebug. */ cpu_abort(CPU(cpu), "WDEBUG not implemented"); } +#endif =20 DISAS_INSN(trap) { @@ -5064,10 +5071,16 @@ DISAS_INSN(fscc) tcg_temp_free(tmp); } =20 +#if defined(CONFIG_SOFTMMU) DISAS_INSN(frestore) { M68kCPU *cpu =3D m68k_env_get_cpu(env); =20 + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + /* TODO: Implement frestore. */ cpu_abort(CPU(cpu), "FRESTORE not implemented"); } @@ -5076,9 +5089,15 @@ DISAS_INSN(fsave) { M68kCPU *cpu =3D m68k_env_get_cpu(env); =20 + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + /* TODO: Implement fsave. */ cpu_abort(CPU(cpu), "FSAVE not implemented"); } +#endif =20 static inline TCGv gen_mac_extract_word(DisasContext *s, TCGv val, int upp= er) { @@ -5503,7 +5522,9 @@ void register_m68k_insns (CPUM68KState *env) INSN(not, 4680, fff8, CF_ISA_A); INSN(not, 4600, ff00, M68000); INSN(undef, 46c0, ffc0, M68000); +#if defined(CONFIG_SOFTMMU) INSN(move_to_sr, 46c0, ffc0, CF_ISA_A); +#endif INSN(nbcd, 4800, ffc0, M68000); INSN(linkl, 4808, fff8, M68000); BASE(pea, 4840, ffc0); @@ -5518,7 +5539,9 @@ void register_m68k_insns (CPUM68KState *env) BASE(tst, 4a00, ff00); INSN(tas, 4ac0, ffc0, CF_ISA_B); INSN(tas, 4ac0, ffc0, M68000); +#if defined(CONFIG_SOFTMMU) INSN(halt, 4ac8, ffff, CF_ISA_A); +#endif INSN(pulse, 4acc, ffff, CF_ISA_A); BASE(illegal, 4afc, ffff); INSN(mull, 4c00, ffc0, CF_ISA_A); @@ -5529,14 +5552,16 @@ void register_m68k_insns (CPUM68KState *env) BASE(trap, 4e40, fff0); BASE(link, 4e50, fff8); BASE(unlk, 4e58, fff8); +#if defined(CONFIG_SOFTMMU) INSN(move_to_usp, 4e60, fff8, USP); INSN(move_from_usp, 4e68, fff8, USP); - BASE(nop, 4e71, ffff); BASE(stop, 4e72, ffff); BASE(rte, 4e73, ffff); + INSN(movec, 4e7b, ffff, CF_ISA_A); +#endif + BASE(nop, 4e71, ffff); INSN(rtd, 4e74, ffff, RTD); BASE(rts, 4e75, ffff); - INSN(movec, 4e7b, ffff, CF_ISA_A); BASE(jump, 4e80, ffc0); BASE(jump, 4ec0, ffc0); INSN(addsubq, 5000, f080, M68000); @@ -5640,19 +5665,21 @@ void register_m68k_insns (CPUM68KState *env) BASE(undef_fpu, f000, f000); INSN(fpu, f200, ffc0, CF_FPU); INSN(fbcc, f280, ffc0, CF_FPU); - INSN(frestore, f340, ffc0, CF_FPU); - INSN(fsave, f300, ffc0, CF_FPU); INSN(fpu, f200, ffc0, FPU); INSN(fscc, f240, ffc0, FPU); INSN(fbcc, f280, ff80, FPU); +#if defined(CONFIG_SOFTMMU) + INSN(frestore, f340, ffc0, CF_FPU); + INSN(fsave, f300, ffc0, CF_FPU); INSN(frestore, f340, ffc0, FPU); INSN(fsave, f300, ffc0, FPU); INSN(intouch, f340, ffc0, CF_ISA_A); INSN(cpushl, f428, ff38, CF_ISA_A); - INSN(move16_mem, f600, ffe0, M68040); - INSN(move16_reg, f620, fff8, M68040); INSN(wddata, fb00, ff00, CF_ISA_A); INSN(wdebug, fbc0, ffc0, CF_ISA_A); +#endif + INSN(move16_mem, f600, ffe0, M68040); + INSN(move16_reg, f620, fff8, M68040); #undef INSN } =20 --=20 2.14.3