From nobody Tue Oct 28 12:14:02 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 1514855870652635.5510850311902; Mon, 1 Jan 2018 17:17:50 -0800 (PST) Received: from localhost ([::1]:50807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWBDA-0006l5-Rs for importer@patchew.org; Mon, 01 Jan 2018 20:17:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWB6I-0001W3-SJ for qemu-devel@nongnu.org; Mon, 01 Jan 2018 20:10:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWB6H-00055N-5M for qemu-devel@nongnu.org; Mon, 01 Jan 2018 20:10:42 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:55333) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWB6G-00053Q-QS for qemu-devel@nongnu.org; Mon, 01 Jan 2018 20:10:41 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MXA60-1eSp4s44V2-00VvXz; Tue, 02 Jan 2018 02:10:39 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 2 Jan 2018 02:10:24 +0100 Message-Id: <20180102011032.30056-10-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180102011032.30056-1-laurent@vivier.eu> References: <20180102011032.30056-1-laurent@vivier.eu> X-Provags-ID: V03:K0:jWg9vUlaFtfswbR2Bp6ycKN8ZaqYTBW/cU6QpNSOseLzQhd5zQ6 bUQwYr/dnohzUnjos7xeEKqQNAXDaa3Z9BihgezjJovAbBCTKuTu1jRRvcQSsM5CUFoXXrW Pav3d8AcvYujn1lARZ11YVNkYDeGSF72+viS9nHafp1qdivjdGyUevViwhelkuPs9QOiPEk tXLxp1jc6brZ1ktudujEg== X-UI-Out-Filterresults: notjunk:1;V01:K0:3GEN35y1op0=:e3AYYXRLL3Rgp5V989LUH6 AXkeM/Iub/ilpKm8cdoEO6jmzbWO7qECqp9RdwRZDyYlr5Sslq29dGxjjVferwrM6Xty8LdyX jCFF8quGetUWuN/7LUnxF2wzZ5mzxfTcxJv+UJcDCyyIVFjnmqXyyp8zv1I6+Jn+HlzOed3Wi nr6Xk+H0eiAEOU0uxYsRVQ8UF170OmgM8A1Ehtimj26u297y1H/fPpaqYEujl5hk7YL3L/vE4 mMHKG2lmeQKp0M2w1iOHzSAA5DfNf/CporlvSU/vDKajnyC4J7tmt6yCx+qXpystqJushwgld 38+h4Yr8d+AyBMwzj0ljMdyIn66XtTJ9LokcQKVxyxHSkPKj87E5IM5hLSFgVfHjXBchhdSOA z8wHf5uWY7cfHuE91h+/r3NuaN8WjNlepi+mRqsAO95QHeMPfQlzKIB1fuFS7VPAWAB0J1MhK 9LqMuJ3+syDyQhiKWb0cxbE5kI/ATDXxelS8M0v26ujoNjdHwCEpySkyUCHdRaFIUN0MQhJXa jx2aDauHqnQBASIOFLWq7Y2klclZYyWyXnSwH98LdHfdNQwId8Rx0yxNvQu+0grjA0nGjeK8Z DBrCObDKdeHlmFse/2nlBO9BfXq908f5Yj53IKka4lVUSaLbI1d3Wha7NIdHIX0mb9+Z96YQW V0GiHgCj5ke84gqBZSs2wPljk7m5VythcoBQ+P4XaH7y87wHLP1pqEm9bppX+5C/8XWBw5Ifd f8CUXWxBojV07OJsIvA1VcXmP2H3EqgwiM/skA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PATCH v5 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 , 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 | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 9f13299bcf..d463927fcc 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4453,6 +4453,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)) { @@ -4485,6 +4486,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 @@ -4568,6 +4574,7 @@ DISAS_INSN(wdebug) /* TODO: Implement wdebug. */ cpu_abort(CPU(cpu), "WDEBUG not implemented"); } +#endif =20 DISAS_INSN(trap) { @@ -5125,10 +5132,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"); } @@ -5137,9 +5150,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) { @@ -5564,7 +5583,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); @@ -5579,7 +5600,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); @@ -5590,14 +5613,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); @@ -5701,18 +5726,20 @@ 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, f600, ffc0, M68040); INSN(wddata, fb00, ff00, CF_ISA_A); INSN(wdebug, fbc0, ffc0, CF_ISA_A); +#endif + INSN(move16, f600, ffc0, M68040); #undef INSN } =20 --=20 2.14.3