From nobody Tue Oct 28 01:56:37 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514936612088845.496305091554; Tue, 2 Jan 2018 15:43:32 -0800 (PST) Received: from localhost ([::1]:59574 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWDK-000070-CO for importer@patchew.org; Tue, 02 Jan 2018 18:43:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBL-00071d-1s for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBI-00034y-Ax for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:19 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:58277) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBI-00034V-1R for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:16 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MOVaj-1ea5520xHB-005nEG; Wed, 03 Jan 2018 00:41:13 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:40:52 +0100 Message-Id: <20180102234108.32713-2-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:4xwfuA48Rym3ehX7qha8QBfuUdtjum6xiGSbUH1MHljr3FZ75et Of7o+Rnag5XNMzW+BIO/BUDAFHUneMy4tl4ch/Vwx/pxPYOp4si3lADnVBMbUEOsl0RJzjM 0iPdtpcPiR/iItd4t7GHUntxv3N+m2bWrOEiXQzxofNpdN8XLZFbJ8s/+AB/+QDJmkv3rcx PMsxJUOyoVxJPNgcoy1NQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:9rNFUxXHYMg=:Qre3kgp8ecgqYZ5+TTBhxD AkAs8iy5PSEFJoUZeoNHLWKIZj+BDXAADjJqZ2YVQIuWfya/QNMhDv9EMX/OFvt3S6KosdX9x RPzWNhHH7gP1PPLVNnwC4u0fAM4va7hozwO+0uiFvAYxuY4uW/VVa0wLWxcYIFB5Fv6HJIpCb ocNHX9OXAzRlX2Lwfh+ccc/yxJtLD4HiPeHZYeXdn8j2Pl1K1hrappbRWBBU2v1JpjpFdLoWa wYL82x9+ALT/hscF9nIMEPwCuf1srjYXe8SFrOSgm5jeSShMkBCtklXpJA2TNBax+YKxqrSAb Lxj3NxZfzIGKbtJ2ti8ib6x4rHwh6PW8iU11+cR6Umvs0/Zv9cCyK7mbuRWpFJM64ueuFnDal 2NpHSnPswODKXI0Ik8xMHfAweuVvusERXI798+Q3tm9qIPHT46qP5bV5+Ua+P7JWNIjO8svyQ 92WWpEzVMvuIawA9mZMoy/EV7Qi3UAvFI8J4keIuOByxkrxOCYEPgBnUukdXtOOGwQ1uu+AQZ tcC6D2VdAKFH/a2AXPgsKrR8oxYly3mJMWyQXdrn/sghGDhWQxMBP78+daR3VrIUoOQd7pyfc kxe7WrVIuA6bjNJB3JDKARdavywtN1ie+vyIoa9QmgUQ3hLrPaLcd+Jm1A8LrIOVqGt/uIps6 06Pa6bDhzNyXioG0SDU/wUFmHr1TOkx5og08koMAzg/uW2FCB4VitcVT3vj3BpH3PTHVi7zNG BVc/4Z/wHwcj2zrRNqhFntR4II0dJRqi1nUdzg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PATCH v6 01/17] target-m68k: sync CC_OP before gen_jmp_tb() 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" And remove update_cc_op() from gen_exception() because there is one in gen_jmp_im(). Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index bbda7399ec..0e9d651a2a 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -270,7 +270,6 @@ static void gen_raise_exception(int nr) =20 static void gen_exception(DisasContext *s, uint32_t where, int nr) { - update_cc_op(s); gen_jmp_im(s, where); gen_raise_exception(nr); } @@ -2897,6 +2896,7 @@ DISAS_INSN(branch) gen_jmp_tb(s, 0, s->pc); } else { /* Unconditional branch. */ + update_cc_op(s); gen_jmp_tb(s, 0, base + offset); } } @@ -4875,6 +4875,7 @@ static void gen_fjmpcc(DisasContext *s, int cond, TCG= Label *l1) DisasCompare c; =20 gen_fcc_cond(&c, s, cond); + update_cc_op(s); tcg_gen_brcond_i32(c.tcond, c.v1, c.v2, l1); free_cond(&c); } --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514936611487423.44322721013134; Tue, 2 Jan 2018 15:43:31 -0800 (PST) Received: from localhost ([::1]:59575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWDJ-00007J-CX for importer@patchew.org; Tue, 02 Jan 2018 18:43:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBL-00071f-DR for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBI-00035G-OB for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:19 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:60778) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBI-00034Z-DZ for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:16 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LtS7s-1ew3rB3WQm-010wKH; Wed, 03 Jan 2018 00:41:14 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:40:53 +0100 Message-Id: <20180102234108.32713-3-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:PBxYFVeFg3i+y/D09AAXUC0RClUl1ivh604K+Y0NvOHfk9UyXhO KYUYTpsdV1liZcoXp04HRqFOcLZDp/GCmEbL1+LVX3BjprXE14EIAXUQsJIMEKTGr8lPAe6 VWcTXN4ItuEQhRNB5GnQ/9kJXzetiqequ4wlTZQ1XCW4F0dB0KzFhGc9KhVfVkEHw7HUPzQ JF1fC/c3ZpReCJp2PVHQg== X-UI-Out-Filterresults: notjunk:1;V01:K0:eGb6BVluYGA=:xyzqobxjdVPAYe+8X1wroK kcm3W1agEDKq6N1dDYA0WJ6Uj7WXfjEB9bhIVnTntghEqUaCXElQdCpg4UTsI7kLKkT4tTzOC pehM4ABXXiwns4f6ZoTHNgk5Flt9vQSNynETKUIkasu2F1WI4YKo3+WcdiSE7QMPNsOR604wC t9IF5ObeZi7vj4vNel4XskSE175xRylmuysKb3n8guA9LuMdfCIHKC6eO7vw+g4cu6FA1TY4o JUVdGOVmotjPR35WqhUho7TIzcFILxZHLMX4VEdAHFhtZjuhgHvjuayO4qeibvLgCKfts097Z jyT5yrIFy1p+gGcDr30Uy1VuViZgkuXBGXmgNT7Cgyow0bcnTaPh9pYukFdcYjeomc2RnNhs4 zCXSmsr6l/o7/EsQou3l0fQSkFQUqPgIKbj3DEi1uySP3UcP+DmSnaOKz6hXphgbBuzEJbWlz KfGhs5lqr58VcZbak8B/c0ezNJXzARh4bXtfte4wnTMy1M+qFdrqr3ibnsiGSoCYhyObaYoQ3 AJImYETxxhOzyxxU2TLK0MpPROdVWeZtwusS5VV3NlQmhT/G5i8WMr6IFdYUV3rsstNfM+isI QMTzCLPrCQD0euGsm/UW44FiARDkVYLf75AH1gQEqe1NKvEGpyncoQOPVECcuLFdUwMUYTJ65 Jn4/erSKa9RlFMM4csBtNudNNSigaIfccrXH8pZ8gi/Q3Wcp7FUpBGVYjK4k4vCFkF3EW6Yvu kXh/ftIwHX9uaaZy25+sw9wk1lr4G+ihcKJhGA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH v6 02/17] target/m68k: fix gen_get_ccr() 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" As gen_helper_get_ccr() is able to compute CCR from cc_op and flags, we don't need to flush flags before to call it. flush_flags() and get_ccr() use COMPUTE_CCR() to compute flags. get_ccr() computes CCR value, whereas flush_flags update live cc_op and flags. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 0e9d651a2a..1e9fb01252 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -2478,7 +2478,6 @@ static TCGv gen_get_ccr(DisasContext *s) { TCGv dest; =20 - gen_flush_flags(s); update_cc_op(s); dest =3D tcg_temp_new(); gen_helper_get_ccr(dest, cpu_env); --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 1514936761158226.32734881568615; Tue, 2 Jan 2018 15:46:01 -0800 (PST) Received: from localhost ([::1]:59618 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWFs-0002Sv-CA for importer@patchew.org; Tue, 02 Jan 2018 18:46:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBL-00071h-Dz for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBJ-00035S-4f for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:19 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:60474) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBI-00034q-Qo for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:17 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Lsdqf-1evDyV1y49-012KJ2; Wed, 03 Jan 2018 00:41:14 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:40:54 +0100 Message-Id: <20180102234108.32713-4-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:LBXf/A6ysXhv3J6Z+YGRo44+zSyqZres3+Ybx34BMIcQcNWMTjs 61SX5JihkB85bJFClbmut1M89tHcU4cbjUaalonPa2zyNqol8XLTOxix0tzVHBiUN8ABjYQ neEyowYb4uo7+lHlnXxsDM7ErYwjN374wXg9H/sfpvuM/dgITwWXJYmXMDnOLoP7NV4Dy7z f/MvonbB75cE/Dz5pCwOA== X-UI-Out-Filterresults: notjunk:1;V01:K0:rQ4/DMzaPJY=:i8yCoFA8cBAs8RUeBn4F7a GuRsUSHyViroCkanKzYg69oG97XuzRHNFxvKpswDq8+ddvkunS0aOOrwb475LjHqopGetiZB7 1U3Sw4Lx90zhkXwBIVRQbwMmIH7ciZAbA7SzWWlPCWAA0QiNAKf9HaEZIrZbx2HKuXeZYKIj9 HfYvKrB5T0tXP8OQ2H99xfItzeB1B+ofqbSGuWD7+HksEzhX6TMh4W9kFSzYEZSfkwE+mP6fa utraMlqR5W0BJGoWKHdocVZHLc5mDOfja/eGWWGlROEwkB6mrT1RPgfJNXPdlN7XHR9qJqlhl UDY+B9O33ynIshbJ+M6x2+jM3k3B2go8lXxxBv4Vvr5+pH63I95jE1RRX5iTJ4vxniRKvaUrh 9ag0JaMWUDTqh6eXE3ynwCcEQ/Zwzx0CejMuG3MDp3gDP/00UpqidaGi710UeY1SJ/DQ63PVM jBNL5RU/3eCFS+QYlG57UmU3GvEF1PVzztB70I5g46y2tpxNJqCQaUohJXpWFlQybMXvsrkjH TgagpVvc27/WBc+XmohHIqFh6IM128ukZFMM/6M8a35Z7LWfuKdtHci5EiOwkiTgdVSQG37km FVv6pzQfGzQAw5mSEfPx4VuTL/E15eCpeR3QKpOxYWDJDXTQL9aupTtpL7R1dGy7y0l9qnfRz rX9V3hR08YR0L8BdWeX13zJxyr0/Bg3pUm35IGLYlRA1ACo9YxglKErS0tbDpWKexc31oRaEl 5va4e5KFXNb9xVskLdHG0oPj1OISGAR9YK36Jg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH v6 03/17] linux-user, m68k: correctly manage SR in context 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" Use cpu_m68k_get_ccr()/cpu_m68k_set_ccr() to setup and restore correctly the value of SR in the context structure. Fix target_rt_setup_ucontext(). Fixes: 3219de458c ("linux-user: correctly manage SR in ucontext") Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- linux-user/signal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index dae14d4a89..74fa03f96d 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5612,13 +5612,14 @@ struct target_rt_sigframe static void setup_sigcontext(struct target_sigcontext *sc, CPUM68KState *e= nv, abi_ulong mask) { + uint32_t sr =3D (env->sr & 0xff00) | cpu_m68k_get_ccr(env); __put_user(mask, &sc->sc_mask); __put_user(env->aregs[7], &sc->sc_usp); __put_user(env->dregs[0], &sc->sc_d0); __put_user(env->dregs[1], &sc->sc_d1); __put_user(env->aregs[0], &sc->sc_a0); __put_user(env->aregs[1], &sc->sc_a1); - __put_user(env->sr, &sc->sc_sr); + __put_user(sr, &sc->sc_sr); __put_user(env->pc, &sc->sc_pc); } =20 @@ -5634,7 +5635,7 @@ restore_sigcontext(CPUM68KState *env, struct target_s= igcontext *sc) __get_user(env->aregs[1], &sc->sc_a1); __get_user(env->pc, &sc->sc_pc); __get_user(temp, &sc->sc_sr); - env->sr =3D (env->sr & 0xff00) | (temp & 0xff); + cpu_m68k_set_ccr(env, temp); } =20 /* @@ -5726,7 +5727,7 @@ static inline int target_rt_setup_ucontext(struct tar= get_ucontext *uc, CPUM68KState *env) { target_greg_t *gregs =3D uc->tuc_mcontext.gregs; - uint32_t sr =3D cpu_m68k_get_ccr(env); + uint32_t sr =3D (env->sr & 0xff00) | cpu_m68k_get_ccr(env); =20 __put_user(TARGET_MCONTEXT_VERSION, &uc->tuc_mcontext.version); __put_user(env->dregs[0], &gregs[0]); --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 1514936760086212.86912011203185; Tue, 2 Jan 2018 15:46:00 -0800 (PST) Received: from localhost ([::1]:59616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWFr-0002RJ-8b for importer@patchew.org; Tue, 02 Jan 2018 18:45:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBL-00071g-Dm for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBK-00035t-6z for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:19 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:51465) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBJ-00035O-S1 for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:18 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LaHLm-1fBw0r1J1i-00m1oB; Wed, 03 Jan 2018 00:41:15 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:40:55 +0100 Message-Id: <20180102234108.32713-5-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:cb1ChOpqTjVLmWzX93jDdobev5JcRH3M3GXkZHec+t/h7AM/Y9N X+Uu05/Ys8juciADqQE1DMpxxYHHeIr7KlOX6H6Y2TSmW18d/ywAVIosyR1JjhYqpHEkTRF we88NT7hMbl3pCplwdSSvx7e4EpObycL9BqrYNeSu1rNm5l8kuKOMiH4Uhlei+6VjQolQUV qfR+levWD8w9OK6yOBKsg== X-UI-Out-Filterresults: notjunk:1;V01:K0:pQpnc/+j+is=:GsfpFgYmFisfhGWhPrvt9s lWNuevEMFT84FX2RfIMaXAOIeAO+xSghMTTiZOBbkUCCuuTiSKCvGv3A5LvY7ARPn407IjVPY bcsUUc9gN2PnIdTfOKFpkibUWhsD1pPxNMXkGqrs6o3aXeoKdBiiuzWj+cZf1DohKYIFTcRh8 PIhSRlfsDiZyLIjOEOa2/k5sX6SRFMREi/wfbtTK5a4Lb0t+PpdZtg/CSZmZR6opQsuCrqHTS x03MKRp7BG8IjYvkF9STfU1NCd6Fn23XD58AxHFGJclMOXyFuMJUJqDOs2N/6yDSUoTkJLxu2 91m6vJT0vG0hOzG2mUXdmSmONpeEdL2OyeQEG/B8pAyzO3Y2UCyunro9uwn4mGPaWLl5TQk+V XlybgEZEI+sP1P3U15TTUayahgX0BODr6RyyqNCiweSZ1vW+bDpJeKEIpJYPf8zxf6tquT3o8 iuBuJRDUAKqeuhk5ciZN/9pgxGdupT648HG8Y4p2x+/gU81LpfopgnpSRGJRo4OhwlAqlXD3z iPDhQsqCoSBx8QsSBSltmGd8iyi9aYx9MnL/OzMybbLOOm/VZthyX4Re5hO1yPdCufIzverdI mGnSGHA6qjyWKj1AAul1RM0AmunmPBsWvkBKj6nap195jMMgqOyzAtfAE2G8pxwD0tsFPH8Lh TUmnZWQ9pmoOY3xE/J//GrSxxOOt1SCBOC+zInQmnAHmEjGcejp+DERYVEHYW8Q05ABr/e7Z+ rx387MXb3Ut/VvQrgbUyupzZNpIlSpNDlhoM5A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH v6 04/17] target/m68k: use insn_pc to generate instruction fault address 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" Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 1e9fb01252..a1e424e3db 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -1509,12 +1509,12 @@ DISAS_INSN(dbcc) =20 DISAS_INSN(undef_mac) { - gen_exception(s, s->pc - 2, EXCP_LINEA); + gen_exception(s, s->insn_pc, EXCP_LINEA); } =20 DISAS_INSN(undef_fpu) { - gen_exception(s, s->pc - 2, EXCP_LINEF); + gen_exception(s, s->insn_pc, EXCP_LINEF); } =20 DISAS_INSN(undef) @@ -1523,8 +1523,8 @@ DISAS_INSN(undef) 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); + insn, s->insn_pc); + gen_exception(s, s->insn_pc, EXCP_UNSUPPORTED); } =20 DISAS_INSN(mulw) @@ -2583,7 +2583,7 @@ DISAS_INSN(swap) =20 DISAS_INSN(bkpt) { - gen_exception(s, s->pc - 2, EXCP_DEBUG); + gen_exception(s, s->insn_pc, EXCP_DEBUG); } =20 DISAS_INSN(pea) @@ -2636,7 +2636,7 @@ DISAS_INSN(pulse) =20 DISAS_INSN(illegal) { - gen_exception(s, s->pc - 2, EXCP_ILLEGAL); + gen_exception(s, s->insn_pc, EXCP_ILLEGAL); } =20 /* ??? This should be atomic. */ @@ -2666,7 +2666,7 @@ DISAS_INSN(mull) =20 if (ext & 0x400) { if (!m68k_feature(s->env, M68K_FEATURE_QUAD_MULDIV)) { - gen_exception(s, s->pc - 4, EXCP_UNSUPPORTED); + gen_exception(s, s->insn_pc, EXCP_UNSUPPORTED); return; } =20 @@ -4240,7 +4240,7 @@ DISAS_INSN(move_from_sr) TCGv sr; =20 if (IS_USER(s) && !m68k_feature(env, M68K_FEATURE_M68000)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } sr =3D gen_get_sr(s); @@ -4250,7 +4250,7 @@ DISAS_INSN(move_from_sr) DISAS_INSN(move_to_sr) { if (IS_USER(s)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } gen_set_sr(env, s, insn, 0); @@ -4260,7 +4260,7 @@ DISAS_INSN(move_to_sr) DISAS_INSN(move_from_usp) { if (IS_USER(s)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } tcg_gen_ld_i32(AREG(insn, 0), cpu_env, @@ -4270,7 +4270,7 @@ DISAS_INSN(move_from_usp) DISAS_INSN(move_to_usp) { if (IS_USER(s)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } tcg_gen_st_i32(AREG(insn, 0), cpu_env, @@ -4287,7 +4287,7 @@ DISAS_INSN(stop) uint16_t ext; =20 if (IS_USER(s)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } =20 @@ -4301,10 +4301,10 @@ DISAS_INSN(stop) DISAS_INSN(rte) { if (IS_USER(s)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } - gen_exception(s, s->pc - 2, EXCP_RTE); + gen_exception(s, s->insn_pc, EXCP_RTE); } =20 DISAS_INSN(movec) @@ -4313,7 +4313,7 @@ DISAS_INSN(movec) TCGv reg; =20 if (IS_USER(s)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } =20 @@ -4331,7 +4331,7 @@ DISAS_INSN(movec) DISAS_INSN(intouch) { if (IS_USER(s)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } /* ICache fetch. Implement as no-op. */ @@ -4340,7 +4340,7 @@ DISAS_INSN(intouch) DISAS_INSN(cpushl) { if (IS_USER(s)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } /* Cache push/invalidate. Implement as no-op. */ @@ -4348,7 +4348,7 @@ DISAS_INSN(cpushl) =20 DISAS_INSN(wddata) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); } =20 DISAS_INSN(wdebug) @@ -4356,7 +4356,7 @@ DISAS_INSN(wdebug) M68kCPU *cpu =3D m68k_env_get_cpu(env); =20 if (IS_USER(s)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } /* TODO: Implement wdebug. */ @@ -4365,7 +4365,7 @@ DISAS_INSN(wdebug) =20 DISAS_INSN(trap) { - gen_exception(s, s->pc - 2, EXCP_TRAP0 + (insn & 0xf)); + gen_exception(s, s->insn_pc, EXCP_TRAP0 + (insn & 0xf)); } =20 static void gen_load_fcr(DisasContext *s, TCGv res, int reg) --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 1514936906035427.99257484459804; Tue, 2 Jan 2018 15:48:26 -0800 (PST) Received: from localhost ([::1]:59639 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWIC-0004GQ-Q8 for importer@patchew.org; Tue, 02 Jan 2018 18:48:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBO-00074P-PB for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBM-000374-1d for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:22 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:63583) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBL-00036G-N6 for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:19 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LhzVu-1fJca61nKU-00n8o3; Wed, 03 Jan 2018 00:41:16 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:40:56 +0100 Message-Id: <20180102234108.32713-6-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:dAupwgJm6IL6wZU3bvVL0wn9kERUb9zW6FxOb2jY1+LtkHIg+y9 BO2cZgd8reoTlvQEMl4u+9Nf/JY+zPgiYy9s1oX3yuE/phalwGQcQlaGv0+gWw8Eib4Rg/9 ul8Nno/XxuYH50NG05U6MoBmoQNmWPnpkS9nDIFVN8HkZDGb6WZ0rb1HiZMHui83+gLTgY2 3rjXZif5dQc2pWtGmdEqQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:NKYgmrYAJAM=:9FRmELWqs6dLrD1AwJAYth IzDTwWJeDxjEFa8d+XMuAvev1215OScHCAsmSmAuJrCgmTzzSlMapc0OUsJk6P7VOng9IoAOc YoB/XvEX/RuneHjxr5YrolVPlU265a3Y+nqyTW6Db0BSnrfMtkdmGaiVdf2jlYVsvUYXs6v05 VjqDDAN9OhwK98zJbqcEj5wXrN9VIqnX/DfNQ0YWSeLRdnysf/LyScOTG0AHrKvOvCdjN2aZ7 Ie7EhWlnk9qdoIMlbVS72FoUbFLR/w3Zpr9Ej++m39hcliy6nYCOn53Knt1u9vhSXrDwsyu9S L49owrgdtB5/qVp5cEpwP2Tqn1mZRvcFfCp0k/JIkt6mtMC9iteD/g084MLHFoHi7bROrlXPT 0MHLtol9ewikrBzkUEzYS5xC5+NewYLtmu/gDsSF8QWsY/FzJZU5oIcgknLk+qQ0rG1VNxm8N 5e9DLVhcAmHrFuUp/JxBiUK7Z3COajll87Dk/mP43Q61TCXYqgstG8mC1TxZWCOqnQzKl4vjo ZZi6lDdUBVsiBaMM6T4NrIVU6k8fKN8OCv9Xb49efroPM12xi0vYaC4J7BowHwYWMzvVdcUqS ES8QsAxHhJ2BqeLanCBkuGdzKnRYVKnMIiHaID9H1H22IOSUWlE9c0186PaFSU/wWMDJpVss4 /2DYVG0v8UporVRpn7eoUC+fPi+RrwLHKEBWhPdWuVQ2UYiTdniPAQ0kLuyOv4BbLKlgN/Fr7 wS4tTdzNkS87C9ppLxNpvAx7InD+DWtI5U5HTg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v6 05/17] target/m68k: add CPU_LOG_INT trace 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" Display the interrupts/exceptions information in QEMU logs (-d int) Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- Notes: v6: update SR with the content of CCR in the logs target/m68k/cpu.h | 8 ++++ target/m68k/op_helper.c | 117 ++++++++++++++++++++++++++++++++++++++++++++= +++- 2 files changed, 123 insertions(+), 2 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 5d03764eab..acc2629216 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -45,6 +45,8 @@ #define EXCP_ADDRESS 3 /* Address error. */ #define EXCP_ILLEGAL 4 /* Illegal instruction. */ #define EXCP_DIV0 5 /* Divide by zero */ +#define EXCP_CHK 6 /* CHK, CHK2 Instructions */ +#define EXCP_TRAPCC 7 /* FTRAPcc, TRAPcc, TRAPV Instructions */ #define EXCP_PRIVILEGE 8 /* Privilege violation. */ #define EXCP_TRACE 9 #define EXCP_LINEA 10 /* Unimplemented line-A (MAC) opcode. */ @@ -53,6 +55,9 @@ #define EXCP_DEBEGBP 13 /* Breakpoint debug interrupt. */ #define EXCP_FORMAT 14 /* RTE format error. */ #define EXCP_UNINITIALIZED 15 +#define EXCP_SPURIOUS 24 /* Spurious interrupt */ +#define EXCP_INT_LEVEL_1 25 /* Level 1 Interrupt autovector */ +#define EXCP_INT_LEVEL_7 31 /* Level 7 Interrupt autovector */ #define EXCP_TRAP0 32 /* User trap #0. */ #define EXCP_TRAP15 47 /* User trap #15. */ #define EXCP_FP_BSUN 48 /* Branch Set on Unordered */ @@ -63,6 +68,9 @@ #define EXCP_FP_OVFL 53 /* Overflow */ #define EXCP_FP_SNAN 54 /* Signaling Not-A-Number */ #define EXCP_FP_UNIMP 55 /* Unimplemented Data type */ +#define EXCP_MMU_CONF 56 /* MMU Configuration Error */ +#define EXCP_MMU_ILLEGAL 57 /* MMU Illegal Operation Error */ +#define EXCP_MMU_ACCESS 58 /* MMU Access Level Violation Error */ #define EXCP_UNSUPPORTED 61 =20 #define EXCP_RTE 0x100 diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 63089511cb..123981af55 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -68,10 +68,116 @@ static void do_rte(CPUM68KState *env) helper_set_sr(env, fmt); } =20 +static const char *m68k_exception_name(int index) +{ + switch (index) { + case EXCP_ACCESS: + return "Access Fault"; + case EXCP_ADDRESS: + return "Address Error"; + case EXCP_ILLEGAL: + return "Illegal Instruction"; + case EXCP_DIV0: + return "Divide by Zero"; + case EXCP_CHK: + return "CHK/CHK2"; + case EXCP_TRAPCC: + return "FTRAPcc, TRAPcc, TRAPV"; + case EXCP_PRIVILEGE: + return "Privilege Violation"; + case EXCP_TRACE: + return "Trace"; + case EXCP_LINEA: + return "A-Line"; + case EXCP_LINEF: + return "F-Line"; + case EXCP_DEBEGBP: /* 68020/030 only */ + return "Copro Protocol Violation"; + case EXCP_FORMAT: + return "Format Error"; + case EXCP_UNINITIALIZED: + return "Unitialized Interruot"; + case EXCP_SPURIOUS: + return "Spurious Interrupt"; + case EXCP_INT_LEVEL_1: + return "Level 1 Interrupt"; + case EXCP_INT_LEVEL_1 + 1: + return "Level 2 Interrupt"; + case EXCP_INT_LEVEL_1 + 2: + return "Level 3 Interrupt"; + case EXCP_INT_LEVEL_1 + 3: + return "Level 4 Interrupt"; + case EXCP_INT_LEVEL_1 + 4: + return "Level 5 Interrupt"; + case EXCP_INT_LEVEL_1 + 5: + return "Level 6 Interrupt"; + case EXCP_INT_LEVEL_1 + 6: + return "Level 7 Interrupt"; + case EXCP_TRAP0: + return "TRAP #0"; + case EXCP_TRAP0 + 1: + return "TRAP #1"; + case EXCP_TRAP0 + 2: + return "TRAP #2"; + case EXCP_TRAP0 + 3: + return "TRAP #3"; + case EXCP_TRAP0 + 4: + return "TRAP #4"; + case EXCP_TRAP0 + 5: + return "TRAP #5"; + case EXCP_TRAP0 + 6: + return "TRAP #6"; + case EXCP_TRAP0 + 7: + return "TRAP #7"; + case EXCP_TRAP0 + 8: + return "TRAP #8"; + case EXCP_TRAP0 + 9: + return "TRAP #9"; + case EXCP_TRAP0 + 10: + return "TRAP #10"; + case EXCP_TRAP0 + 11: + return "TRAP #11"; + case EXCP_TRAP0 + 12: + return "TRAP #12"; + case EXCP_TRAP0 + 13: + return "TRAP #13"; + case EXCP_TRAP0 + 14: + return "TRAP #14"; + case EXCP_TRAP0 + 15: + return "TRAP #15"; + case EXCP_FP_BSUN: + return "FP Branch/Set on unordered condition"; + case EXCP_FP_INEX: + return "FP Inexact Result"; + case EXCP_FP_DZ: + return "FP Divide by Zero"; + case EXCP_FP_UNFL: + return "FP Underflow"; + case EXCP_FP_OPERR: + return "FP Operand Error"; + case EXCP_FP_OVFL: + return "FP Overflow"; + case EXCP_FP_SNAN: + return "FP Signaling NAN"; + case EXCP_FP_UNIMP: + return "FP Unimplemented Data Type"; + case EXCP_MMU_CONF: /* 68030/68851 only */ + return "MMU Configuration Error"; + case EXCP_MMU_ILLEGAL: /* 68851 only */ + return "MMU Illegal Operation"; + case EXCP_MMU_ACCESS: /* 68851 only */ + return "MMU Access Level Violation"; + case 64 ... 255: + return "User Defined Vector"; + } + return "Unassigned"; +} + static void do_interrupt_all(CPUM68KState *env, int is_hw) { CPUState *cs =3D CPU(m68k_env_get_cpu(env)); uint32_t sp; + uint32_t sr; uint32_t fmt; uint32_t retaddr; uint32_t vector; @@ -109,10 +215,17 @@ static void do_interrupt_all(CPUM68KState *env, int i= s_hw) =20 vector =3D cs->exception_index << 2; =20 + sr =3D env->sr | cpu_m68k_get_ccr(env); + if (qemu_loglevel_mask(CPU_LOG_INT)) { + static int count; + qemu_log("INT %6d: %s(%#x) pc=3D%08x sp=3D%08x sr=3D%04x\n", + ++count, m68k_exception_name(cs->exception_index), + vector, env->pc, env->aregs[7], sr); + } + fmt |=3D 0x40000000; fmt |=3D vector << 16; - fmt |=3D env->sr; - fmt |=3D cpu_m68k_get_ccr(env); + fmt |=3D sr; =20 env->sr |=3D SR_S; if (is_hw) { --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 1514936907631567.4450237222738; Tue, 2 Jan 2018 15:48:27 -0800 (PST) Received: from localhost ([::1]:59640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWID-0004H5-QS for importer@patchew.org; Tue, 02 Jan 2018 18:48:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBN-00073U-OX for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBM-00037F-85 for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:21 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:61048) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBL-00036Q-TH for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:20 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M9tYC-1ed8xZ1qYa-00B365; Wed, 03 Jan 2018 00:41:17 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:40:57 +0100 Message-Id: <20180102234108.32713-7-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:k7zpQhC7ZtlKKec4qsHTxV2iwzgo6rzwbII2aM7asieRodzx0aU mQPQKVQk4LyNmfOPKhrqHvb2q0jRubkjDedwlMx0q7A+NSMYeb6GqZDXFzwefbe9/SXtlUK 69Ba2m3Dl+q9vKaNzR5923sRGG0zpt0iAG6/wibotUJ4701+9uCSR78T+k6+0PXp0vegDkS XVjlBxvhmZzGMHWegNTCw== X-UI-Out-Filterresults: notjunk:1;V01:K0:jS+UR0MGPgY=:N+0wy2aOYPrAvgr/Wa/3uQ DeUtzrTjYBD6GcmlgUlg5Sim7IFZw++n1Wf7Rc5d5fnqLNYDfrIpB3FfW1fxaxwxea/9fISl/ OxNAYJpc/gpfEusbXy915f7YwYHEfkJKKLPKgJE6nyumQIgUmRI0nv/AHVRGvPtRzKxQG4jeo R1HTUIfSeXnLv5A7Y6Srid8Q2QmPBbepiim2Ecs/UhMCyYCx0LW8aoM1U+IRCqLk8sT2K5Npk 11itBBikJG6uQTlVQAimwmL+UBadjx5OKOcT4+1E8yZ7u5Sjp9dRzfer81vGBUOc/zJal0jJT 6U3IMME4hRqHJ+la8A7zpjSQfJkWzzOjMJshQWGRsKZGErmO7dtqQVPtIJLJ7BltxzgZCU9aA 2FoW5MbXpR8eOc0UjD9RizP6/8jKngZ9uQvHjl2ujI9JcIh8Jt9SAMi/lEOFSynhQcngE/K6r vNeRwlypmvxpoeEZes0g3Km6OFeMblgjszRE3vrMRiNXUb396huPgEQraiHPlfqg9uUxQ/e+L dEMH+aka2rpK/abfluS/ldbcpvaEzb4V7TGXAU4+EghpOfxURFwTPfpehI0f2xLdcWX1fawHb bMpLS/K2Dco7vdRxlvY186649RzOzXaeqv/z2vkuYZgSwBQIEN6SlJRtKJJkgfLYrGIIMQSFI uBrpSPn9Ef9kus65oVzRWDd5lcF4xPUVkti3XOFMiwqeO1Vabv5dULXyC+RvT5sBssJ7H/TQK dkiDwZbXxgk7FJR4raFRznbDJk33imVewjtrkA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PATCH v6 06/17] target/m68k: manage 680x0 stack frames 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" 680x0 manages several stack frame formats: - format 0: four-word stack frame - format 1: four-word throwaway stack frame - format 2: six-word stack frame - format 3: Floating-Point post-instruction stack frame - format 4: eight-word stack frame - format 7: access-error stack frame Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- Notes: v6: update SR with the content of CCR in the logs introduce cpu_m68k_set_sr() to set SR instead of calling helper_set_sr(). target/m68k/cpu.h | 1 + target/m68k/helper.c | 10 ++- target/m68k/op_helper.c | 160 ++++++++++++++++++++++++++++++++++++++++++++= ++-- 3 files changed, 164 insertions(+), 7 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index acc2629216..cd4b3a7c7b 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -178,6 +178,7 @@ int cpu_m68k_signal_handler(int host_signum, void *pinf= o, void *puc); uint32_t cpu_m68k_get_ccr(CPUM68KState *env); void cpu_m68k_set_ccr(CPUM68KState *env, uint32_t); +void cpu_m68k_set_sr(CPUM68KState *env, uint32_t); void cpu_m68k_set_fpcr(CPUM68KState *env, uint32_t val); =20 =20 diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 7e50ff5871..af57ffcea9 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -316,13 +316,17 @@ uint32_t HELPER(sats)(uint32_t val, uint32_t v) return val; } =20 -void HELPER(set_sr)(CPUM68KState *env, uint32_t val) +void cpu_m68k_set_sr(CPUM68KState *env, uint32_t sr) { - env->sr =3D val & 0xffe0; - cpu_m68k_set_ccr(env, val); + env->sr =3D sr & 0xffe0; + cpu_m68k_set_ccr(env, sr); m68k_switch_sp(env); } =20 +void HELPER(set_sr)(CPUM68KState *env, uint32_t val) +{ + cpu_m68k_set_sr(env, val); +} =20 /* MAC unit. */ /* FIXME: The MAC unit implementation is a bit of a mess. Some helpers diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 123981af55..5c7b27b9ca 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -54,7 +54,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessT= ype access_type, } } =20 -static void do_rte(CPUM68KState *env) +static void cf_rte(CPUM68KState *env) { uint32_t sp; uint32_t fmt; @@ -65,7 +65,46 @@ static void do_rte(CPUM68KState *env) sp |=3D (fmt >> 28) & 3; env->aregs[7] =3D sp + 8; =20 - helper_set_sr(env, fmt); + cpu_m68k_set_sr(env, fmt); +} + +static void m68k_rte(CPUM68KState *env) +{ + uint32_t sp; + uint16_t fmt; + uint16_t sr; + + sp =3D env->aregs[7]; +throwaway: + sr =3D cpu_lduw_kernel(env, sp); + sp +=3D 2; + env->pc =3D cpu_ldl_kernel(env, sp); + sp +=3D 4; + if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) { + /* all except 68000 */ + fmt =3D cpu_lduw_kernel(env, sp); + sp +=3D 2; + switch (fmt >> 12) { + case 0: + break; + case 1: + env->aregs[7] =3D sp; + cpu_m68k_set_sr(env, sr); + goto throwaway; + case 2: + case 3: + sp +=3D 4; + break; + case 4: + sp +=3D 8; + break; + case 7: + sp +=3D 52; + break; + } + } + env->aregs[7] =3D sp; + cpu_m68k_set_sr(env, sr); } =20 static const char *m68k_exception_name(int index) @@ -173,7 +212,7 @@ static const char *m68k_exception_name(int index) return "Unassigned"; } =20 -static void do_interrupt_all(CPUM68KState *env, int is_hw) +static void cf_interrupt_all(CPUM68KState *env, int is_hw) { CPUState *cs =3D CPU(m68k_env_get_cpu(env)); uint32_t sp; @@ -189,7 +228,7 @@ static void do_interrupt_all(CPUM68KState *env, int is_= hw) switch (cs->exception_index) { case EXCP_RTE: /* Return from an exception. */ - do_rte(env); + cf_rte(env); return; case EXCP_HALT_INSN: if (semihosting_enabled() @@ -247,6 +286,119 @@ static void do_interrupt_all(CPUM68KState *env, int i= s_hw) env->pc =3D cpu_ldl_kernel(env, env->vbr + vector); } =20 +static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp, + uint16_t format, uint16_t sr, + uint32_t addr, uint32_t retaddr) +{ + CPUState *cs =3D CPU(m68k_env_get_cpu(env)); + switch (format) { + case 4: + *sp -=3D 4; + cpu_stl_kernel(env, *sp, env->pc); + *sp -=3D 4; + cpu_stl_kernel(env, *sp, addr); + break; + case 3: + case 2: + *sp -=3D 4; + cpu_stl_kernel(env, *sp, addr); + break; + } + *sp -=3D 2; + cpu_stw_kernel(env, *sp, (format << 12) + (cs->exception_index << 2)); + *sp -=3D 4; + cpu_stl_kernel(env, *sp, retaddr); + *sp -=3D 2; + cpu_stw_kernel(env, *sp, sr); +} + +static void m68k_interrupt_all(CPUM68KState *env, int is_hw) +{ + CPUState *cs =3D CPU(m68k_env_get_cpu(env)); + uint32_t sp; + uint32_t retaddr; + uint32_t vector; + uint16_t sr, oldsr; + + retaddr =3D env->pc; + + if (!is_hw) { + switch (cs->exception_index) { + case EXCP_RTE: + /* Return from an exception. */ + m68k_rte(env); + return; + case EXCP_TRAP0 ... EXCP_TRAP15: + /* Move the PC after the trap instruction. */ + retaddr +=3D 2; + break; + } + } + + vector =3D cs->exception_index << 2; + + sr =3D env->sr | cpu_m68k_get_ccr(env); + if (qemu_loglevel_mask(CPU_LOG_INT)) { + static int count; + qemu_log("INT %6d: %s(%#x) pc=3D%08x sp=3D%08x sr=3D%04x\n", + ++count, m68k_exception_name(cs->exception_index), + vector, env->pc, env->aregs[7], sr); + } + + /* + * MC68040UM/AD, chapter 9.3.10 + */ + + /* "the processor first make an internal copy" */ + oldsr =3D sr; + /* "set the mode to supervisor" */ + sr |=3D SR_S; + /* "suppress tracing" */ + sr &=3D ~SR_T; + /* "sets the processor interrupt mask" */ + if (is_hw) { + sr |=3D (env->sr & ~SR_I) | (env->pending_level << SR_I_SHIFT); + } + cpu_m68k_set_sr(env, sr); + sp =3D env->aregs[7]; + + sp &=3D ~1; + if (cs->exception_index =3D=3D EXCP_ADDRESS) { + do_stack_frame(env, &sp, 2, oldsr, 0, retaddr); + } else if (cs->exception_index =3D=3D EXCP_ILLEGAL || + cs->exception_index =3D=3D EXCP_DIV0 || + cs->exception_index =3D=3D EXCP_CHK || + cs->exception_index =3D=3D EXCP_TRAPCC || + cs->exception_index =3D=3D EXCP_TRACE) { + /* FIXME: addr is not only env->pc */ + do_stack_frame(env, &sp, 2, oldsr, env->pc, retaddr); + } else if (is_hw && oldsr & SR_M && + cs->exception_index >=3D EXCP_SPURIOUS && + cs->exception_index <=3D EXCP_INT_LEVEL_7) { + do_stack_frame(env, &sp, 0, oldsr, 0, retaddr); + oldsr =3D sr; + env->aregs[7] =3D sp; + cpu_m68k_set_sr(env, sr &=3D ~SR_M); + sp =3D env->aregs[7] & ~1; + do_stack_frame(env, &sp, 1, oldsr, 0, retaddr); + } else { + do_stack_frame(env, &sp, 0, oldsr, 0, retaddr); + } + + env->aregs[7] =3D sp; + /* Jump to vector. */ + env->pc =3D cpu_ldl_kernel(env, env->vbr + vector); +} + +static void do_interrupt_all(CPUM68KState *env, int is_hw) +{ + if (m68k_feature(env, M68K_FEATURE_M68000)) { + m68k_interrupt_all(env, is_hw); + return; + } + cf_interrupt_all(env, is_hw); +} + void m68k_cpu_do_interrupt(CPUState *cs) { M68kCPU *cpu =3D M68K_CPU(cs); --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 1514937046300275.1814842528745; Tue, 2 Jan 2018 15:50:46 -0800 (PST) Received: from localhost ([::1]:59667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWKT-00063D-Db for importer@patchew.org; Tue, 02 Jan 2018 18:50:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBO-00074Q-PJ for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBN-00037j-1C for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:22 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:51730) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBM-00036w-Mg for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:20 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MSmwb-1eN0Dj0nRN-00RsUS; Wed, 03 Jan 2018 00:41:18 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:40:58 +0100 Message-Id: <20180102234108.32713-8-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:mvp6m2UrF+Hfdq3T2q9My6Lb42SUNvkT3G6E40rO3VztGPC7kqM 14qziz3lLZUjiw/l6Quzt3zOafzz7fNs4Y8h/Ax/O0d7PftepqNWeG2gre0SFCjIA0fxVCK Vxg5VP/FbKGclskCrpANqo+u92fgH3pombv+0KomR/H/v6XAFdPOcWhByLvHWiC8GylsmHh Nb8Xx1le3UuIczDWcRLCQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:H92yzHYizNU=:zrWh5L1QjuDkj33paNEUUy +43DrbTJ49QCZwz5M8ODkREQiIbEX5EeFhEYR0/p5a9fJXFzWl5Ngz8+D6bSeo8kaZwZZlej+ R0joezRZQ3tbpJcY3pitZpMa4nePHVQ80A01+59Ji9CoSP4kuGdzOuBOs8YUIHtwfAJw7hxcA egWN/ThLITCrjP9zoISKLyAMi65alXpmy1xFKp4TGuneMb8c+tsW/UyPaSjuWzOzYrPwGlQfZ XkTYNozdKZWamj/L8Ep88DCcxuFznY85zM306AQzxu+8WNV7F00QStmf1JFibd08N+GZGKjhp 5T1dlP7g2oIeIqIGGxdXCR8KNYE60/OLc4Ol3CBMOLfbMewhOrLV51tPCzhcD5PevNvpir+66 dAvxKhwRiilwTfg1VUAkU3F2hvcnODJMlyNpK1tdTtLf6XJ0QG7Y63X59rHb5JkoPaYfADoAB furQbixUTMK30+63HdRXJctTPWyjKeo2q2/EkiwxTltNrdVETCc9lsFEUg5BBDFlZgpf+1yfZ 3YF5mACQtJbNgXubRb1/z3/fIDVgJEgWmAh/uAIzUMXqRZ11dbyZXJnKMJkS0llWf9kWjql6H ir1t3uUHs8h72JvTa3FropwPTYwAOtHpcd28Cu1+zJGcz6UeHFqJCAGOfT30mMvJ1zw3ThDxa NZeDZNdvcAV8X6a5H2SzEXvxXa9QGxmDBwhNiiLowb5667KLe1IQIDtFKWv/DVs6ZWd/yKgIG KVK7CPtk1IOCfIKkM0grwI24529E8AP4FdAHcw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v6 07/17] target/m68k: add chk and chk2 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" chk and chk2 compare a value to boundaries, and trigger a CHK exception if the value is out of bounds. Signed-off-by: Laurent Vivier Suggested-by: Richard Henderson --- Notes: v6: use helpers as suggested by Richard linux-user/main.c | 7 +++++ target/m68k/cpu.c | 2 ++ target/m68k/cpu.h | 1 + target/m68k/helper.h | 3 ++ target/m68k/op_helper.c | 37 +++++++++++++++++++++++ target/m68k/translate.c | 78 +++++++++++++++++++++++++++++++++++++++++++++= +++- 6 files changed, 127 insertions(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c index 71696ed33d..99a551b04f 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2985,6 +2985,13 @@ void cpu_loop(CPUM68KState *env) info._sifields._sigfault._addr =3D env->pc; queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); break; + case EXCP_CHK: + info.si_signo =3D TARGET_SIGFPE; + info.si_errno =3D 0; + info.si_code =3D TARGET_FPE_INTOVF; + info._sifields._sigfault._addr =3D env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; case EXCP_DIV0: info.si_signo =3D TARGET_SIGFPE; info.si_errno =3D 0; diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 0a3dd83548..57ffcb2114 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -134,6 +134,7 @@ static void m68020_cpu_initfn(Object *obj) m68k_set_feature(env, M68K_FEATURE_CAS); m68k_set_feature(env, M68K_FEATURE_BKPT); m68k_set_feature(env, M68K_FEATURE_RTD); + m68k_set_feature(env, M68K_FEATURE_CHK2); } #define m68030_cpu_initfn m68020_cpu_initfn #define m68040_cpu_initfn m68020_cpu_initfn @@ -156,6 +157,7 @@ static void m68060_cpu_initfn(Object *obj) m68k_set_feature(env, M68K_FEATURE_CAS); m68k_set_feature(env, M68K_FEATURE_BKPT); m68k_set_feature(env, M68K_FEATURE_RTD); + m68k_set_feature(env, M68K_FEATURE_CHK2); } =20 static void m5208_cpu_initfn(Object *obj) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index cd4b3a7c7b..68396bdd70 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -305,6 +305,7 @@ enum m68k_features { M68K_FEATURE_CAS, M68K_FEATURE_BKPT, M68K_FEATURE_RTD, + M68K_FEATURE_CHK2, }; =20 static inline int m68k_feature(CPUM68KState *env, int feature) diff --git a/target/m68k/helper.h b/target/m68k/helper.h index eebe52dae5..78483da003 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -94,3 +94,6 @@ DEF_HELPER_FLAGS_4(bfchg_mem, TCG_CALL_NO_WG, i32, env, i= 32, s32, i32) DEF_HELPER_FLAGS_4(bfclr_mem, TCG_CALL_NO_WG, i32, env, i32, s32, i32) DEF_HELPER_FLAGS_4(bfset_mem, TCG_CALL_NO_WG, i32, env, i32, s32, i32) DEF_HELPER_FLAGS_4(bfffo_mem, TCG_CALL_NO_WG, i64, env, i32, s32, i32) + +DEF_HELPER_3(chk, void, env, s32, s32) +DEF_HELPER_4(chk2, void, env, s32, s32, s32) diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 5c7b27b9ca..38f4746563 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -947,3 +947,40 @@ uint64_t HELPER(bfffo_mem)(CPUM68KState *env, uint32_t= addr, is already zero. */ return n | ffo; } + +void HELPER(chk)(CPUM68KState *env, int32_t val, int32_t ub) +{ + if (val < 0 || val > ub) { + CPUState *cs =3D CPU(m68k_env_get_cpu(env)); + + /* Recover PC and CC_OP for the beginning of the insn. */ + cpu_restore_state(cs, GETPC()); + + /* Adjust PC and FLAGS to end of the insn. */ + env->pc +=3D 2; + helper_flush_flags(env, env->cc_op); + env->cc_n =3D val; + + cs->exception_index =3D EXCP_CHK; + cpu_loop_exit(cs); + } +} + +void HELPER(chk2)(CPUM68KState *env, int32_t val, int32_t lb, int32_t ub) +{ + helper_flush_flags(env, env->cc_op); + + env->cc_z =3D val !=3D lb && val !=3D ub; + env->cc_c =3D lb <=3D ub ? val < lb || val > ub : val > ub && val < lb; + + if (env->cc_c) { + CPUState *cs =3D CPU(m68k_env_get_cpu(env)); + + cpu_restore_state(cs, GETPC()); + env->cc_op =3D CC_OP_FLAGS; + env->pc +=3D 4; + + cs->exception_index =3D EXCP_CHK; + cpu_loop_exit(cs); + } +} diff --git a/target/m68k/translate.c b/target/m68k/translate.c index a1e424e3db..62e955abc7 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4203,6 +4203,81 @@ DISAS_INSN(ff1) gen_helper_ff1(reg, reg); } =20 +DISAS_INSN(chk) +{ + TCGv src, reg; + int opsize; + + switch ((insn >> 7) & 3) { + case 3: + opsize =3D OS_WORD; + break; + case 2: + if (m68k_feature(env, M68K_FEATURE_CHK2)) { + opsize =3D OS_LONG; + break; + } + /* fallthru */ + default: + gen_exception(s, s->insn_pc, EXCP_ILLEGAL); + return; + } + SRC_EA(env, src, opsize, 1, NULL); + reg =3D gen_extend(DREG(insn, 9), opsize, 1); + + gen_helper_chk(cpu_env, reg, src); +} + +DISAS_INSN(chk2) +{ + uint16_t ext; + TCGv addr1, addr2, bound1, bound2, reg; + int opsize; + + switch ((insn >> 9) & 3) { + case 0: + opsize =3D OS_BYTE; + break; + case 1: + opsize =3D OS_WORD; + break; + case 2: + opsize =3D OS_LONG; + break; + default: + gen_exception(s, s->insn_pc, EXCP_ILLEGAL); + return; + } + + ext =3D read_im16(env, s); + if ((ext & 0x0800) =3D=3D 0) { + gen_exception(s, s->insn_pc, EXCP_ILLEGAL); + return; + } + + addr1 =3D gen_lea(env, s, insn, OS_UNSIZED); + addr2 =3D tcg_temp_new(); + tcg_gen_addi_i32(addr2, addr1, opsize_bytes(opsize)); + + bound1 =3D gen_load(s, opsize, addr1, 1); + tcg_temp_free(addr1); + bound2 =3D gen_load(s, opsize, addr2, 1); + tcg_temp_free(addr2); + + reg =3D tcg_temp_new(); + if (ext & 0x8000) { + tcg_gen_mov_i32(reg, AREG(ext, 12)); + } else { + gen_ext(reg, DREG(ext, 12), opsize, 1); + } + + gen_helper_chk2(cpu_env, reg, bound1, bound2); + tcg_temp_free(reg); + /* Note that chk2 also assigned to env->cc_op. */ + s->cc_op =3D CC_OP_FLAGS; + s->cc_op_synced =3D 1; +} + static TCGv gen_get_sr(DisasContext *s) { TCGv ccr; @@ -5306,7 +5381,7 @@ void register_m68k_insns (CPUM68KState *env) BASE(undef, 0000, 0000); INSN(arith_im, 0080, fff8, CF_ISA_A); INSN(arith_im, 0000, ff00, M68000); - INSN(undef, 00c0, ffc0, M68000); + INSN(chk2, 00c0, f9c0, CHK2); INSN(bitrev, 00c0, fff8, CF_ISA_APLUSC); BASE(bitop_reg, 0100, f1c0); BASE(bitop_reg, 0140, f1c0); @@ -5339,6 +5414,7 @@ void register_m68k_insns (CPUM68KState *env) BASE(move, 1000, f000); BASE(move, 2000, f000); BASE(move, 3000, f000); + INSN(chk, 4000, f040, M68000); INSN(strldsr, 40e7, ffff, CF_ISA_APLUSC); INSN(negx, 4080, fff8, CF_ISA_A); INSN(negx, 4000, ff00, M68000); --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 1514936761091736.22854004313; Tue, 2 Jan 2018 15:46:01 -0800 (PST) Received: from localhost ([::1]:59615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWFq-0002RF-3d for importer@patchew.org; Tue, 02 Jan 2018 18:45:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBO-00074V-RA for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBN-00038B-TS for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:22 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:53129) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBN-00037Z-It for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:21 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LtS7s-1ew3r90LdU-010wKH; Wed, 03 Jan 2018 00:41:19 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:40:59 +0100 Message-Id: <20180102234108.32713-9-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:zuKwPvlEBHfagrZW8JphfEMMeb1wukY9vtzXQIXTy9IkZ0fDh4y SOqR42vfx1VvtrGY24adcjNDZkdlTDhNhs17iEAA6/Ir6rtRNQW4jWyqASyzfJAwVQQ/9Ap rO2RATNclMVjNoS8RB5n8ULHKYEieS3Ey9f+4Kg/xGbTxyie8Le1p3YFnkF5bhZs2E1VfyS eXV1Pyg89PvukLMNmELBA== X-UI-Out-Filterresults: notjunk:1;V01:K0:jDN3z3nuLYs=:0oDj4qxm0Ipy/mABbyahao hOQOMtkh0/JzrMmh7HxQvu1wDrwFrK10yHBetRJX1L3DQ0KZO3cx69RAX1G0q4KqTdjAo788B tZp1KBolaBWHphIgG43g59kYRU/kVmkii5F19HqDsKJOlZQxiTtOCRgWmTQsBC1yFmU6zB+AO E9a9MetevOONTdF3oEOV33VvFIkN/0d4Zjn9cFRvIHZZsC0QDtEBuDKc1jiW5dDINCyruXxhz BpKs6SMeO1MLrYtBOD39QLFZ0+qzh3Gq2HB0m+KO4AHQpVDoOgyYlGHmYB/k0il7xEVhgmBF9 RZ13+G27uC6ZnJQfnY2+NT+GDEjhrZkx1DKZ2ZOSYN8oMhqkOEzacrsLosyZitfugBiXHfmv8 robSx7lBNTVcQm4w7ik1iZ6af/zVpDSHlPk+ucNTuWHUAffTrjbrDfGbPejg8ToV7Toqq/j/c oU/i87SP+PEQknZTTvl9eA5JfukebVj4r2fMBlHNcGJTmFyb2VRf2V9WRXxUAyxO+Q/h8hxPz fkIhMVh6Hk/Q8YzD5AT23A5DrpzHmBAzWVKwDoU970aJv+GPCU68u7U3cBL7GIVlbrp48rdBH tVtyUQIGQ5e4M4IPT7HMLYxmbdziNRZ8DEAFQwYnts5FDDMoUkkze85HiW98aegZSKgrAfy3x RItSf/LQLVcNHydyWA5Zzm0KnAHwlhw1jMeVWiLo+CCy8G1H+pzE/eJBr6Ohl+Na/6FewutCY sJbEDr9iyalRw9aV05X4/OKX/U6olYKMKzRyPw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v6 08/17] target/m68k: add move16 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" move16 moves the source line to the destination line. Lines are aligned to 16-byte boundaries and are 16 bytes long. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- Notes: v6: split move16 in two functions target/m68k/cpu.c | 10 ++++++- target/m68k/cpu.h | 1 + target/m68k/translate.c | 72 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 57ffcb2114..1936efd170 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -137,7 +137,15 @@ static void m68020_cpu_initfn(Object *obj) m68k_set_feature(env, M68K_FEATURE_CHK2); } #define m68030_cpu_initfn m68020_cpu_initfn -#define m68040_cpu_initfn m68020_cpu_initfn + +static void m68040_cpu_initfn(Object *obj) +{ + M68kCPU *cpu =3D M68K_CPU(obj); + CPUM68KState *env =3D &cpu->env; + + m68020_cpu_initfn(obj); + m68k_set_feature(env, M68K_FEATURE_M68040); +} =20 static void m68060_cpu_initfn(Object *obj) { diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 68396bdd70..2ac4ab191e 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -306,6 +306,7 @@ enum m68k_features { M68K_FEATURE_BKPT, M68K_FEATURE_RTD, M68K_FEATURE_CHK2, + M68K_FEATURE_M68040, /* instructions specific to MC68040 */ }; =20 static inline int m68k_feature(CPUM68KState *env, int feature) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 62e955abc7..662a518f16 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4278,6 +4278,76 @@ DISAS_INSN(chk2) s->cc_op_synced =3D 1; } =20 +static void m68k_copy_line(TCGv dst, TCGv src, int index) +{ + TCGv addr; + TCGv_i64 t0, t1; + + addr =3D tcg_temp_new(); + + t0 =3D tcg_temp_new_i64(); + t1 =3D tcg_temp_new_i64(); + + tcg_gen_andi_i32(addr, src, ~15); + tcg_gen_qemu_ld64(t0, addr, index); + tcg_gen_addi_i32(addr, addr, 8); + tcg_gen_qemu_ld64(t1, addr, index); + + tcg_gen_andi_i32(addr, dst, ~15); + tcg_gen_qemu_st64(t0, addr, index); + tcg_gen_addi_i32(addr, addr, 8); + tcg_gen_qemu_st64(t1, addr, index); + + tcg_temp_free_i64(t0); + tcg_temp_free_i64(t1); + tcg_temp_free(addr); +} + +DISAS_INSN(move16_reg) +{ + int index =3D IS_USER(s); + TCGv tmp; + uint16_t ext; + + ext =3D read_im16(env, s); + if ((ext & (1 << 15)) =3D=3D 0) { + gen_exception(s, s->insn_pc, EXCP_ILLEGAL); + } + + m68k_copy_line(AREG(ext, 12), AREG(insn, 0), index); + + /* Ax can be Ay, so save Ay before incrementing Ax */ + tmp =3D tcg_temp_new(); + tcg_gen_mov_i32(tmp, AREG(ext, 12)); + tcg_gen_addi_i32(AREG(insn, 0), AREG(insn, 0), 16); + tcg_gen_addi_i32(AREG(ext, 12), tmp, 16); + tcg_temp_free(tmp); +} + +DISAS_INSN(move16_mem) +{ + int index =3D IS_USER(s); + TCGv reg, addr; + + reg =3D AREG(insn, 0); + addr =3D tcg_const_i32(read_im32(env, s)); + + if ((insn >> 3) & 1) { + /* MOVE16 (xxx).L, (Ay) */ + m68k_copy_line(reg, addr, index); + } else { + /* MOVE16 (Ay), (xxx).L */ + m68k_copy_line(addr, reg, index); + } + + tcg_temp_free(addr); + + if (((insn >> 3) & 2) =3D=3D 0) { + /* (Ay)+ */ + tcg_gen_addi_i32(reg, reg, 16); + } +} + static TCGv gen_get_sr(DisasContext *s) { TCGv ccr; @@ -5579,6 +5649,8 @@ void register_m68k_insns (CPUM68KState *env) 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); #undef INSN --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 From nobody Tue Oct 28 01:56:37 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 1514937176729716.1898208274243; Tue, 2 Jan 2018 15:52:56 -0800 (PST) Received: from localhost ([::1]:59757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWMZ-0007wE-Ts for importer@patchew.org; Tue, 02 Jan 2018 18:52:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBS-00078n-L5 for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBP-00039Q-SU for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:26 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:51347) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBP-00038Z-JJ 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 0M6ym1-1erszU0jTR-00wnSK; Wed, 03 Jan 2018 00:41:21 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:41:01 +0100 Message-Id: <20180102234108.32713-11-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:fe8sF5yifhEVgZnQXhgfenUHhIOd53X9WY7i3mW3Tp41wRIE2xs OG/JcfCIrtwQx5ZApkAUP7T72xjGlINUtCMOOKAq6Ab9aXHsPwZtzvGnCk70+KgTcBjSG5Z fOvx4KPgxwQQjSfboH33SLNwGSrNPNFohpOdxG7EgcKVXPIe9PQobkAnTr1nvRxVtEmrrY9 qp6H9KCMShJ1I1JxiSNaA== X-UI-Out-Filterresults: notjunk:1;V01:K0:cTBkzAu2XeA=:1Bv+Y0H81aKr1JwlzHfxAx ck7L+lS2mDKQO1g/OVw58rrpx8zIuDNeLs6Is0+Ym0BoO6Ngl/dVDE+ikRGLNhdgGZjGjGLGz XctYYbfbCZjlJZuYPfVVmX9JlmM+GYqEc+1FS4BXdtUScytFr26mZAuXjqOpG/yGko/RnK+vF 94X1kuulzaj6u4VRg14zhgMNbqtyxxpjd4aFBYA2r1kw79kS0BPwof0sPRGfi+vpXIaKkzSL2 JvjpxB6ZJhfOJbtrnUu1aZ2AVQVcQWtDgDAFsH/IpqBbGp4L0L2I162VSoX9fRq8Yi2mg/l6M xKwunjYoh0mUsb5hbl2ZbSz1jKg/ij2UC6TFO+7uPp29lNmb/6+0gGh5y2daFTJ6Oi4Q43aeF 7ASWbN3EBzpCkEk/GYD/nn3+z2mar92HHZdJlgC9PrTkylprBKMFOnHWlDdUcH0iqmgIeRhGQ /XTcc2+uqey8PFMxD2GPQbD/kCiezbg8E+T44qBTD2CqH22wCsL411hsHTItSfEaeZ3/iwGmv hQWGZ3K6FMOaJySiCLeXMfDm0nSd7IRIJxgpXRpqnfbRxRbzI+TvqiuW6ALOXYGXxvLfw8bxs 0S4Q3NVDbnu9oPyGTl76SML4OPYNHL2VLj0jE0BAHixiX5eejzDFsHKqY8yvR9YCq8PZZpmsO PL2M8703Ied8SHqKJIZIXk3sAs9yC7xR7S9VpoEe/pb6TIAVxexqddUNio0gmwCZ8cHre4tmM DIORNic7iAk7+dFKYkxeGdflDJ8BAPfpoNAGsw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PATCH v6 10/17] target/m68k: add cpush/cinv 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" Add cache lines invalidate and cache lines push as no-op operations, as we don't have cache. These instructions are 68040 only. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index ae3fd3db26..75be38973e 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4497,6 +4497,24 @@ DISAS_INSN(cpushl) /* Cache push/invalidate. Implement as no-op. */ } =20 +DISAS_INSN(cpush) +{ + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + /* Cache push/invalidate. Implement as no-op. */ +} + +DISAS_INSN(cinv) +{ + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + /* Invalidate cache line. Implement as no-op. */ +} + DISAS_INSN(wddata) { gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); @@ -5675,6 +5693,8 @@ void register_m68k_insns (CPUM68KState *env) INSN(fsave, f300, ffc0, FPU); INSN(intouch, f340, ffc0, CF_ISA_A); INSN(cpushl, f428, ff38, CF_ISA_A); + INSN(cpush, f420, ff20, M68040); + INSN(cinv, f400, ff20, M68040); INSN(wddata, fb00, ff00, CF_ISA_A); INSN(wdebug, fbc0, ffc0, CF_ISA_A); #endif --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 1514937044570310.6231198626166; Tue, 2 Jan 2018 15:50:44 -0800 (PST) Received: from localhost ([::1]:59666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWKR-00062J-GZ for importer@patchew.org; Tue, 02 Jan 2018 18:50:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBT-00079H-NP for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBQ-00039u-VT for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:27 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:51142) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBQ-00039U-LS for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:24 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MUAFy-1eONFY0aFm-00R3Xr; Wed, 03 Jan 2018 00:41:22 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:41:02 +0100 Message-Id: <20180102234108.32713-12-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:9cI6W+rv80IYXsv+fu/Wkga5EqHwQY+dKUFKu3GQatxv9Mb+OFS ONICCUhY3blNloBDJge43B4Q94XUuJnOHRNzkzmyUD+pRx/Mp+4pFqT8Ro4hk91fiPSvptE 9SerWJppqqi00fDB/S8Ad12oLr8BnRkSCLb4AaWerfuPg5QF1QxQEZU3ssuzZuh+izTWerF CvwsUrsQV0DJ4LEl12IvA== X-UI-Out-Filterresults: notjunk:1;V01:K0:EHNHBMUeXEg=:1eeHqFYWx0dkWdn79Q0nTv SgyKKa05QgwXZnLpZS4/j5A1mcCibOorW1bXEqcxlu15K3YmF80QV7xzTGu275Q9t450fXfUI XJSfT2GqwJDKhT8a8clPMeVIUR6yf6o57lqVr3LLNOqGwwj2tB9HqdRr5SQqXvZwFXO16QOWK KVPnO4Dov13iq/ijn/X3BIWy0gDbjdZ+raW1Z+F/lX8MJsxe1qtiDVup4KW56tB8RoEkFw6kG YzuKjc/Bkepfb0NNz0QKsIiG/06iXbyOPL737aPugaetEtcNYkptw9Ym/dAaQU4e/hQHhkvWz Y4DuyscCUPo2tHMnBtApGy2pfLxIeechlmfawU4IQYiNwTlrmCLjC5ydK+Ef5pEltgQrxRsQz mo4KJfWal/UyDdn2Tu3JctmSjVBACbdOUdD1bvB5Zga3fd0wNMoMX1zw71iRX75HvcePeQ2cn 1CfQfyrEKOuVPetALumwWzx/H7VNXYoW7Y35Vtx5p66OJ//7et/kLoFz/q2hi9vb9ZtXTsZrD R+IYxA6PIuLST6oqDYJbezw6oEgEe9nFb8AR9qrw94u5cPdN5EH+QL1TEXUcI2vRR4qLyIE+/ wnXvMN4YL7Vr5oWDCoGcnNzPyW+JFobKzhYHr84kg79QiPIgspnyhdX5qAQuJRqvAycNA3o8D m7rbyb57sLU1kQPe9kUFHdZmLJAN6qOZcEVMPr1u15VizoZTvHl8kAFC2n0I6LDdOYKhOX41u yEsBnPcbyD5eYqX5clTXGdCV5dAHmOZ4azIfJw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v6 11/17] target/m68k: add reset 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" The instruction traps if the CPU is not in Supervisor state but the helper is empty because there is no easy way to reset all the peripherals without resetting the CPU itself. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/helper.c | 7 +++++++ target/m68k/helper.h | 4 ++++ target/m68k/translate.c | 13 +++++++++++++ 3 files changed, 24 insertions(+) diff --git a/target/m68k/helper.c b/target/m68k/helper.c index af57ffcea9..52b054e1a3 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -711,3 +711,10 @@ void HELPER(set_mac_extu)(CPUM68KState *env, uint32_t = val, uint32_t acc) res |=3D (uint64_t)(val & 0xffff0000) << 16; env->macc[acc + 1] =3D res; } + +#if defined(CONFIG_SOFTMMU) +void HELPER(reset)(CPUM68KState *env) +{ + /* FIXME: reset all except CPU */ +} +#endif diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 78483da003..d27ea37d60 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -97,3 +97,7 @@ DEF_HELPER_FLAGS_4(bfffo_mem, TCG_CALL_NO_WG, i64, env, i= 32, s32, i32) =20 DEF_HELPER_3(chk, void, env, s32, s32) DEF_HELPER_4(chk2, void, env, s32, s32, s32) + +#if defined(CONFIG_SOFTMMU) +DEF_HELPER_FLAGS_1(reset, TCG_CALL_NO_RWG, void, env) +#endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 75be38973e..69bd347a70 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -2762,6 +2762,18 @@ DISAS_INSN(unlk) tcg_temp_free(src); } =20 +#if defined(CONFIG_SOFTMMU) +DISAS_INSN(reset) +{ + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + + gen_helper_reset(cpu_env); +} +#endif + DISAS_INSN(nop) { } @@ -5573,6 +5585,7 @@ void register_m68k_insns (CPUM68KState *env) #if defined(CONFIG_SOFTMMU) INSN(move_to_usp, 4e60, fff8, USP); INSN(move_from_usp, 4e68, fff8, USP); + INSN(reset, 4e70, ffff, M68000); BASE(stop, 4e72, ffff); BASE(rte, 4e73, ffff); INSN(movec, 4e7b, ffff, CF_ISA_A); --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 151493696459450.94178750121932; Tue, 2 Jan 2018 15:49:24 -0800 (PST) Received: from localhost ([::1]:59646 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWJ6-00050C-2b for importer@patchew.org; Tue, 02 Jan 2018 18:49:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBT-00079G-Ms for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBR-0003AD-QC for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:27 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:62312) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBR-00039m-Go for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:25 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Lm8VZ-1f68381ELx-00ZcGa; Wed, 03 Jan 2018 00:41:23 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:41:03 +0100 Message-Id: <20180102234108.32713-13-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:Xnpd3ftKmGz7MmFNA7Vdifw6kpiVphRQAnUnb69ARRtOsT4dh/m hM46u/3SFQeIyRKAC5bKxOIbDOaoceTh7GLDafyB7Ni1a4liCJV20rVuyZ4JbxOJsJxdil8 RZwBArOiJK0tOQXYOqeshmK7lHIyQ2IIMTqrRPRD8usswQ+Mu96JIJY0r2hufUZPVDBPoLu ZK0pQWmUF19dcYJO2h5Jw== X-UI-Out-Filterresults: notjunk:1;V01:K0:C1Y4zgiI0SE=:hqLNVI04whHwqxX33Miw42 JvoYzX5+Em3qnLwqTfcZCqfIebBikJ0kz3I6/t2inFosu6wGXez6QW059cm+rqfl+hhQq8804 NnAM0+az2EAxpJAUHeE/0K4By2R2OtdWH215cOKXg6rvTl0SmaGxqaAdJYBJfEOiINwDynhn5 hpW8Xo+9CUoQuqbKaWrj7S2keTYCjnOM1kXEM0hdJWZv8NZOMI/XC9Q9Mvw5G6xBFOxX8xwHv iWzenrq1F5QYZwX8KRKao/h9qz7nWxea2E4FJ4YNTACTgjnNhtTimwlucLuibETyDf5mZYErk wN/F3/IhbvxCzPe98ix+Ay32CJZZ0jO7+m1f/wGvQZa8m792cUXTe28QsTOkegbXhwX4f51LE izrDCLCoTNq4D/Lut9zBpd7snmTaueWqF1gJPg3JU0zizf+tVBxqT4oB+Dze1pigH13P5L5gL 8ZxBV+cVpXsgBgPof1+Yj0g4kwyIH8VVwj0YkZNYSpiORPDfGiI99dTpvd8kxY2oSRA3Hf2HE r1aErQw4/xddBxGI+71lo/a0KteOyv3PKZ8rJu36l/Il4jzwt2iL7ogXJ34eSTxXYxbbMEutm L/dY3Uo5tuJthTzzbuUl9xyQrGbP6yNo7LHcQ8v5Db5/zr8W9FvVEn4tXWVFEVkAs2cCyKKSe WzC8sifBkdIlJdWgxBNOrX/1ng/qg/It5U6z2NpBToV/nle9OYoQV7pBAFKN4hEJMfjcQdkxY qvour2oLpbQwj++Sxl2IqIxUM/l/hrlk0uMXnA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v6 12/17] target/m68k: implement fsave/frestore 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" Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 69bd347a70..baaa260875 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5104,28 +5104,35 @@ DISAS_INSN(fscc) #if defined(CONFIG_SOFTMMU) DISAS_INSN(frestore) { - M68kCPU *cpu =3D m68k_env_get_cpu(env); + TCGv addr; =20 if (IS_USER(s)) { gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } - - /* TODO: Implement frestore. */ - cpu_abort(CPU(cpu), "FRESTORE not implemented"); + if (m68k_feature(s->env, M68K_FEATURE_M68040)) { + SRC_EA(env, addr, OS_LONG, 0, NULL); + /* FIXME: check the state frame */ + } else { + disas_undef(env, s, insn); + } } =20 DISAS_INSN(fsave) { - M68kCPU *cpu =3D m68k_env_get_cpu(env); - if (IS_USER(s)) { gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } =20 - /* TODO: Implement fsave. */ - cpu_abort(CPU(cpu), "FSAVE not implemented"); + if (m68k_feature(s->env, M68K_FEATURE_M68040)) { + /* always write IDLE */ + TCGv idle =3D tcg_const_i32(0x41000000); + DEST_EA(env, insn, OS_LONG, idle, NULL); + tcg_temp_free(idle); + } else { + disas_undef(env, s, insn); + } } #endif =20 --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 1514937102336770.3633349506864; Tue, 2 Jan 2018 15:51:42 -0800 (PST) Received: from localhost ([::1]:59675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWLK-0006qE-Ap for importer@patchew.org; Tue, 02 Jan 2018 18:51:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBT-00079F-Mj for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBS-0003AZ-JE for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:27 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:64309) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBS-0003A5-7Y for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:26 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LoMUn-1f8Iqg3cwD-00gF2q; Wed, 03 Jan 2018 00:41:24 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:41:04 +0100 Message-Id: <20180102234108.32713-14-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:IW9A+Oxe2J48x9ubsOxzFrLDi/Fch8+l0bJwP9G+X2mpCVcuoR9 yqz+7zE85r85+odlKANcstDM4veMb8xjwUPgAFDjnUorXrtYBMogihbiHMLpCs5pkQGtOWQ x+rJ8mzybqwxp7ZQCPXDBgoSMh+Hja9Ua+/3IOo64IFG9L1SX4apsvruIHpTygI71iTjB3N mzLqTmhkGMMSg71wSZKrw== X-UI-Out-Filterresults: notjunk:1;V01:K0:gNrq+4LU+2o=:+75/MCWp9EouZqaVM36up4 s+JdlJWz26SMd+K5u7T7iVosfPZ1/I1cyIXXxZI1CZfZPNaNjcCpdP9XQ+NnLfowpKmvNR6FX 5yqURvRTzJLB9Y07eNT32l7Ue/5K8TKLQ+9Agr5qCgeXu+0obBp7SvHSVAlt7ra4dZACu77+y 0NMyNdFTDjQ2UeIlzQDuzhed62zsmTX+n4a8iDVY7NAH+73fggr3gmuVw0NEQlJRPcEKXqTT5 yMSE08WocCtdGywFjpdUjqkUo4of3NFhU09oKFeeio1aRp9HeTgiWrLWy9UyJcWD5I7nTOsE4 G12BuabTyuz48jJtbZFv9g8Mmu4zqvEg/AHikoajF1IACuvSkODnCD6eIDh5Q9dqv0nanwfpn m4FljPXx7lzy3qJpOLBnRCyS5U3PKxpvoE99AGjs734WrV4w7tZ8UqI2Dc/oaUkRwIfK0dqF7 bE0GRK/rwth4itA57TIlfW1SAjWsAOPufsYk9x1drvJ1icbGGeKMUrDIIbC5P1HlRY/xFIhaj pBmI6KLE8U59y2AXRDSIcOLvmraCKYjC8ipm/ZZg5Nd8zm22xgE4Mzt/32KWEPSvsgZTiTrWR okQVo2xTGqrjazkaxFTkBlnjCuux+gY0I7g+Qif/TZ/ozWoZuq76ryD0AJP6cHesvnCaQqaKb xIWWIY9hD8caYnErnfwjUmkos0KuFoJOpQX5M7cxGQyL4jCSB/rdX3SWWM2QUevjASuIm+/g+ 1I8kzbmQr3G8igk/hylpb9JQmWwbXdmJFuAK2w== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v6 13/17] target/m68k: move CCR/SR functions 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" The following patches will be clearer if we move functions before adding new ones. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 111 ++++++++++++++++++++++++--------------------= ---- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index baaa260875..d879574c1a 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -2131,6 +2131,61 @@ DISAS_INSN(bitop_im) } } =20 +static TCGv gen_get_ccr(DisasContext *s) +{ + TCGv dest; + + update_cc_op(s); + dest =3D tcg_temp_new(); + gen_helper_get_ccr(dest, cpu_env); + return dest; +} + +static TCGv gen_get_sr(DisasContext *s) +{ + TCGv ccr; + TCGv sr; + + ccr =3D gen_get_ccr(s); + sr =3D tcg_temp_new(); + tcg_gen_andi_i32(sr, QREG_SR, 0xffe0); + tcg_gen_or_i32(sr, sr, ccr); + return sr; +} + +static void gen_set_sr_im(DisasContext *s, uint16_t val, int ccr_only) +{ + if (ccr_only) { + tcg_gen_movi_i32(QREG_CC_C, val & CCF_C ? 1 : 0); + tcg_gen_movi_i32(QREG_CC_V, val & CCF_V ? -1 : 0); + tcg_gen_movi_i32(QREG_CC_Z, val & CCF_Z ? 0 : 1); + tcg_gen_movi_i32(QREG_CC_N, val & CCF_N ? -1 : 0); + tcg_gen_movi_i32(QREG_CC_X, val & CCF_X ? 1 : 0); + } else { + gen_helper_set_sr(cpu_env, tcg_const_i32(val)); + } + set_cc_op(s, CC_OP_FLAGS); +} + +static void gen_set_sr(CPUM68KState *env, DisasContext *s, uint16_t insn, + int ccr_only) +{ + if ((insn & 0x38) =3D=3D 0) { + if (ccr_only) { + gen_helper_set_ccr(cpu_env, DREG(insn, 0)); + } else { + gen_helper_set_sr(cpu_env, DREG(insn, 0)); + } + set_cc_op(s, CC_OP_FLAGS); + } else if ((insn & 0x3f) =3D=3D 0x3c) { + uint16_t val; + val =3D read_im16(env, s); + gen_set_sr_im(s, val, ccr_only); + } else { + disas_undef(env, s, insn); + } +} + DISAS_INSN(arith_im) { int op; @@ -2474,16 +2529,6 @@ DISAS_INSN(clr) tcg_temp_free(zero); } =20 -static TCGv gen_get_ccr(DisasContext *s) -{ - TCGv dest; - - update_cc_op(s); - dest =3D tcg_temp_new(); - gen_helper_get_ccr(dest, cpu_env); - return dest; -} - DISAS_INSN(move_from_ccr) { TCGv ccr; @@ -2510,40 +2555,6 @@ DISAS_INSN(neg) tcg_temp_free(dest); } =20 -static void gen_set_sr_im(DisasContext *s, uint16_t val, int ccr_only) -{ - if (ccr_only) { - tcg_gen_movi_i32(QREG_CC_C, val & CCF_C ? 1 : 0); - tcg_gen_movi_i32(QREG_CC_V, val & CCF_V ? -1 : 0); - tcg_gen_movi_i32(QREG_CC_Z, val & CCF_Z ? 0 : 1); - tcg_gen_movi_i32(QREG_CC_N, val & CCF_N ? -1 : 0); - tcg_gen_movi_i32(QREG_CC_X, val & CCF_X ? 1 : 0); - } else { - gen_helper_set_sr(cpu_env, tcg_const_i32(val)); - } - set_cc_op(s, CC_OP_FLAGS); -} - -static void gen_set_sr(CPUM68KState *env, DisasContext *s, uint16_t insn, - int ccr_only) -{ - if ((insn & 0x38) =3D=3D 0) { - if (ccr_only) { - gen_helper_set_ccr(cpu_env, DREG(insn, 0)); - } else { - gen_helper_set_sr(cpu_env, DREG(insn, 0)); - } - set_cc_op(s, CC_OP_FLAGS); - } else if ((insn & 0x3f) =3D=3D 0x3c) { - uint16_t val; - val =3D read_im16(env, s); - gen_set_sr_im(s, val, ccr_only); - } else { - disas_undef(env, s, insn); - } -} - - DISAS_INSN(move_to_ccr) { gen_set_sr(env, s, insn, 1); @@ -4360,18 +4371,6 @@ DISAS_INSN(move16_mem) } } =20 -static TCGv gen_get_sr(DisasContext *s) -{ - TCGv ccr; - TCGv sr; - - ccr =3D gen_get_ccr(s); - sr =3D tcg_temp_new(); - tcg_gen_andi_i32(sr, QREG_SR, 0xffe0); - tcg_gen_or_i32(sr, sr, ccr); - return sr; -} - DISAS_INSN(strldsr) { uint16_t ext; --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 1514937314565812.1150380921318; Tue, 2 Jan 2018 15:55:14 -0800 (PST) Received: from localhost ([::1]:59790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWOn-0001JJ-NA for importer@patchew.org; Tue, 02 Jan 2018 18:55:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBU-00079q-Cc for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBT-0003As-EG for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:28 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:61964) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBT-0003AS-3H for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:27 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Mcj5x-1eFGRp2eVl-00HwrE; Wed, 03 Jan 2018 00:41:25 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:41:05 +0100 Message-Id: <20180102234108.32713-15-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:Rxe26Cp6/t8My5pbeyU650Wzfp3dU79byqagG1SDnmaabje7Y9S nSczj1rrVZtJUc5kraZK/2BxM6npUmK+0nDcZW6EKj6ACEZZ9VLvLmj415md2Oz0siMdYM6 LL55AnwIPmNohQh3+TM3wPURugvOuaxnRQrPFq1hNsNxr+ztClHJsSFzobyjr1WevLXgu53 a41+hILg4OJQ/ap+Ewwag== X-UI-Out-Filterresults: notjunk:1;V01:K0:LORBa1VcmVg=:NIzZWhPM5ptflDOEGYragy 3FjDqBwBWsOv4HmbLD2uxu8PSKJ3yOYgFolbo3iuqjwzgJdE73rOnpmf4D/15qE3jHCINoj98 4i6jj3Aqt5XQkGLnS2TJkcBjUp/f4nP+kl8LLoEjbWNeuqiX0u00MeHbVKKAWFn37nFec6H6b JQtqqv1scmyEc9NN/24GzudbBIU47QwzAvaeHMzrPsNT2U9x58RA9NiKdmk4dfIZG/2E1Wh16 eZnuCLfPnUHm013UF6ClNZzNy0rka/4Zk4To9xZB8U7ENEcQe59fK+jEoLZ+H6Djq40XrINQc nNGs730hXdyKNnLvfh4LzHG9mKYJxHyU4UYeJRk6mSfcIO0KbD2CFixp5/0xyCkVaT6vDMOmw nxcw8zjQceZA53+wGA9aWTi9AX8C/b+in2uyM5EJsE/wd0BwSiNELAaG1JOCO838459kZH+Jq y3YIaR6/4gVefiznfbBqTIhz9Ck1FlWG42rxsXF35xcluDnz1wU6K4Ve2sztHszFtWMPF9obE d9+EB5nadrVGXH/NEueN7KhlOr4EsOVWMDeLn0mRJh0r6myp/pnVXWX6Aq6mdsrd3xekDV6OH ofj+CRvzWwbDUeRixkwIHH/80wpIvAnV/b7titrUqBAivaRP5fclsGp8msYMZoELZGsl6h2wl rtdMAelmd70amXblFxFByZcRyoKILjAyK7j6H3pBEYJ+D9g9+a0vdg5MP+y8VNXg/+mWxzXRS MRjEzJSURtot4JKMVBhvwvQVUhthT/On/7hjTQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v6 14/17] target/m68k: add 680x0 "move to SR" instruction 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" Some cleanup, and allows SR to be moved from any addressing mode. Previous code was wrong for coldfire: coldfire also allows to use addressing mode to set SR/CCR. It only supports Data register to get SR/CCR (move from) Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index d879574c1a..d007943d93 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -2162,27 +2162,34 @@ static void gen_set_sr_im(DisasContext *s, uint16_t= val, int ccr_only) tcg_gen_movi_i32(QREG_CC_N, val & CCF_N ? -1 : 0); tcg_gen_movi_i32(QREG_CC_X, val & CCF_X ? 1 : 0); } else { - gen_helper_set_sr(cpu_env, tcg_const_i32(val)); + TCGv sr =3D tcg_const_i32(val); + gen_helper_set_sr(cpu_env, sr); + tcg_temp_free(sr); } set_cc_op(s, CC_OP_FLAGS); } =20 -static void gen_set_sr(CPUM68KState *env, DisasContext *s, uint16_t insn, - int ccr_only) +static void gen_set_sr(DisasContext *s, TCGv val, int ccr_only) { - if ((insn & 0x38) =3D=3D 0) { - if (ccr_only) { - gen_helper_set_ccr(cpu_env, DREG(insn, 0)); - } else { - gen_helper_set_sr(cpu_env, DREG(insn, 0)); - } - set_cc_op(s, CC_OP_FLAGS); - } else if ((insn & 0x3f) =3D=3D 0x3c) { + if (ccr_only) { + gen_helper_set_ccr(cpu_env, val); + } else { + gen_helper_set_sr(cpu_env, val); + } + set_cc_op(s, CC_OP_FLAGS); +} + +static void gen_move_to_sr(CPUM68KState *env, DisasContext *s, uint16_t in= sn, + bool ccr_only) +{ + if ((insn & 0x3f) =3D=3D 0x3c) { uint16_t val; val =3D read_im16(env, s); gen_set_sr_im(s, val, ccr_only); } else { - disas_undef(env, s, insn); + TCGv src; + SRC_EA(env, src, OS_WORD, 0, NULL); + gen_set_sr(s, src, ccr_only); } } =20 @@ -2557,7 +2564,7 @@ DISAS_INSN(neg) =20 DISAS_INSN(move_to_ccr) { - gen_set_sr(env, s, insn, 1); + gen_move_to_sr(env, s, insn, true); } =20 DISAS_INSN(not) @@ -4410,7 +4417,7 @@ DISAS_INSN(move_to_sr) gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } - gen_set_sr(env, s, insn, 0); + gen_move_to_sr(env, s, insn, false); gen_lookup_tb(s); } =20 @@ -5557,9 +5564,8 @@ void register_m68k_insns (CPUM68KState *env) BASE(move_to_ccr, 44c0, ffc0); 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); + BASE(move_to_sr, 46c0, ffc0); #endif INSN(nbcd, 4800, ffc0, M68000); INSN(linkl, 4808, fff8, M68000); --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 151493743438741.0002255568312; Tue, 2 Jan 2018 15:57:14 -0800 (PST) Received: from localhost ([::1]:59902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWQf-0003sJ-J2 for importer@patchew.org; Tue, 02 Jan 2018 18:57:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBX-0007CW-6n for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBU-0003BP-GC for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:31 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:53351) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBU-0003Ao-4f for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:28 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M0N4b-1elILY2WDt-00uaWu; Wed, 03 Jan 2018 00:41:26 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:41:06 +0100 Message-Id: <20180102234108.32713-16-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:qetgPlw0ZO/hrCt7/B82k5xzM0G5RSV/Jiskol5lxOiW4vHmVEh zYxm5SVcgmwgLIIblpD0ecFk6zvasGZZxq8n2bWsNZskE5vHMTQMYC7AMRhhfNaZmF2x27x pcFUy7RECcFpfESc9EpwawEV9e41vPLupWOfLBe2OwKovxXnSZ9i3OY3xkQmNn6T+i3kc0Q wXrM7agvkCvbBDyOF5B2Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:m7bugPGoRM0=:uRMnewbgkyOCdyIkNv9/fN g0ZcfpdpjJ0bVvqCq34HDWnDhjZPQrgmK6IPsA7Hr090Xk42yLIJ0JEQQRqCopyU/s29puvpY kHLqsb1b4rbzIAaSr79osnyUwfNcJsQUal7obIkLGbncplbl+R91EZn4uZZYpHzv0vZKxYmMb MrRfNJ/MoyPMcISZ96ZSLPI5zLmSHfCQHpslp0JsYUy7WY3y/0MHXoY882Mch+B8HMgDNoGFH iB5wTw88Udn9vSDmVfwUgNmIc11ACS/VQshP56L10TIo/ifcCTKuaZr+pbR7skZynWfRBd4lD xNcFW0FjkypBCBs6i72ngvUYwH06FcMzBLAU1WEp0f5512LHKVWV3/7oWKmPRfII6Dl1wfwpU JlXMaIpulzQxGOZmbzfAAfaxFEIyraaYoj8350+cWkY4vLZ6RTPJHRtlDgwqpHGJcl5fVxi03 2+CweCjmAKOVZiHw+8MKr60EjqTVnyM3aZNAb3s5BAmYP2kW8hnzGarcL1i7C7q1fkG+YWgtN fTsPg4rgKhSaAT39WOrfzkMVfb1eMsOzwVhKtiKfV/c+QC5WkMlYQgL8NPYvxQZnn3jSk1bE3 1M8iL/54vVb0mboVW9+gPMOoGWnq2ZpSPfcr33pccWYZ+rPqOz7wtpNcFhWQd375KZLfbsQsp uzqsNqXFMW5UzM91iNsPWTWDul2flPgb+xw4D0NcVhU4LeqwiekROCWLZZabpJFTM6cKZAWxQ AMVwtBtTbGS9XdqgR1hjWpO0SFkJblGnXWHilA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH v6 15/17] target/m68k: add andi/ori/eori to SR/CCR 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" Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 53 ++++++++++++++++++++++++++++++++++++++++++---= ---- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index d007943d93..205c3b8f35 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -2201,6 +2201,7 @@ DISAS_INSN(arith_im) TCGv dest; TCGv addr; int opsize; + bool with_SR =3D ((insn & 0x3f) =3D=3D 0x3c); =20 op =3D (insn >> 9) & 7; opsize =3D insn_opsize(insn); @@ -2217,32 +2218,73 @@ DISAS_INSN(arith_im) default: abort(); } - SRC_EA(env, src1, opsize, 1, (op =3D=3D 6) ? NULL : &addr); + + if (with_SR) { + /* SR/CCR can only be used with andi/eori/ori */ + if (op =3D=3D 2 || op =3D=3D 3 || op =3D=3D 6) { + disas_undef(env, s, insn); + return; + } + switch (opsize) { + case OS_BYTE: + src1 =3D gen_get_ccr(s); + break; + case OS_WORD: + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + src1 =3D gen_get_sr(s); + break; + case OS_LONG: + disas_undef(env, s, insn); + return; + } + } else { + SRC_EA(env, src1, opsize, 1, (op =3D=3D 6) ? NULL : &addr); + } dest =3D tcg_temp_new(); switch (op) { case 0: /* ori */ tcg_gen_or_i32(dest, src1, im); - gen_logic_cc(s, dest, opsize); + if (with_SR) { + gen_set_sr(s, dest, opsize =3D=3D OS_BYTE); + } else { + DEST_EA(env, insn, opsize, dest, &addr); + gen_logic_cc(s, dest, opsize); + } break; case 1: /* andi */ tcg_gen_and_i32(dest, src1, im); - gen_logic_cc(s, dest, opsize); + if (with_SR) { + gen_set_sr(s, dest, opsize =3D=3D OS_BYTE); + } else { + DEST_EA(env, insn, opsize, dest, &addr); + gen_logic_cc(s, dest, opsize); + } break; case 2: /* subi */ tcg_gen_setcond_i32(TCG_COND_LTU, QREG_CC_X, src1, im); tcg_gen_sub_i32(dest, src1, im); gen_update_cc_add(dest, im, opsize); set_cc_op(s, CC_OP_SUBB + opsize); + DEST_EA(env, insn, opsize, dest, &addr); break; case 3: /* addi */ tcg_gen_add_i32(dest, src1, im); gen_update_cc_add(dest, im, opsize); tcg_gen_setcond_i32(TCG_COND_LTU, QREG_CC_X, dest, im); set_cc_op(s, CC_OP_ADDB + opsize); + DEST_EA(env, insn, opsize, dest, &addr); break; case 5: /* eori */ tcg_gen_xor_i32(dest, src1, im); - gen_logic_cc(s, dest, opsize); + if (with_SR) { + gen_set_sr(s, dest, opsize =3D=3D OS_BYTE); + } else { + DEST_EA(env, insn, opsize, dest, &addr); + gen_logic_cc(s, dest, opsize); + } break; case 6: /* cmpi */ gen_update_cc_cmp(s, src1, im, opsize); @@ -2251,9 +2293,6 @@ DISAS_INSN(arith_im) abort(); } tcg_temp_free(im); - if (op !=3D 6) { - DEST_EA(env, insn, opsize, dest, &addr); - } tcg_temp_free(dest); } =20 --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 1514936628802741.7277175420973; Tue, 2 Jan 2018 15:43:48 -0800 (PST) Received: from localhost ([::1]:59576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWDh-0000UR-9H for importer@patchew.org; Tue, 02 Jan 2018 18:43:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBX-0007Cf-Cg for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBV-0003Bo-MQ for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:31 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:62548) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBV-0003BY-B5 for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:29 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MV0vp-1ePB0N34V3-00YVGi; Wed, 03 Jan 2018 00:41:27 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:41:07 +0100 Message-Id: <20180102234108.32713-17-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:gpo1JIjpY86cy2joRQOkmlhfa1UsJSc7EUpMSEajhI/l8Tp8JlR 0SvJX9/2LLWUSNIy5GUIdGSp5UBj0SRkJTxqzIR4k0ruSq5CB+tSPHcea87k1eMhoVJGNCT JeqbaduVj7rEy4IW32M3uDK5vTvc4rbrWYwaiHYSg9Z8q93zG67TQf2V6WY8d5fKwokqdwC 1rHGrE+0IuhwD880c0Xtw== X-UI-Out-Filterresults: notjunk:1;V01:K0:ihmXS+aj+P8=:E6Ph7VhVeT4rlK52uS0yID vbjYujDB+3uEnEMSjSpQo1UqGOxtolLHfDP/HUMqsV6/FeMIXKBhTD6Fo8UHW9NMINoMEZANH n1e+EsgMMSQpCuZoowH/t0nHs4wlX2IdylIvqu+f1JxK5jOBS0eShWdLI6wIUeqCZWkncnlRT 7kqNq5xUJ5cO7wCHvtNygx1aSdrx33EhY2Ndzdk4hyRFCXIBWMrwUU81cLueczX1Bjok3uqg0 IKbs3JaVhTrqSU7shTd2pl9gIELwBiC/yXEfiTXwL2voXD956bwE8yVwyAZsl+3zdLzmLppdc PtW38eo2cyr32GnmSgqL+bBrLMDNaxEiFRRDnMapAeDFyzyI/jwTN4lltDgKaPjeo8AtzxkOJ hNSRfiUrerQiQ5TdfxWFcoeq3QHbm5WXpQ3RliNzw1Zyqz62h5yP4/aaP/MuVEtHFZlqfwY28 pv4wLFsu6/8zyOcWUol7izpu1H73PLIj9POU0Rti8ovVKo+GAR7Vh3cG//tMK/zgrkWVDQMPT u/coqFFYzdcLbmQXH86AghbaOxFZDq/UaJrwv7Y+1gKn5lOhZeukFthD5aOMbqajKP0sqa5hI TKR6lSCgsh3kxmus1RIVLbs5ynGKdqCVfoN1lh4MvcL+hrium+6yh8s7xHa4gMpFlNNRYKEl7 A732sULqzk5bWYEAZQW59ice3kahX+VyExsIzuVcV4o+D2ZsT++Xcp5hMAiwr3jrOS7PDAfeh zVRqq42Cch+SodLMzll6PmyAqCClx70ZJI81qg== 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 16/17] target/m68k: add the Interrupt Stack Pointer 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" Add the third stack pointer, the Interrupt Stack Pointer (ISP) (680x0 only). This stack will be needed in softmmu mode. Update movec to set/get the value of the three stacks. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- Notes: v6: use cpu_m68k_set_sr() to set SR in GDB stub and in m68k_cpu_reset() target/m68k/cpu.c | 8 ++--- target/m68k/cpu.h | 70 ++++++++++++++++++++++++++++++++++++++++- target/m68k/gdbstub.c | 2 +- target/m68k/helper.c | 82 ++++++++++++++++++++++++++++++++++++++++++++-= ---- target/m68k/helper.h | 4 ++- target/m68k/monitor.c | 1 + target/m68k/translate.c | 40 ++++++++++++++++++++++-- 7 files changed, 190 insertions(+), 17 deletions(-) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 1936efd170..03126ba543 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -55,17 +55,17 @@ static void m68k_cpu_reset(CPUState *s) mcc->parent_reset(s); =20 memset(env, 0, offsetof(CPUM68KState, end_reset_fields)); -#if !defined(CONFIG_USER_ONLY) - env->sr =3D 0x2700; +#ifdef CONFIG_SOFTMMU + cpu_m68k_set_sr(env, SR_S | SR_I); +#else + cpu_m68k_set_sr(env, 0); #endif - m68k_switch_sp(env); for (i =3D 0; i < 8; i++) { env->fregs[i].d =3D nan; } cpu_m68k_set_fpcr(env, 0); env->fpsr =3D 0; =20 - cpu_m68k_set_ccr(env, 0); /* TODO: We should set PC from the interrupt vector. */ env->pc =3D 0; } diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 2ac4ab191e..759b30d389 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -89,7 +89,7 @@ typedef struct CPUM68KState { =20 /* SSP and USP. The current_sp is stored in aregs[7], the other here.= */ int current_sp; - uint32_t sp[2]; + uint32_t sp[3]; =20 /* Condition flags. */ uint32_t cc_op; @@ -223,6 +223,74 @@ typedef enum { =20 #define M68K_SSP 0 #define M68K_USP 1 +#define M68K_ISP 2 + +/* m68k Control Registers */ + +/* ColdFire */ +/* Memory Management Control Registers */ +#define M68K_CR_ASID 0x003 +#define M68K_CR_ACR0 0x004 +#define M68K_CR_ACR1 0x005 +#define M68K_CR_ACR2 0x006 +#define M68K_CR_ACR3 0x007 +#define M68K_CR_MMUBAR 0x008 + +/* Processor Miscellaneous Registers */ +#define M68K_CR_PC 0x80F + +/* Local Memory and Module Control Registers */ +#define M68K_CR_ROMBAR0 0xC00 +#define M68K_CR_ROMBAR1 0xC01 +#define M68K_CR_RAMBAR0 0xC04 +#define M68K_CR_RAMBAR1 0xC05 +#define M68K_CR_MPCR 0xC0C +#define M68K_CR_EDRAMBAR 0xC0D +#define M68K_CR_SECMBAR 0xC0E +#define M68K_CR_MBAR 0xC0F + +/* Local Memory Address Permutation Control Registers */ +#define M68K_CR_PCR1U0 0xD02 +#define M68K_CR_PCR1L0 0xD03 +#define M68K_CR_PCR2U0 0xD04 +#define M68K_CR_PCR2L0 0xD05 +#define M68K_CR_PCR3U0 0xD06 +#define M68K_CR_PCR3L0 0xD07 +#define M68K_CR_PCR1U1 0xD0A +#define M68K_CR_PCR1L1 0xD0B +#define M68K_CR_PCR2U1 0xD0C +#define M68K_CR_PCR2L1 0xD0D +#define M68K_CR_PCR3U1 0xD0E +#define M68K_CR_PCR3L1 0xD0F + +/* MC680x0 */ +/* MC680[1234]0/CPU32 */ +#define M68K_CR_SFC 0x000 +#define M68K_CR_DFC 0x001 +#define M68K_CR_USP 0x800 +#define M68K_CR_VBR 0x801 /* + Coldfire */ + +/* MC680[234]0 */ +#define M68K_CR_CACR 0x002 /* + Coldfire */ +#define M68K_CR_CAAR 0x802 /* MC68020 and MC68030 only */ +#define M68K_CR_MSP 0x803 +#define M68K_CR_ISP 0x804 + +/* MC68040/MC68LC040 */ +#define M68K_CR_TC 0x003 +#define M68K_CR_ITT0 0x004 +#define M68K_CR_ITT1 0x005 +#define M68K_CR_DTT0 0x006 +#define M68K_CR_DTT1 0x007 +#define M68K_CR_MMUSR 0x805 +#define M68K_CR_URP 0x806 +#define M68K_CR_SRP 0x807 + +/* MC68EC040 */ +#define M68K_CR_IACR0 0x004 +#define M68K_CR_IACR1 0x005 +#define M68K_CR_DACR0 0x006 +#define M68K_CR_DACR1 0x007 =20 #define M68K_FPIAR_SHIFT 0 #define M68K_FPIAR (1 << M68K_FPIAR_SHIFT) diff --git a/target/m68k/gdbstub.c b/target/m68k/gdbstub.c index c7f44c9bb3..99e5be8132 100644 --- a/target/m68k/gdbstub.c +++ b/target/m68k/gdbstub.c @@ -63,7 +63,7 @@ int m68k_cpu_gdb_write_register(CPUState *cs, uint8_t *me= m_buf, int n) } else { switch (n) { case 16: - env->sr =3D tmp; + cpu_m68k_set_sr(env, tmp); break; case 17: env->pc =3D tmp; diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 52b054e1a3..a999389e9a 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -171,28 +171,84 @@ void m68k_cpu_init_gdb(M68kCPU *cpu) /* TODO: Add [E]MAC registers. */ } =20 -void HELPER(movec)(CPUM68KState *env, uint32_t reg, uint32_t val) +void HELPER(cf_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val) { M68kCPU *cpu =3D m68k_env_get_cpu(env); =20 switch (reg) { - case 0x02: /* CACR */ + case M68K_CR_CACR: env->cacr =3D val; m68k_switch_sp(env); break; - case 0x04: case 0x05: case 0x06: case 0x07: /* ACR[0-3] */ + case M68K_CR_ACR0: + case M68K_CR_ACR1: + case M68K_CR_ACR2: + case M68K_CR_ACR3: /* TODO: Implement Access Control Registers. */ break; - case 0x801: /* VBR */ + case M68K_CR_VBR: env->vbr =3D val; break; /* TODO: Implement control registers. */ default: - cpu_abort(CPU(cpu), "Unimplemented control register write 0x%x =3D= 0x%x\n", + cpu_abort(CPU(cpu), + "Unimplemented control register write 0x%x =3D 0x%x\n", reg, val); } } =20 +void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val) +{ + M68kCPU *cpu =3D m68k_env_get_cpu(env); + + switch (reg) { + /* MC680[1234]0 */ + case M68K_CR_VBR: + env->vbr =3D val; + return; + /* MC680[234]0 */ + case M68K_CR_CACR: + env->cacr =3D val; + m68k_switch_sp(env); + return; + /* MC680[34]0 */ + case M68K_CR_USP: + env->sp[M68K_USP] =3D val; + return; + case M68K_CR_MSP: + env->sp[M68K_SSP] =3D val; + return; + case M68K_CR_ISP: + env->sp[M68K_ISP] =3D val; + return; + } + cpu_abort(CPU(cpu), "Unimplemented control register write 0x%x =3D 0x%= x\n", + reg, val); +} + +uint32_t HELPER(m68k_movec_from)(CPUM68KState *env, uint32_t reg) +{ + M68kCPU *cpu =3D m68k_env_get_cpu(env); + + switch (reg) { + /* MC680[1234]0 */ + case M68K_CR_VBR: + return env->vbr; + /* MC680[234]0 */ + case M68K_CR_CACR: + return env->cacr; + /* MC680[34]0 */ + case M68K_CR_USP: + return env->sp[M68K_USP]; + case M68K_CR_MSP: + return env->sp[M68K_SSP]; + case M68K_CR_ISP: + return env->sp[M68K_ISP]; + } + cpu_abort(CPU(cpu), "Unimplemented control register read 0x%x\n", + reg); +} + void HELPER(set_macsr)(CPUM68KState *env, uint32_t val) { uint32_t acc; @@ -232,8 +288,20 @@ void m68k_switch_sp(CPUM68KState *env) int new_sp; =20 env->sp[env->current_sp] =3D env->aregs[7]; - new_sp =3D (env->sr & SR_S && env->cacr & M68K_CACR_EUSP) - ? M68K_SSP : M68K_USP; + if (m68k_feature(env, M68K_FEATURE_M68000)) { + if (env->sr & SR_S) { + if (env->sr & SR_M) { + new_sp =3D M68K_SSP; + } else { + new_sp =3D M68K_ISP; + } + } else { + new_sp =3D M68K_USP; + } + } else { + new_sp =3D (env->sr & SR_S && env->cacr & M68K_CACR_EUSP) + ? M68K_SSP : M68K_USP; + } env->aregs[7] =3D env->sp[new_sp]; env->current_sp =3D new_sp; } diff --git a/target/m68k/helper.h b/target/m68k/helper.h index d27ea37d60..57f210aa14 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -8,7 +8,9 @@ DEF_HELPER_4(divsl, void, env, int, int, s32) DEF_HELPER_4(divull, void, env, int, int, i32) DEF_HELPER_4(divsll, void, env, int, int, s32) DEF_HELPER_2(set_sr, void, env, i32) -DEF_HELPER_3(movec, void, env, i32, i32) +DEF_HELPER_3(cf_movec_to, void, env, i32, i32) +DEF_HELPER_3(m68k_movec_to, void, env, i32, i32) +DEF_HELPER_2(m68k_movec_from, i32, env, i32) DEF_HELPER_4(cas2w, void, env, i32, i32, i32) DEF_HELPER_4(cas2l, void, env, i32, i32, i32) DEF_HELPER_4(cas2l_parallel, void, env, i32, i32, i32) diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index 5605323a81..52781e85f0 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -30,6 +30,7 @@ static const MonitorDef monitor_defs[] =3D { { "sr", offsetof(CPUM68KState, sr) }, { "ssp", offsetof(CPUM68KState, sp[0]) }, { "usp", offsetof(CPUM68KState, sp[1]) }, + { "isp", offsetof(CPUM68KState, sp[2]) }, { NULL }, }; =20 diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 205c3b8f35..9088e87b97 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4515,7 +4515,7 @@ DISAS_INSN(rte) gen_exception(s, s->insn_pc, EXCP_RTE); } =20 -DISAS_INSN(movec) +DISAS_INSN(cf_movec) { uint16_t ext; TCGv reg; @@ -4532,7 +4532,32 @@ DISAS_INSN(movec) } else { reg =3D DREG(ext, 12); } - gen_helper_movec(cpu_env, tcg_const_i32(ext & 0xfff), reg); + gen_helper_cf_movec_to(cpu_env, tcg_const_i32(ext & 0xfff), reg); + gen_lookup_tb(s); +} + +DISAS_INSN(m68k_movec) +{ + uint16_t ext; + TCGv reg; + + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + + ext =3D read_im16(env, s); + + if (ext & 0x8000) { + reg =3D AREG(ext, 12); + } else { + reg =3D DREG(ext, 12); + } + if (insn & 1) { + gen_helper_m68k_movec_to(cpu_env, tcg_const_i32(ext & 0xfff), reg); + } else { + gen_helper_m68k_movec_from(reg, cpu_env, tcg_const_i32(ext & 0xfff= )); + } gen_lookup_tb(s); } =20 @@ -5639,7 +5664,8 @@ void register_m68k_insns (CPUM68KState *env) INSN(reset, 4e70, ffff, M68000); BASE(stop, 4e72, ffff); BASE(rte, 4e73, ffff); - INSN(movec, 4e7b, ffff, CF_ISA_A); + INSN(cf_movec, 4e7b, ffff, CF_ISA_A); + INSN(m68k_movec, 4e7a, fffe, M68000); #endif BASE(nop, 4e71, ffff); INSN(rtd, 4e74, ffff, RTD); @@ -5946,6 +5972,14 @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, fpri= ntf_function cpu_fprintf, cpu_fprintf(f, "RP "); break; } + cpu_fprintf(f, "\n"); +#ifdef CONFIG_SOFTMMU + cpu_fprintf(f, "%sA7(MSP) =3D %08x %sA7(USP) =3D %08x %sA7(ISP) =3D %0= 8x\n", + env->current_sp =3D=3D M68K_SSP ? "->" : " ", env->sp[M68K= _SSP], + env->current_sp =3D=3D M68K_USP ? "->" : " ", env->sp[M68K= _USP], + env->current_sp =3D=3D M68K_ISP ? "->" : " ", env->sp[M68K= _ISP]); + cpu_fprintf(f, "VBR =3D 0x%08x\n", env->vbr); +#endif } =20 void restore_state_to_opc(CPUM68KState *env, TranslationBlock *tb, --=20 2.14.3 From nobody Tue Oct 28 01:56:37 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 1514937320160194.185162970909; Tue, 2 Jan 2018 15:55:20 -0800 (PST) Received: from localhost ([::1]:59792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWOo-0001KT-Kx for importer@patchew.org; Tue, 02 Jan 2018 18:55:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBY-0007Cl-W8 for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBW-0003C1-8w for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:33 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:60469) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBV-0003Bf-Vi for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:30 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LpAm0-1f98j52LQ4-00er45; Wed, 03 Jan 2018 00:41:27 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:41:08 +0100 Message-Id: <20180102234108.32713-18-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:qxHc71q9/Rua+zbjSWqiunC0R1o2lGEtKJs9h6aB7NzjC06Npd0 Yae/SEr7ABy2frzP73YGXd3SYxJHTyFwciFC6cR5TLDoIjOlXul+kn9cs9hjbnCsk+VKC3s a23BEtb/LfkVjuTL5rMBcbuujkUC/dISSSGYokqfuaCFu59PpdGEmQUeOmqF+DHG9RxK36A i133wLLSd4zN/8ErEaBfw== X-UI-Out-Filterresults: notjunk:1;V01:K0:YA/a1ZPh21c=:zZz23SJ5w34NamfeOSeimU 01+gZzK6knXgubHlBFUlG8q9ELGSkOhMLarU+ccKjUYhqAOS598ngpJmfpt9OM3IVXKiVy+wT oQdZkcMxLxrOGqul66AstXLpmJSJu1Ma2uK5feRqRdYuYuOgn7z2FuAv9QjGt1076rdWJ6R6S ke0Px7UN4VzH4k42z9syFoga8WjqqFqB+sAugFeC3sLBLUK9ytzqs657pDKwgJZ1VxX5B67Q6 eOoj/QaM1M3NQ1jlmdotNiX9Y4nViqlLdd1b40pPmQIwVyyD1DB16V6puZPK/HNmteprGY028 VGUz8W/GtQ8tTQGE0bYu9igA9vELCy/hJvpKPHjXEw2QC5cgambYHwh2I5UVhgWJA8+b6wcTs jzRagx3M322IOTggupOptZJATUaFCdzBNG5nYZ1/qgKgM3bM0Am8BeNNYWbuIqX9K7id7KBnQ YGYgMsPOrdZ0bSMhVrH+yPj6F/DngQ+hKjfBKS4pBjebfTPG7lAACUigu6kTJyrGUVeZrrfxK ut8hI1T55LbOf4GPSD67lylUKoZOnwNVrYxfbUr6/0XQaQ1aOa3yo6t44hIarVygQTMHmnyvr /uObCAds+BnZ+8tukAqkD677bwZt0Ts0ual3qFk0JYcGJfUM7IghaiLtrY+7J6ai+FazxUh5i U8Z5a5YCzmrFyKzvyYtpW1giqszddrddOuMfdTY9hI7vOHHXnx2f9w8BXoLGgZ1bjtpsYDXKO lwHY5qblg22CFG96RNQsJGwa3lvMpcHO3JBaXQ== 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 v6 17/17] target/m68k: fix m68k_cpu_dump_state() 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" Display correctly the Trace bits for 680x0 (2 bits instead of 1 for Coldfire). Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/cpu.h | 3 ++- target/m68k/translate.c | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 759b30d389..2985b039e1 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -219,7 +219,8 @@ typedef enum { #define SR_I 0x0700 #define SR_M 0x1000 #define SR_S 0x2000 -#define SR_T 0x8000 +#define SR_T_SHIFT 14 +#define SR_T 0xc000 =20 #define M68K_SSP 0 #define M68K_USP 1 diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 9088e87b97..06840c5d00 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5937,9 +5937,12 @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, fpri= ntf_function cpu_fprintf, } cpu_fprintf (f, "PC =3D %08x ", env->pc); sr =3D env->sr | cpu_m68k_get_ccr(env); - cpu_fprintf(f, "SR =3D %04x %c%c%c%c%c ", sr, (sr & CCF_X) ? 'X' : '-', - (sr & CCF_N) ? 'N' : '-', (sr & CCF_Z) ? 'Z' : '-', - (sr & CCF_V) ? 'V' : '-', (sr & CCF_C) ? 'C' : '-'); + cpu_fprintf(f, "SR =3D %04x T:%x I:%x %c%c %c%c%c%c%c\n", + sr, (sr & SR_T) >> SR_T_SHIFT, (sr & SR_I) >> SR_I_SHIFT, + (sr & SR_S) ? 'S' : 'U', (sr & SR_M) ? '%' : 'I', + (sr & CCF_X) ? 'X' : '-', (sr & CCF_N) ? 'N' : '-', + (sr & CCF_Z) ? 'Z' : '-', (sr & CCF_V) ? 'V' : '-', + (sr & CCF_C) ? 'C' : '-'); cpu_fprintf(f, "FPSR =3D %08x %c%c%c%c ", env->fpsr, (env->fpsr & FPSR_CC_A) ? 'A' : '-', (env->fpsr & FPSR_CC_I) ? 'I' : '-', --=20 2.14.3