From patchwork Thu Jan 4 01:28:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855319 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBqxJ17JZz9s7s for ; Thu, 4 Jan 2018 12:30:28 +1100 (AEDT) Received: from localhost ([::1]:44664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuMU-0000ra-5D for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:30:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLR-0000p9-Kp for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLO-00073N-Dv for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:21 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:60041) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLO-00070P-4P for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:18 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M72xB-1erU2I2os9-00wmxL; Thu, 04 Jan 2018 02:29:15 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:28:57 +0100 Message-Id: <20180104012913.30763-2-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:um/WSB40AujNAFG7cBhWkK+5H7ZQTbh74yPUwOBkQ580cqB5Id0 G9VDJUqWSZRW0RzLetyTiw9dCPAYncuRc0SoBfmb5DemVfjCllMG0nW8iWCiirqiebe+QRQ 4nKUVNizrL30FqZZXboWbNyw+AH0HvDm3u+qdvFV1vmaybDXmhQ4j9apxoCwSYNkKYTvIlT RQaz59+2ao/ylri8rnfAA== X-UI-Out-Filterresults: notjunk:1; V01:K0:LPx6E7Qpg7w=:rXI02TmRCV4McSzdNndVgU jWuBaE2OA9AIuwWqw58yArqwPg/kAP/IXIYKgg7aXrYI2tyjfJGb4s2WMLvjRbix6VVNKIrt8 Bh839SSwT+c+R4x1MQ0CxtEFC77EWtk2sOgC28LE8wTrDDPdqZQ8S+K1Gv4CUsAsCNYGb41Ln QUHS+MOtY9uIXENYbgjkTmT1xpWOTFYGc7wcwur/VQ0rVq2wJdLazbmyepGEuaNm98XWHX6fP Q3wxWnzfXiiSZinrSFxsQMwnsYKfjnzX4K9Gn5uWmWxkyYXgH6tRorgdH/H0wYJV9sKWgRmtS MA5QCRdhYsbT+9mFCozG3NyQUGeRT6w1q5KlpbS0jhSoegOJBVLU/MA0HJK1C4luuhFy9F4Vg 72vFlHJRq7dvIFGlGxaK5goikYjTdmnJ7ghDiR3QSDuBGhPEy033NTuP2m4NWaS+LZIWu/XrE GYj+SVtMX1B+vaDaaaIJoyN+0X0ZEBTgaR41ZlPy6yD8UBqGkrGKIZFRyL3p5hV2A7y+Ap+vw yWWV71zDXaPnWlOaVcl/RgwYHMIgl9tFb6SE2wpVP2lv4088v0vSlZk4tKUfQirxYsXkcacy1 lZk4pv5BenUgjuhbr1ZyI83tsk97nMf9f7Xn8nNtkw91S8ZzdwV7ZsO1ol1k116Niixqx4GQh XgzVN7GPucTebcsHHOQwkAVksd9WLNDt/rBH6YnpynbYR0U0AORcRNmGVpk8F5StiLuR3S8Hj S+FGpl9tTaQoNtDBLDvXSsEQpwlibFt60YeTWg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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) 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, TCGLabel *l1) DisasCompare c; gen_fcc_cond(&c, s, cond); + update_cc_op(s); tcg_gen_brcond_i32(c.tcond, c.v1, c.v2, l1); free_cond(&c); } From patchwork Thu Jan 4 01:28:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855324 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBr213611z9s1h for ; Thu, 4 Jan 2018 12:34:33 +1100 (AEDT) Received: from localhost ([::1]:44715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuQR-0003zn-EB for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:34:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLS-0000pW-7r for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLP-00075K-1x for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:22 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:54394) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLO-00071J-O1 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:18 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MBSjO-1efC4A0ilK-00AVdU; Thu, 04 Jan 2018 02:29:16 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:28:58 +0100 Message-Id: <20180104012913.30763-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:C4XxJDU8rNZCwnQiKNMOmep8/upFwdWIxTr+PqGgzABDj16/Ovs 0z8Q09CYkIWKgm7wl5uLhZIjk7rMVxztG6X7+u9jT7mz4kdZ+YFkEGK5k66gMivrucVzdpf BYZ1172LtD/bHyaCb69OzVNSPg52Vw9j9szd/itYiJ9/3fIik7E6ocObIn9+vZaJjZYf+iz 8NCw7++MNuTAzWJ3fZ9YA== X-UI-Out-Filterresults: notjunk:1; V01:K0:jjdAw3V5h4I=:lLO9G3rMcEisIZU9aMTVGy C7tFrcOYfhrtET0961oomzxUEUcyvmJjFXtoYKP2Sy3a35GWqbBwsW1qNe3MOewMkTB00Svrb e02Ki7XNGPVtrK0/LSg6ZzUpIj2zQQda2I8Lmp3JhCCiBNYknkSjSFjgxkKxjOJ8nG8RECxin SaZSmHbFl80MQa8tKDBRbYtOKeC7KMDz97JZPizgIESDWkdszgn0gni0MpWmPjZ86m6lBpq5L Gzo1elEO4meSksNb9sIrzoRgLcFRfkwkH6HuDKCOeYRBk0iqtySQNY8XbIixMp8g5nkwXbiNB IqXzP/PqtOoAiFBGfD6TqV64Xu12rFaVju6vk3TYLeeWL0OqTAfnfNruRj+lykuUQanOdx/0x vnShMC46qwXdX9MzQEcZ1vW+3i9YMD5qb0b2Ikv5z3B+SU2VN3ccUPVd8E8SFbbRIdEclXvut 5gLzqsEh7VvYRX9Stt9FPadhQsX57fGxpcCj9zB5VEj7bkwbc2whJLyoQ2D/vxetDRwreyjaT Jvsl8MESdlUMFDZusHjnfwvRgUBBnI7A1WjFHrwAqMHFR0Dmf+9Y0atY0LrA69zr1kFEkR4hy wa1sDcksVMfG6DSr6MoiwUBbEM3YwguE5HXqZnCJ6GwSFVIW7/QsyjlqP5wz6PgMFllfpBnoT UbvMsMr7v+xrT4flnFfIJ4iBBXXcAVlJr4RCo3KdU6deNZnujUZC8KVo4r7ufGbhv2o6GVXtU LsOI5aKXbveTPRJ63l3xdHyep8YaZAq30EGtpg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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; - gen_flush_flags(s); update_cc_op(s); dest = tcg_temp_new(); gen_helper_get_ccr(dest, cpu_env); From patchwork Thu Jan 4 01:28:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBqxJ2zrxz9s81 for ; Thu, 4 Jan 2018 12:30:28 +1100 (AEDT) Received: from localhost ([::1]:44662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuMU-0000qK-AA for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:30:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLR-0000p5-Hq for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLP-00075x-Dn for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:21 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:61172) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLO-00072L-T7 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:19 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LnShi-1f7e8g2mnG-00haFg; Thu, 04 Jan 2018 02:29:16 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:28:59 +0100 Message-Id: <20180104012913.30763-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:DFU1CO4oUhq2uY+vzHxYm1xVkAbHWoJMNuWYpHEJCxqcRDibCqu WkytUdVwoVo4BuhZuhKQUFppBhk3qPUnL3V4ZukYWsCjpwiEEC+36ClC7kyErxJ+oD7WIBu vM75hL5hG5Q9peek03+wmTRldV2BnZz0GFOyrUQxWQHqLAC9tj+2se1k/Ecrj8StmJjW17E lXzFxbYUBHv/pGUGA1AbA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ir9md/UTWRw=:tewxWw/GH5Cd/6gT8G5EJ6 nvKjMYb+b7d5Hzmdy7RcV6DSYQReyC3Z/mEJVKuEwvs3a7BhGqFYjEEUp66NyLrlaykGszgFl 9cAtcLhU86tJ2TSQ6Or0PdBuMhnK/uHFBU5oldCkM7KdLws5zvwUi6m9YjGcGarxuc5Cbgv/q J1//FnC7itAguGczqnDyh9Er30jm7PYVEUgsYkBoPaId4cyzq6bMO8W+dQ824t2cKYICCxtnF PyMN27v7w1SFu02d16G/gKA955ooEQfO14qrnTk8uzpbN49YIFPW8Khu2+3HrB9KUIJ3zpuvn JYY0f87Xg5O4N7AVVJfeAQ/n8o1j7hxjrtj3FHFxFtZ3pBdmN7K6YxAIESev7OQ+SgH1BGlvg DKBJj9cCu7OGo1TZ9Xhu3AlxJEfJrKrblTrLU+513bTX8+HOEx0zagQgCJU8uKnUwLSeD48TL Gw/MCh6Ub+6EoLnF9gXzDSSNr77vz6BrTdP6M2h2POfws0YGJFmX3ydVggwrPW/Mpp7r/+WJa vssK+QW70ZwL8evEpgZQyS3+NSf7MBzE0CSVsrPPnbuJyXopi3qfvPiiEhbMjx27qS6MaN1As dhRLgn410LYXjR1QLxvVtZvpqOspR/8RFbsy+XkvJ2Dq/RPhDCC80aEyGXmgFYOwMdDzIyK/m u0Yo7cmmPWNhxFJFNLGFQhrCy7POguJoiVYNvS6SxZ2N2uPFIh+vdTixCqIVFfRIKXnf1B0pD 2v428le3PzH7uPQJdEl88WMgMh8m7ZqIAa5edA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 *env, abi_ulong mask) { + uint32_t sr = (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); } @@ -5634,7 +5635,7 @@ restore_sigcontext(CPUM68KState *env, struct target_sigcontext *sc) __get_user(env->aregs[1], &sc->sc_a1); __get_user(env->pc, &sc->sc_pc); __get_user(temp, &sc->sc_sr); - env->sr = (env->sr & 0xff00) | (temp & 0xff); + cpu_m68k_set_ccr(env, temp); } /* @@ -5726,7 +5727,7 @@ static inline int target_rt_setup_ucontext(struct target_ucontext *uc, CPUM68KState *env) { target_greg_t *gregs = uc->tuc_mcontext.gregs; - uint32_t sr = cpu_m68k_get_ccr(env); + uint32_t sr = (env->sr & 0xff00) | cpu_m68k_get_ccr(env); __put_user(TARGET_MCONTEXT_VERSION, &uc->tuc_mcontext.version); __put_user(env->dregs[0], &gregs[0]); From patchwork Thu Jan 4 01:29:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855332 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBrBk1xWtz9s9Y for ; Thu, 4 Jan 2018 12:42:06 +1100 (AEDT) Received: from localhost ([::1]:44767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuXk-0001Gt-8t for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:42:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLU-0000r7-4S for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLQ-00077E-FP for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:23 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:55869) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLQ-00075V-4B for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:20 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LiUtY-1f2gK10ir6-00ceZi; Thu, 04 Jan 2018 02:29:17 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:00 +0100 Message-Id: <20180104012913.30763-5-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:urCbtnpZHUDSFOA0P31AMFtATTtCdtWenmJ7uT1sku+r0fc/wmj Qjtw/0KxdpWxawUoRB2TXLg6vm2uYLFy0+TVqFi0Jc76qsXTjkbbMx2w8VB/o5gKBF+HauI O1ngdqr8nkqbCfGzA4IWtWCludPzZOWLOxRENHzobxRSZSKN5FPZYYo2ZYEV0AQuFXxe7Yq Ghw8HX4xXaHnTdTj/LnUg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Hj1iYM1dAPs=:Qur2i5BcWt9OWTv1m3mmua 6VHGnqlwbxokpaTGrVjcZjecBxlDEG6MB4PT8a0DmmWcf6dauoYUvfHl0eB53cmV2ux8dlLpP yWifDYg9btUtSXw5bahIQZwa0UN80upNRKydsU2B9ScqPHS62Hm/byNg+RjKvsbgg+o4vtQJw 2AabFGziU1JzgitwAGxXh/4UIUFsgMJEp6Aw8fLFvWPeeT80WjfMBLZCPnO+JZ2cUmNbuBTvY zeYVDtEdYV7RFL6nJ+4zCOaxuIwf0RQWkEEyr1S0liJC64wWQfrWHXq5HmpBt4qT5RUH3QeHZ /qSkuQRa0IzrLkBtaNQiZjAYgUAvlTf+JDW10rK2VRklftUvsA4VXO2LrKGDltrXOyG/jkaJr qCZh/TRbh1jlkfc3dUUo3DUOjJkj1JKaZrqa2OKCcMbAnsrRmNwfzvd2TqlGz3gv9ViNFNjtA UfdtWa0LU8WmMwe39J6RKR16BWP9sfh3BIkg4zrEXiGCnbQZi+Er6hKC2jnFtfsW3dxcGZPPx +XKsEJIK/Lr8OSThdPuUKHNJOJKt3z8HicT+7eU/xKMCDrKe6iMj/cVxx3O1/ytoWFkMRgb0z hG+h2b/49i1llfPxovpmjVegQ3K/nQ5S5at9cOggCH9iXmqXQJvoX+/KTOiQwW2wpW0zQhiuV 8bZMMeschrTL5A/4WPcprqVS5FEG2kA3jXvHUXkFv7yaH67dEESA7GjwOQx3YulscsPgcR4DE 3FzpqxmggZ4qPhM+xThuMYloCrMs3OMrLMy4ug== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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) DISAS_INSN(undef_mac) { - gen_exception(s, s->pc - 2, EXCP_LINEA); + gen_exception(s, s->insn_pc, EXCP_LINEA); } DISAS_INSN(undef_fpu) { - gen_exception(s, s->pc - 2, EXCP_LINEF); + gen_exception(s, s->insn_pc, EXCP_LINEF); } 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); } DISAS_INSN(mulw) @@ -2583,7 +2583,7 @@ DISAS_INSN(swap) DISAS_INSN(bkpt) { - gen_exception(s, s->pc - 2, EXCP_DEBUG); + gen_exception(s, s->insn_pc, EXCP_DEBUG); } DISAS_INSN(pea) @@ -2636,7 +2636,7 @@ DISAS_INSN(pulse) DISAS_INSN(illegal) { - gen_exception(s, s->pc - 2, EXCP_ILLEGAL); + gen_exception(s, s->insn_pc, EXCP_ILLEGAL); } /* ??? This should be atomic. */ @@ -2666,7 +2666,7 @@ DISAS_INSN(mull) 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; } @@ -4240,7 +4240,7 @@ DISAS_INSN(move_from_sr) TCGv sr; 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 = 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; if (IS_USER(s)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } @@ -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); } DISAS_INSN(movec) @@ -4313,7 +4313,7 @@ DISAS_INSN(movec) TCGv reg; if (IS_USER(s)) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } @@ -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) DISAS_INSN(wddata) { - gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); } DISAS_INSN(wdebug) @@ -4356,7 +4356,7 @@ DISAS_INSN(wdebug) M68kCPU *cpu = m68k_env_get_cpu(env); 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) DISAS_INSN(trap) { - gen_exception(s, s->pc - 2, EXCP_TRAP0 + (insn & 0xf)); + gen_exception(s, s->insn_pc, EXCP_TRAP0 + (insn & 0xf)); } static void gen_load_fcr(DisasContext *s, TCGv res, int reg) From patchwork Thu Jan 4 01:29:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855330 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBr6N5bZNz9s71 for ; Thu, 4 Jan 2018 12:38:20 +1100 (AEDT) Received: from localhost ([::1]:44738 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuU6-0006k0-PR for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:38:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLU-0000r8-5Z for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLQ-00077W-MJ for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:24 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:56185) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLQ-00076H-BE for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:20 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MY6Rk-1eSd012vNA-00Uura; Thu, 04 Jan 2018 02:29:17 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:01 +0100 Message-Id: <20180104012913.30763-6-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K0:Xz2CF3E0vR1MTpD2zk+xYjM8Pau0kEPbs5WmefzJwjBUTrNzYL6 YRwXO0B0zHvOJNPllsVfEiuip1PJ4ZNctbSi/BDkUvs2HFXvv2dsf5oUINfslnQjPJBqb/2 XfxXT21ybCz1WprdN1OXL2bUa2DGWe887BqXHG/F5151zkFKDJ13SFIdSPtwb3gF14Paouf IJalL+NqmQf+l91C8qqxQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:1d1bmKjyywY=:6y7CPc1B0mVkf55Lexnjw/ DQbmysFhDVOlc7MWo3+F6QokO43p6uNZWAbfGeubcGTJKu3sffq0PfQ6OqbNWto11P1LBlEH6 hRVV6T4TCVTpEkr15g/nxlEuO6s7jcsTIiohYUaP5cB658wXxLJ+8y5Kub074eVb5iS8ec2QE EpSS6RySCAL8PFjeW/HabIK5Ltgo/E/pkbekDHnmIqzoQTt2ROQx7jhfIayYJHMR1aOv7Im1H shK+OQt4PrfPxmJcd28YboZjUvPkx05+P6W2/g3ZZt8MYrzN2Th6BsPU4HJxdqlsJNOStJT71 XDLQc1I58XHJY64/Fx93Hhos2bxy8+QLOyGO5j2ra4jjW0X7hnw0ui5tT5PTtLJMXhDRoXO2+ jlbclF8ufj8cMu3XuDQw6kLLQgtKPV9KmyavCWova7tws6YC6yMzITpU1JiKYGx/67s5HE9eC z4v4+MGp0VbWKrXYAgbQDfgHSFcx30DYFJ6qTl1m4xZKHbaExyP2n48YTKI1cFPwXycR+ZB5I 8dIoL3gc4BSqx90pUDRJ0/AMEjdaMyVBNbvoN1yT4nvxKHio+2GsQY0gOt3Qxe3FcGCamO66P m2+EvoG+CgCorJxirWE9QoM8yG5GdCZvLrzme22faSqnLrZEnCLvrLsS8BQ6ujRf14kPBYrS3 KZxVPcPhgpCeXkN+VflpJGOwEYnTOU1GriCF0y86/5cF6d5RuPMVq+sfJZRs8aM6QghvaIgby P6Aamb7bqpF1HvRbF3ub309D2cOPHwDqtOOv3UeVaAPCze+BLN8WWuwnqYE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Display the interrupts/exceptions information in QEMU logs (-d int) Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé 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 #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); } +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 = 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 is_hw) vector = cs->exception_index << 2; + sr = env->sr | cpu_m68k_get_ccr(env); + if (qemu_loglevel_mask(CPU_LOG_INT)) { + static int count; + qemu_log("INT %6d: %s(%#x) pc=%08x sp=%08x sr=%04x\n", + ++count, m68k_exception_name(cs->exception_index), + vector, env->pc, env->aregs[7], sr); + } + fmt |= 0x40000000; fmt |= vector << 16; - fmt |= env->sr; - fmt |= cpu_m68k_get_ccr(env); + fmt |= sr; env->sr |= SR_S; if (is_hw) { From patchwork Thu Jan 4 01:29:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855328 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBr6K3TPNz9s7n for ; Thu, 4 Jan 2018 12:38:17 +1100 (AEDT) Received: from localhost ([::1]:44734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuU3-0006gD-BM for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:38:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLS-0000pb-CB for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLQ-00077l-Sj for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:22 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:61974) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLQ-00076X-HS for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:20 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LylEN-1f0rgf11Sp-016Acn; Thu, 04 Jan 2018 02:29:18 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:02 +0100 Message-Id: <20180104012913.30763-7-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:rHfViRknitORc34suLDh6sInAkuiKc9GrUARdPIGU+YTfyF++vq UU7IxGbpFx7ZF6dy0EdvwA/x2Fvp1PuW9VkIcfYLsjIvrw38HsrAHJAT9Qff7sJQ8yga3Au YNbSG+TpeL9ppXXxSPlPe8OVZmn/9KwFWjYFmaeoSdz1wboylQpCbc3jqqF8MMBN61TS5jG 5TuhFFPIs3stfiaJ0kzWQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:/Y5ZH8Qm5w4=:CnP5COtxqMDctZwv1lflwb kuqzWV6+HzFP4XADydtt8u/vQZGCkZpAH8EuEoeaoxJpduqb2tk15ZL8TsLxqjVrPmQFDHbiv 9DdVwoSQbA51wDEIWBjWeH4Uhz44j+YXRUcXtm5Pzzr66rbYLzBCchQgM91XVlRDUPZ2IaQtC eBvr+2hOjiBeDCe3rIO/g2ig9gPhlleagYDBuAhWjBUIHAjZDt3po9p0Y4pa/ewyr7XfeqzNT nPo7MyiaGAtPYiky2hy0NgFWPVZ5198wNljo/9ebLBBITh3aZ1B+jQtbKNGccpUbis9AxvVTE E6enKwhnWKPZ8vX1cxdm9rkC6U0OPxHYIVV3H+n/FAzxwA1BI8HfiBbUsQPMEZxRL+Fkj+rMw H2kiywI0Av7V4C7ZZDTGnoiTXzhe/zXBFwunZv9wyQ7P259MClBPKNfqORZwe2SJ/647wwqmI xh7c7jtEEaZwOumrmkkxohwiAR9mpHJuZzlgmiG1yhsvo2FEzdvSdFImCwodSKksclEpAUpD5 fFyWHg+M7OXiKDXIFAWF32iG7auMDQGUgaCmXDlEckCU4jogUUTnSztM8UAETgthGAO3Q0WAo IKD4v/yrmDlA/xR4fMaMRgzMw0WvGK86rJM/W4O5mTORtRSysDZv3UNdwy602Y25sL+ukjygc kblGgAb9+rdMA4fNyt1g9nWxdOsl0hFy6/YJtPEGeBvJ5ibH8119Gj0unzxevUXlo2KMnlPRM ln9uCd3r9P5WueTzCmCHZmJtSrsGCfHDX51q3Q== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 *pinfo, 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); 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; } -void HELPER(set_sr)(CPUM68KState *env, uint32_t val) +void cpu_m68k_set_sr(CPUM68KState *env, uint32_t sr) { - env->sr = val & 0xffe0; - cpu_m68k_set_ccr(env, val); + env->sr = sr & 0xffe0; + cpu_m68k_set_ccr(env, sr); m68k_switch_sp(env); } +void HELPER(set_sr)(CPUM68KState *env, uint32_t val) +{ + cpu_m68k_set_sr(env, val); +} /* 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, MMUAccessType access_type, } } -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 |= (fmt >> 28) & 3; env->aregs[7] = sp + 8; - 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 = env->aregs[7]; +throwaway: + sr = cpu_lduw_kernel(env, sp); + sp += 2; + env->pc = cpu_ldl_kernel(env, sp); + sp += 4; + if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) { + /* all except 68000 */ + fmt = cpu_lduw_kernel(env, sp); + sp += 2; + switch (fmt >> 12) { + case 0: + break; + case 1: + env->aregs[7] = sp; + cpu_m68k_set_sr(env, sr); + goto throwaway; + case 2: + case 3: + sp += 4; + break; + case 4: + sp += 8; + break; + case 7: + sp += 52; + break; + } + } + env->aregs[7] = sp; + cpu_m68k_set_sr(env, sr); } static const char *m68k_exception_name(int index) @@ -173,7 +212,7 @@ static const char *m68k_exception_name(int index) return "Unassigned"; } -static void do_interrupt_all(CPUM68KState *env, int is_hw) +static void cf_interrupt_all(CPUM68KState *env, int is_hw) { CPUState *cs = 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 is_hw) env->pc = cpu_ldl_kernel(env, env->vbr + vector); } +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 = CPU(m68k_env_get_cpu(env)); + switch (format) { + case 4: + *sp -= 4; + cpu_stl_kernel(env, *sp, env->pc); + *sp -= 4; + cpu_stl_kernel(env, *sp, addr); + break; + case 3: + case 2: + *sp -= 4; + cpu_stl_kernel(env, *sp, addr); + break; + } + *sp -= 2; + cpu_stw_kernel(env, *sp, (format << 12) + (cs->exception_index << 2)); + *sp -= 4; + cpu_stl_kernel(env, *sp, retaddr); + *sp -= 2; + cpu_stw_kernel(env, *sp, sr); +} + +static void m68k_interrupt_all(CPUM68KState *env, int is_hw) +{ + CPUState *cs = CPU(m68k_env_get_cpu(env)); + uint32_t sp; + uint32_t retaddr; + uint32_t vector; + uint16_t sr, oldsr; + + retaddr = 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 += 2; + break; + } + } + + vector = cs->exception_index << 2; + + sr = env->sr | cpu_m68k_get_ccr(env); + if (qemu_loglevel_mask(CPU_LOG_INT)) { + static int count; + qemu_log("INT %6d: %s(%#x) pc=%08x sp=%08x sr=%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 = sr; + /* "set the mode to supervisor" */ + sr |= SR_S; + /* "suppress tracing" */ + sr &= ~SR_T; + /* "sets the processor interrupt mask" */ + if (is_hw) { + sr |= (env->sr & ~SR_I) | (env->pending_level << SR_I_SHIFT); + } + cpu_m68k_set_sr(env, sr); + sp = env->aregs[7]; + + sp &= ~1; + if (cs->exception_index == EXCP_ADDRESS) { + do_stack_frame(env, &sp, 2, oldsr, 0, retaddr); + } else if (cs->exception_index == EXCP_ILLEGAL || + cs->exception_index == EXCP_DIV0 || + cs->exception_index == EXCP_CHK || + cs->exception_index == EXCP_TRAPCC || + cs->exception_index == 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 >= EXCP_SPURIOUS && + cs->exception_index <= EXCP_INT_LEVEL_7) { + do_stack_frame(env, &sp, 0, oldsr, 0, retaddr); + oldsr = sr; + env->aregs[7] = sp; + cpu_m68k_set_sr(env, sr &= ~SR_M); + sp = 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] = sp; + /* Jump to vector. */ + env->pc = 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 = M68K_CPU(cs); From patchwork Thu Jan 4 01:29:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBrBn2QStz9s7n for ; Thu, 4 Jan 2018 12:42:09 +1100 (AEDT) Received: from localhost ([::1]:44785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuXn-0001KL-Bx for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:42:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLT-0000q5-3f for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLR-00078O-FI for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:23 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:65127) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLR-000778-4C for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:21 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M7sQq-1esr543TEG-00vPuU; Thu, 04 Jan 2018 02:29:19 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:03 +0100 Message-Id: <20180104012913.30763-8-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:qnYVp/HxAkMlnzbAFMx0UshjLQ/WmsNVeCS147ex+AH12vT//yh WHF/TdyK0vwRmquFX1rHrae+h3SyvfDROBo7vC9hkA4vtW+3PtMvc/F6tStdzjINDL3CDB+ 8QMLRDlilwGLNLdey+1+7hu/uM8/nVA8gvCDKvPXwFsXqZ05/XkUeFQA6rafwXbkQqKkkg6 At0hUJjChuP29icrkbn5w== X-UI-Out-Filterresults: notjunk:1; V01:K0:4sUfuyoQOTs=:4oVHR/HhADH7A/faq3/y7j oo1naIYvgB/Gn57M54A6n6Xu6prjAO343PXhXk8wA7B+giSnRm+uBplixDU8ZDu2mkh0m8T0F L6he8lAtwsXpcy0sAmDN3VuhzvAWc4Mqs6luB3pxozuycD4+iXo8/y1U2SMhIxs43NysnWu6e 3NDlPWVk4TtHE9qBmlfQxaka5v7Kk19E6cyzQnqqhWvBfxDR173SdmYoI6D5SjT5zMB6RYShA 4OwncU2V356rFOTQGUIUMyAOyWDV9LLUTf/UKuyqOQveHh4K95LIX4tHhD793U46ByIthBPjj xr9Qe0tjAtL6sHFHJ3K4hQNt+9Qz4AyTx9i4HhLwIbSiyZOvE6WBiTEJ8WfaGTeGA4WpzECm4 7+1mhYbMbG4FaRfdtwj3gQWSBXVVkXnMHoQ6c9Q9LyDMsBS1EzE1SCxCJQBt1xeF5O3XyOVW/ w86ol34gJWHjqVDH2459xrhOS5tIyS6gMMl6/MnblKjnDbTWKwCar1LMqcIX8Yt0qCEYQc3iT Skgj3/BiFyRnupOeRsPCxwuA4BhEbALlsJ+lZEOhIqpdgScmjtz7SNRVrMv/diWPxkmnRN/6f hFBcYqx5QMQpHNeInu4Weu11T417i1s4fCmvChiDUtqGkloJNFWdMmkzHeffLGEePtd4qhDEn uGE/ZwR2PaqiF5DJMmrcndA9AC/9Ox3AO7CzVJMixltrFFPxpgGyX524fnkM2BkDQMAseIZDf +Hz4MSlHueruukBpfbgPShDosRStZ+NVyQjjIQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Richard Henderson --- Notes: v7: chk: always update C and N flags add some comments move flush_flags() from the helper to the code generator, because otherwise we need to do an update_cc_op() before calling the helper to be sure env->cc_op and s->cc_op are synchronized 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 | 61 +++++++++++++++++++++++++++++++++++++++ target/m68k/translate.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 150 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 = env->pc; queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); break; + case EXCP_CHK: + info.si_signo = TARGET_SIGFPE; + info.si_errno = 0; + info.si_code = TARGET_FPE_INTOVF; + info._sifields._sigfault._addr = env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; case EXCP_DIV0: info.si_signo = TARGET_SIGFPE; info.si_errno = 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); } 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, }; 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, i32, 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..06144d436d 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -947,3 +947,64 @@ 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) +{ + /* From the specs: + * X: Not affected, C,V,Z: Undefined, + * N: Set if val < 0; cleared if val > ub, undefined otherwise + * We implement here values found from a real MC68040: + * X,V,Z: Not affected + * N: Set if val < 0; cleared if val >= 0 + * C: if 0 <= ub: set if val < 0 or val > ub, cleared otherwise + * if 0 > ub: set if val > ub and val < 0, cleared otherwise + */ + env->cc_n = val; + env->cc_c = 0 <= ub ? val < 0 || val > ub : val > ub && val < 0; + + if (val < 0 || val > ub) { + CPUState *cs = CPU(m68k_env_get_cpu(env)); + + /* Recover PC and CC_OP for the beginning of the insn. */ + cpu_restore_state(cs, GETPC()); + + /* flags have been modified by gen_flush_flags() */ + env->cc_op = CC_OP_FLAGS; + /* Adjust PC to end of the insn. */ + env->pc += 2; + + cs->exception_index = EXCP_CHK; + cpu_loop_exit(cs); + } +} + +void HELPER(chk2)(CPUM68KState *env, int32_t val, int32_t lb, int32_t ub) +{ + /* From the specs: + * X: Not affected, N,V: Undefined, + * Z: Set if val is equal to lb or ub + * V: Set if val < lb or val > ub, cleared otherwise + * We implement here values found from a real MC68040: + * X,N,V: Not affected + * Z: Set if val is equal to lb or ub + * C: if lb <= ub: set if val < lb or val > ub, cleared otherwise + * if lb > ub: set if val > ub and val < lb, cleared otherwise + */ + env->cc_z = val != lb && val != ub; + env->cc_c = lb <= ub ? val < lb || val > ub : val > ub && val < lb; + + if (env->cc_c) { + CPUState *cs = CPU(m68k_env_get_cpu(env)); + + /* Recover PC and CC_OP for the beginning of the insn. */ + cpu_restore_state(cs, GETPC()); + + /* flags have been modified by gen_flush_flags() */ + env->cc_op = CC_OP_FLAGS; + /* Adjust PC to end of the insn. */ + env->pc += 4; + + cs->exception_index = EXCP_CHK; + cpu_loop_exit(cs); + } +} diff --git a/target/m68k/translate.c b/target/m68k/translate.c index a1e424e3db..7f52065375 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4203,6 +4203,80 @@ DISAS_INSN(ff1) gen_helper_ff1(reg, reg); } +DISAS_INSN(chk) +{ + TCGv src, reg; + int opsize; + + switch ((insn >> 7) & 3) { + case 3: + opsize = OS_WORD; + break; + case 2: + if (m68k_feature(env, M68K_FEATURE_CHK2)) { + opsize = OS_LONG; + break; + } + /* fallthru */ + default: + gen_exception(s, s->insn_pc, EXCP_ILLEGAL); + return; + } + SRC_EA(env, src, opsize, 1, NULL); + reg = gen_extend(DREG(insn, 9), opsize, 1); + + gen_flush_flags(s); + 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 = OS_BYTE; + break; + case 1: + opsize = OS_WORD; + break; + case 2: + opsize = OS_LONG; + break; + default: + gen_exception(s, s->insn_pc, EXCP_ILLEGAL); + return; + } + + ext = read_im16(env, s); + if ((ext & 0x0800) == 0) { + gen_exception(s, s->insn_pc, EXCP_ILLEGAL); + return; + } + + addr1 = gen_lea(env, s, insn, OS_UNSIZED); + addr2 = tcg_temp_new(); + tcg_gen_addi_i32(addr2, addr1, opsize_bytes(opsize)); + + bound1 = gen_load(s, opsize, addr1, 1); + tcg_temp_free(addr1); + bound2 = gen_load(s, opsize, addr2, 1); + tcg_temp_free(addr2); + + reg = tcg_temp_new(); + if (ext & 0x8000) { + tcg_gen_mov_i32(reg, AREG(ext, 12)); + } else { + gen_ext(reg, DREG(ext, 12), opsize, 1); + } + + gen_flush_flags(s); + gen_helper_chk2(cpu_env, reg, bound1, bound2); + tcg_temp_free(reg); +} + static TCGv gen_get_sr(DisasContext *s) { TCGv ccr; @@ -5306,7 +5380,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 +5413,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); From patchwork Thu Jan 4 01:29:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855331 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBrBj08Gnz9s81 for ; Thu, 4 Jan 2018 12:42:05 +1100 (AEDT) Received: from localhost ([::1]:44763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuXj-0001GK-4F for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:42:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLV-0000te-FX for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLS-00079n-8r for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:25 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:64775) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLR-000780-U3 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:22 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M7av1-1es2001p0J-00xKv7; Thu, 04 Jan 2018 02:29:19 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:04 +0100 Message-Id: <20180104012913.30763-9-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:uUGM3+OwUFTozoCsHMq6d8fFZnLqc7TkBKPfVyRYxApstI915lX j2YLLCXwO/qqEg/gJFBsGdl24HB7u2dV71ZA6qBUG9y7d+q7ybDNWjZ2UivOA9ECc5Bfvqj DsT+YQ+MnaAcjojSjkkBtSuVAF2tgT9/lonl/nKOX5kZuQ58/kCx1orckiJCHGIV8deYJ2f Ue2ICcpFwkoXxA9j+Gtcw== X-UI-Out-Filterresults: notjunk:1; V01:K0:Y9QZajjT7BI=:1IBOlAYTWjIwWNUY24WGsa yUMhyqMMYyOagr9kYk9zjABPa89dFVav2PXGOi5ylJnx09qOLOG8RenCQT9lyxQavfKXVTElp 4PmkAEM8rT55cUBluwtN9V0Tr/RVlzu8rpfw3q6M4BAVbr7ZWvZtd78E4mr70vytit1Rt6CpH NYKTTjnGW2rWkNaX35kvNegOx+xRZUj0/tvmE876OgwNG18N98SVD9EVnhm1kCnja4oQo1vhM 25hQDdFCF5cDttLGCI5nmpcPboawkRpzdxJWd5AFZ25w1r1RAFfOhjBcFCKgb0YZPOd/7aAEG kve3ayEMyBpBstM8FWRQmyH9seNRFMIpbyri/ys4caoSTD9hcvgRajEyQhWN1+ut85hsykTZc sqvcsuBgsmSj59AVI9CEeJKYMskhGuwh3Oy3iHHjGkQHwsy9ioFCVcGSx/Xx+/dZNQWJ93d5b 0MiPDXHI5qQ5qWEftyjSeHATdBZMd2EkRjZ8f1pbQHMSdl6aaHTNggdjQnTMVvfp0rfoEmY1k 8Ns/Wk0eUGSwdtr6nDcPF0/F/gEfKxSgfkh0+wQTAPY4XPM/UFFUvIlTrmpUnAo+2yPtQoknY vvZ9lE3gFZL5T8AGUGpqt7dj1b54vS03yC+BuvuHAtdgNYYlWEhANahX1iAMN3DFoU6b42Q0P gGgU28xBgnFqExss6cMQy01lC45VuKh7NetLXxOCbVbts9Lu9t3fJbRYXzJu8q9Hkbf5XHrjr +i4Wsf81raKIJDi9dxNrc8r4B8/zi8GSu7FBfw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 = M68K_CPU(obj); + CPUM68KState *env = &cpu->env; + + m68020_cpu_initfn(obj); + m68k_set_feature(env, M68K_FEATURE_M68040); +} 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 */ }; static inline int m68k_feature(CPUM68KState *env, int feature) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 7f52065375..0ef933a545 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4277,6 +4277,76 @@ DISAS_INSN(chk2) tcg_temp_free(reg); } +static void m68k_copy_line(TCGv dst, TCGv src, int index) +{ + TCGv addr; + TCGv_i64 t0, t1; + + addr = tcg_temp_new(); + + t0 = tcg_temp_new_i64(); + t1 = 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 = IS_USER(s); + TCGv tmp; + uint16_t ext; + + ext = read_im16(env, s); + if ((ext & (1 << 15)) == 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 = 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 = IS_USER(s); + TCGv reg, addr; + + reg = AREG(insn, 0); + addr = 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) == 0) { + /* (Ay)+ */ + tcg_gen_addi_i32(reg, reg, 16); + } +} + static TCGv gen_get_sr(DisasContext *s) { TCGv ccr; @@ -5578,6 +5648,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 From patchwork Thu Jan 4 01:29:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855321 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBqxM0syxz9s7s for ; Thu, 4 Jan 2018 12:30:31 +1100 (AEDT) Received: from localhost ([::1]:44665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuMX-0000v0-5Y for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:30:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLT-0000qS-Hi for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLS-0007A9-I2 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:23 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:64521) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLS-00078D-69 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:22 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MbgoP-1eE0Pi3wtZ-00J4UZ; Thu, 04 Jan 2018 02:29:20 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:05 +0100 Message-Id: <20180104012913.30763-10-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:1R1hbiTWzRCs7Chbs9Ajtc99WAbDbHWflRjK2Tf4jCcTAWBcs7U acjJ8X38e8EG1exOR0+haRbrQaAYGwYOC+wSP7Al88jjVDUBzq+FvjlmDiltKOdeAZ+xJCP SmRCW5IZKDLHFC1UNuyKNxw4rd7UivFY801mQb8ycS1gGSPbhuaqAuP4KJHLDM/JtoGHbYM AQr494dV5RSH65tM3dipg== X-UI-Out-Filterresults: notjunk:1; V01:K0:mM2tGbukLMI=:RRqVLP8pqitG8mYpnYxiJk WR4empSImAMsZTHhW/Wq3GV+G+Z5eFL8nXEJofWuYxAhCVMgeSoqs2XyCTuoLVIjtOq5IbYre wQPouAKnBnbt6Z7xuub3W2mGWEeOyerZn7RGNfz8DW0dvnctZRbxR2U02+i6K2q9mkRLwYsgf tVobGy1KEuKszQE1N5p9fuxNl8C6z0sipPqCZBe5VU0Ff9RxUG6igt73BAKEav4Kc3X2hw6Nq nH9anFnqLb3o0N334oahTSU3OE1yYYx7AFt6xYnrx3wAlXXScARdo3r2CZdS9IndJ81IDK6qC Zc3DTK9QBtDey/DbZnDMuYYuxisqUkWsvTfBB1WwIfuLA8jyJwQX5dGkGrPoPIlb++kOhe96L c6QAIgA15gLpYPSTI3QGZxZVVe1hbL5DPzaSDM2sTu8RtzWG1vtf8Gwl8/xy1Z35oWn/ybHgc dEFLorvJC70akbBp03Kda0nmCRJmrHgW0+GwUbi4SgvC9m9zg30G5fNnsuMoQ8tJm3xThYt+T YEcgL360sgtGlp6lrtVvTS77XiEW/6rHn2wJWtOqwVSWO2/YTI19GZStz/P9pJTP4GExTHmO1 Uz+XY7OuDv8c/2/rPzd2V+k0zBQP83RsWAJKtrhVsM0grla90iYn4iQyDJWrdYm2mhlx9mUjm +6ofN6sro3eiCUrB21/UKAN4aCCWPloovucDigmM8NazCnF6117yy/7inllZnI1oT/Z/dp9l3 XO01GgsSoTLln+Jmyl5EqIMXSYyyK1ais2aEpw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 0ef933a545..f77005215f 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4391,6 +4391,7 @@ DISAS_INSN(move_from_sr) DEST_EA(env, insn, OS_WORD, sr, NULL); } +#if defined(CONFIG_SOFTMMU) DISAS_INSN(move_to_sr) { if (IS_USER(s)) { @@ -4423,6 +4424,11 @@ DISAS_INSN(move_to_usp) DISAS_INSN(halt) { + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + gen_exception(s, s->pc, EXCP_HALT_INSN); } @@ -4506,6 +4512,7 @@ DISAS_INSN(wdebug) /* TODO: Implement wdebug. */ cpu_abort(CPU(cpu), "WDEBUG not implemented"); } +#endif DISAS_INSN(trap) { @@ -5063,10 +5070,16 @@ DISAS_INSN(fscc) tcg_temp_free(tmp); } +#if defined(CONFIG_SOFTMMU) DISAS_INSN(frestore) { M68kCPU *cpu = m68k_env_get_cpu(env); + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + /* TODO: Implement frestore. */ cpu_abort(CPU(cpu), "FRESTORE not implemented"); } @@ -5075,9 +5088,15 @@ DISAS_INSN(fsave) { M68kCPU *cpu = m68k_env_get_cpu(env); + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + /* TODO: Implement fsave. */ cpu_abort(CPU(cpu), "FSAVE not implemented"); } +#endif static inline TCGv gen_mac_extract_word(DisasContext *s, TCGv val, int upper) { @@ -5502,7 +5521,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); @@ -5517,7 +5538,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); @@ -5528,14 +5551,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); @@ -5639,19 +5664,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 } From patchwork Thu Jan 4 01:29:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855326 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBr25417Wz9s1h for ; Thu, 4 Jan 2018 12:34:37 +1100 (AEDT) Received: from localhost ([::1]:44720 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuQV-00043L-LX for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:34:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLU-0000rG-8E for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLT-0007AZ-1n for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:24 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:62191) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLS-00079F-Oo for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:22 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MDxhX-1eh8wR1tUd-00HMJx; Thu, 04 Jan 2018 02:29:20 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:06 +0100 Message-Id: <20180104012913.30763-11-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:oEW6eAWACkVN3mGVcRe+Z1b+BBocTWmqSVLu8j0XJ0HB8dLNc5+ ktZTWqlxocY9AmvNmi0GExIHf2qE2fT4Zxg121/J/r668enxP5t4vcWPepN0IxX1jWDdTey Vjw2kAjPz8UHpqNsK/rn36krcBszZuDfWsQTdwcdwICs5lmV9rjsIxsgzWq/F8Jz3uXfdKd kCS3iCH+OsMz3Gv7vTwRg== X-UI-Out-Filterresults: notjunk:1; V01:K0:5UyYkOBw5V4=:Ti8TrORO7cvA6W/bsbikKE o5xYxYwBrIzHwP3KOlkh7LbF0xm0WqumTkcWTTahKq4IVzJzwLVdZ3j/NhFpHZoOIXru5Bf9T gAaRiftMut1Klxd+WB00rLQoXA967pfAlKM9i95ynPEdzeh7MJN4f41fIvtC08WVjtoaSTdSl LkmVvqFrrqDDuCbXxODQMdiEegcW50NQVj6/BArSw2ZSW4GKQVFJZ99GGxZLEaoCfc87u5Fz1 D0weLTghKpWVvf32Y7hzgNLkUjnmtEaSECZyzEe4dZWxusX6g5Z40v+MmiLPYTVi0Y7XrOCgT gFZiVsW5l2iultCLuItCxwTosi3WCgwAKC6xmfuzxm2vnAVYy1Gi5jjCaAsfyeylnnHL6YmZ9 Mp5JO9eKPuyMJTnp8NHKi5gQ3B0QrM1BvSK8qfmrNFoY0aVdUWOapG6ITGKAp731VvELUmwF6 AWcEzmkK73nA8YEOVuIok0B9LY6dxCDwlAwlnpar62KWLF0H3Cxm5j18KfYAfUfM2u+7MilrU 6MeuZIK4z3rNJJN1EByZdQ0nYzxJvIt8/tch5RhvT3COEZ3WvTj2Q2VwPQ4SlLmQjxMdvs/nR MHFSmdWvpFf29BVd8UUosg55ToEOLtjwVspF542tNqukccXaTGP5M9mS7aqvcoNgPZ78fx5J2 pJQXCTfJSl9Zdyrga54clb5q220MsXT7UdovHBtWjhDf6QDSW11nYlGkvqcFczr34KK5NL7+c 7mo8hm4M/eDjHqH/eonaGXbmALytY2+Pa15TAA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 f77005215f..98efe6b976 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4496,6 +4496,24 @@ DISAS_INSN(cpushl) /* Cache push/invalidate. Implement as no-op. */ } +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); @@ -5674,6 +5692,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 From patchwork Thu Jan 4 01:29:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBr6L2ZT1z9s71 for ; Thu, 4 Jan 2018 12:38:18 +1100 (AEDT) Received: from localhost ([::1]:44737 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuU4-0006hv-5I for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:38:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLU-0000rb-Fn for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLT-0007B0-Eu for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:24 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:50994) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLT-00079v-4m for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:23 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MWzzA-1eRX40406W-00W0nG; Thu, 04 Jan 2018 02:29:21 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:07 +0100 Message-Id: <20180104012913.30763-12-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:nspQf/my5Mp3HAAXuSiRpSUQCmF0Ma6q+QxLlH6B3gApF351hzI rHJWx4PX/l3yCtUxLhrBkdlSpXwi09wcl4fjxWMmWCOk6p9oJ8KZrbmJOMalLJiyQ76xsLh MM0keQkh7P1VTWobt429QjUAAOzxcXcZla/z9B143+QJpBfah9YTF7pboSXRt2773stOJtn M3v6QlmLhwJHtun5+gM+Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:w+eUwvXFPRc=:38STJoaSNaYM0iqDQd3JC2 tMHIF/C6l/1GKqwIcV+r05RKNPX5V1Z9aTwWyNILAs4+CER8o3CQ8WFEkDPNuBqcVrnJtrM2A Exb1NFlKbyYVahTN+TmYMqByWiuVXRNnl23I5XSJ9RX9eTfVPnWbzpMLhuZyku5c67D/r/Fak V0aE3YpLSOgEqpSIlO7du6tIMheGpi3RSJ32+CS9ADImsVgqIefEWybMfN7u9+gRjmkcZfcqe t1QRKwHN4lN6VaXNwB3B8JgAdNQtmsEY4Jp71Eb7ElAaPkPVzZsOqya7uOEiK3fxqYqqAyIzk iZNxl3dFpgOejnX2FtPyzbDQnsRp+zHDLAe0BHHPs9C165/0rretgomwwBYoWpR0yf6/dE5Ni v/i88i9QOrM0GEp0IYNn2WfDKJdqzkbImwKRW2wg2/mV3ZaT3DAGxhSX9Q+GEtCfYoos2/2Xe 5O4OF8SyE84GeLgmFmJxHvMc6854B97eaaocD10EOZjTBp92kpaOCHZqFG7YjtBK5ZaY3eY3m k5399LBvi9pT3+M1B3q5/Fekn26FQOdzoMDUxnX3rj4TRujn2j3idZmgmdpkkqvE1xVA2pEZF 2KGFicrIjPXMyYmg2iiKaqZ/FW9EMuh10BdJiD8BYoohd+k7YMurEdLNo8bwsyO7XCKJ3OYC5 25g/L+I3InxSI2aLSKCGDbardR0h7BDqkb37yhBj421pak93AOf3+Vp7JxC2tE3SoNuQtSU+s T/mb1fG/nzmiC0AtfGLys6x1zH6LvTgdp6sbSg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 |= (uint64_t)(val & 0xffff0000) << 16; env->macc[acc + 1] = 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, i32, s32, i32) 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 98efe6b976..e8f7d07f3f 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -2762,6 +2762,18 @@ DISAS_INSN(unlk) tcg_temp_free(src); } +#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) { } @@ -5572,6 +5584,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); From patchwork Thu Jan 4 01:29:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855325 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBr234C2lz9s1h for ; Thu, 4 Jan 2018 12:34:35 +1100 (AEDT) Received: from localhost ([::1]:44716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuQT-00040t-EX for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:34:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLV-0000tK-An for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLU-0007Bi-9v for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:25 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:51824) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLT-0007AQ-Lx for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:24 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Lzai2-1f2Ej51sfq-014nZw; Thu, 04 Jan 2018 02:29:21 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:08 +0100 Message-Id: <20180104012913.30763-13-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:yTN6uV86Rdcz+TZNhWkUGBVXCPj30ntekYsTv/sr7Jq7/Tpj7aN V6vS0N31ehmw/emDkGZA2xl5X1/6QIBqZCdZkxkwk2A/w/uBOukNPGm3RZ+De2xRnX295qp zyvehv5WdYchgucjKfOdTvlStIvbj+ix8wRzdqm0CRU3MZbp2xqy1F9wjQbRnfzlsgweXKA kY+RzqmRgzwa/C3P7n0UA== X-UI-Out-Filterresults: notjunk:1; V01:K0:JeLN2zl5vxg=:StGpvz8xnwMOmpSVkwu0O2 FgMAeaaJfmP/FY8Gix6gn8xSYFGTNuFDt8cvA6OxvcCcfochKcMZVCeXujPrj/QVBGIwGSHMC IO9sBXGTRSN959ok2v/hC4z2wJHbXFqlxyV7SRB8Fhi6ibTHGk1shSx2edfgTyTPMsS69EV7u 2nwE3aa3eOZlq+ji65pkHXrFjfiWSDAqgnHG44EWmzWYH9p7egbZ5F2ldIbZbABDwPiqLGNHV i1trwm+pSaS0tSQnA0P2Ip7QA11qvKgG70eKhLNhFUBCm7/hMMWxLpv1OVK/sSB1zRZ6nHbpb 0AY1aCQi5iHvs0UNjtas+s7pX5MFi1f44W0Vp9QadAywGRy3oe4wLUjHsIyWxtGeaTNPTwRD2 86ozr+c/a74GLl02lzmddcaQxkicF9jZzCNhZsRwsTj2GQNUwESKpU3aYCeoww2ZxYDOLPr/2 YrUP3JcFJWLcaf/EwpafFodObRx4Aor60zBLlDB1x3gJq0Ks3KNIeN7HazBjCWeM6ePyErB3Q C2V1d1gxeIAjNWAEGr8VrHA3T6CxS9alDTzRdo9vQpkW/ZMaApM2Ak1bTM3wpyqs67A73Jba9 GyEeDNDzE6PzjGFIc4oAPjVH6WdtrXPelU4qy3f4XzFWElDjDSGshvMSMs4nnoYndQ/3VBRF9 zI+DEmGwmMokDJM2AbjqdEA6XDQ8frtMZV0TDshFNVmIHTubKIxBbVT6c/oKMaDO51WG9n2WX TO+tgFKQafBrNJKRR7Aoh+Nw8+GtlWBpeq4vAA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 e8f7d07f3f..b8ed85c237 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5103,28 +5103,35 @@ DISAS_INSN(fscc) #if defined(CONFIG_SOFTMMU) DISAS_INSN(frestore) { - M68kCPU *cpu = m68k_env_get_cpu(env); + TCGv addr; 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); + } } DISAS_INSN(fsave) { - M68kCPU *cpu = m68k_env_get_cpu(env); - if (IS_USER(s)) { gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); return; } - /* TODO: Implement fsave. */ - cpu_abort(CPU(cpu), "FSAVE not implemented"); + if (m68k_feature(s->env, M68K_FEATURE_M68040)) { + /* always write IDLE */ + TCGv idle = tcg_const_i32(0x41000000); + DEST_EA(env, insn, OS_LONG, idle, NULL); + tcg_temp_free(idle); + } else { + disas_undef(env, s, insn); + } } #endif From patchwork Thu Jan 4 01:29:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBr6J5ZVlz9s71 for ; Thu, 4 Jan 2018 12:38:15 +1100 (AEDT) Received: from localhost ([::1]:44735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuU0-0006gE-2J for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:38:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLV-0000ts-LG for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLU-0007Bv-GR for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:25 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:56562) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLU-0007Ar-4S for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:24 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Lbr40-1fDhsD3x3M-00jIQI; Thu, 04 Jan 2018 02:29:22 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:09 +0100 Message-Id: <20180104012913.30763-14-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:zfI/AxSTD69XmgC1YAkYTvxl2EislXqfm/sbTUIoOsKsPlOPSSH 0n2ET7jVlcodkuOqpra+bNjZaspTgs4Rsjo00x5k7EuQbOdrdmw9Sjd2ko2eIreK5KPuhid 4DZbj0gTC6IDlie/iXra2aHktLkAHaS3eo1qZRg+gcMxV6iArxXR4h2LBtXXVP8/EF3hoYk gok3l5Dl/XJQwcjOskD4Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:wxg3z4CTqNg=:kMDOSH+QVvWsn0xMa/78/b +KbYRPTGbxf1LDpkwkyHXzx7PUzw7BsyNOEuvxNytcux1SdL60BwpXupdAYh7J6yOY1zmuVVJ TlT2iwryM/hEBpYIzkfXR5icNzpB8IZO73SSdCrShIedmh2CdysUDLUyj/xtlxS8DZ6Xpq/N3 Fm6/TRQaLvOk0inLy35s8h2/wfkdn3hCj1+q6hTvhmFAHnPYyQl4K8vSf0Z9Bv62iI8ah5+3B G/6kywqee0hmQJWicy6Pktdlzb1Put3RZr7joeogHYkeEteVoZ4/Vf6lLhba6pKdSpaDvmkAc pF1Vl64rFN0hFhiwyIG5S/A3FalqGFr6Z0tTm/ddSnGENMLT54XsiI83/xfoFxKt5SxAPhntI U6qoEey72gW1XrcrSkx4dQIOcxVfEjLsg/rdu1+MVlC8QJlZUttyYkoPr2dphlBRseQMSF1We YWU09ewCfqRHxP9UrCz2yDEUshNmTs62AV6CcEJ1BD+G+ORblOtHJ7aybBTE1UFwGWL/twA82 Nk+TXfdEQ2BotBMagcOjR54pqDDpDf8cFDLwdLYN0a8xAlBLlNQa8VguiOvi2bWiKb3xsQDm6 76h8nZSO1wG3eXg1Aul1NnKVUBQlCfHqwNb9iVv0LhqqGz2ZyAHldNJ6flWqmGj2SY+8C4Fr+ qe2zz9mkMzUVfvgpc6P1Zwk5o7UjQbHJtzqEkqcObZw75XJCQ545/KSySIXlUktMuIKHsiK55 rf3BuYHpTcBa9/euirc7/T4J2oWj7NMzA2XyVQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 b8ed85c237..1f867a4f7a 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -2131,6 +2131,61 @@ DISAS_INSN(bitop_im) } } +static TCGv gen_get_ccr(DisasContext *s) +{ + TCGv dest; + + update_cc_op(s); + dest = tcg_temp_new(); + gen_helper_get_ccr(dest, cpu_env); + return dest; +} + +static TCGv gen_get_sr(DisasContext *s) +{ + TCGv ccr; + TCGv sr; + + ccr = gen_get_ccr(s); + sr = 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) == 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) == 0x3c) { + uint16_t val; + val = 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); } -static TCGv gen_get_ccr(DisasContext *s) -{ - TCGv dest; - - update_cc_op(s); - dest = 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); } -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) == 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) == 0x3c) { - uint16_t val; - val = 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); @@ -4359,18 +4370,6 @@ DISAS_INSN(move16_mem) } } -static TCGv gen_get_sr(DisasContext *s) -{ - TCGv ccr; - TCGv sr; - - ccr = gen_get_ccr(s); - sr = 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; From patchwork Thu Jan 4 01:29:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855335 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBrGH4bl2z9s7n for ; Thu, 4 Jan 2018 12:45:11 +1100 (AEDT) Received: from localhost ([::1]:44852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuaj-0003lh-M9 for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:45:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLW-0000vH-TP for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLV-0007EA-Ri for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:26 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:58657) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLV-0007CO-HF for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:25 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Lp6ay-1f9I1u1tFU-00eqQo; Thu, 04 Jan 2018 02:29:22 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:10 +0100 Message-Id: <20180104012913.30763-15-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:MLVAix6Uc/CN6rlK8HK8/wgMjXR8G+QKqLRKVpjXswpli/a1VbG Iru3Ym4U2/XlAyG4Z5tiR3YHugLqLraajHnvksJ1U70R1rZpGi83KlB43NjmmA+Qpx5I1r5 PtYYhPQFeqgRA1rrgsuKMTQ+vcN39HFHmYY5heyxQqf4BFgxyur5T5DFMcPma+knNWgobJ/ 3yt+aGm67XhXLGJ16ZBZA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Cil3UMzkAzw=:8UpKPO3rhdIWFg8KCr9M0x TbjxOQsduFrFmoEN2xEPPK8FDC3MF8RVYLIXQX2y40YXk25OO8mEpTXdNnoS+1E83KRgvtgz5 SGGn5OZZQ09tg+obxv0HoSHNsur9PmaKxNacJo6K6idqe6IpaaNPm4uciYwDettfhl1ErRp9T tZ31HqkhcsY+unbSkmucXDw8o0Vzgtm68LNhKoYDu48Abti4Gmfan9fJyt6MMCvJ3/rDc5B/y AI19mUFOaoBekWnFyVXVhTFmGPy4ygt11dRiKY0lm6MlK16xZKniDeW6cAozaGFxm5gyUDicz 7H+bhGwgalvZ4h9Wh9LeUAM83DHXcN2gFZjgAiCg1LABbgoPFoEyE880YzlwmIG14TrYNUXun 15XacXPICKCBqhIOeBIkiZTGt+cWYYW/FtJR4Wkk7HMA5HS3cjmNdSG0QvoMmWBWR1GrA1MHb 5j387YQ8od4gnkPZhdwcXhBAn3xqlGKjU8b0F1WeXtCsIT5XQhQdbUF53r42X3bSk/VntHcrg TFRMqwdGMeFxa3rllUk2OhtMuo23CVVxHpmKbpiZZxHwy6QmGU+pQ7b2NXja76zqI/prMmXuf Dzm6bbCmmU1YaN+Ouun2nWpba3LXUojGE82ABGr+LDWYcGZkKCB+BQL4YBIcoTr7HWPGUkVeF K6LVCe6K4jTL8UXg08DldJOB/q3J/jv/+HsolGPbazeCIzoZxrfUbM1+JF+d+FbpUbpXVpdu7 TnPWo1oiv779K81f6EfIH4TzC93mmqUhXhPYcPCP1ellvLFOYY+/CoaRMS7uPHX4iyoXtzCfp msjJWfKj8kBG8vMEpZhHcl11VfDFmFmsQSa1H/d+R0icy2cRKfVtHlxen8rLo8CRDYNpEgFBD PiAvXqCKWdhkK3nsJgxGSdKogyNzcK8xiRW/eYKJviGsrNX2THT+rE6B4MomVM X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 1f867a4f7a..8f23cade04 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 = tcg_const_i32(val); + gen_helper_set_sr(cpu_env, sr); + tcg_temp_free(sr); } set_cc_op(s, CC_OP_FLAGS); } -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) == 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) == 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 insn, + bool ccr_only) +{ + if ((insn & 0x3f) == 0x3c) { uint16_t val; val = 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); } } @@ -2557,7 +2564,7 @@ DISAS_INSN(neg) DISAS_INSN(move_to_ccr) { - gen_set_sr(env, s, insn, 1); + gen_move_to_sr(env, s, insn, true); } DISAS_INSN(not) @@ -4409,7 +4416,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); } @@ -5556,9 +5563,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); From patchwork Thu Jan 4 01:29:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855337 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBrLb2YZJz9s72 for ; Thu, 4 Jan 2018 12:48:55 +1100 (AEDT) Received: from localhost ([::1]:44959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWueL-0006E5-C2 for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:48:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLX-0000vg-AG for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLW-0007Ea-9r for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:27 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:59349) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLV-0007D7-VP for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:26 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MF4A7-1eiErx421L-00GGOH; Thu, 04 Jan 2018 02:29:23 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:11 +0100 Message-Id: <20180104012913.30763-16-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:bY0Z27urLKDDnVBWmAclk1ycG5AQdcyMoVVjUckAwmSyT8VARg3 4OE040tN4JeDMRPjmVLa1VS7XaNstSelYk/9nR5/1SQRmOySwkaKM6yDFvT4ASj7RN5XVcS 4i7uu9m0xbG0F1ULPytL93z8LQcfv5/uXm6ImVlZQOlVsloTJkH3KOECArvuRbqwR0pvzZi MchCjbUAaGJW1ZcQMdp+Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:uqB/WKQeoAk=:9IfvZfAkch6j85+thQRiAV bdhKOApyfwMrivO7sThSL+hOIc9yl5z13yozJ25CumnkRv+QnFrmLYLZS4N0s9IhdLA3ivhT1 W0dloodTry0SUgWfPJkTsCz1/zGz1pc3etbys3/9I3QkDPLLeZfl0Ss+8IGxVyE1FXTJyfaCI 537bxPmWh3XSI5ZCJ3JIpD2HN9DfpTLnnB/OX/friH2CJrxcUaKHnt602yhoOroCIBdLzD1xM mCzjYUaXK2NvqA/PgoglxeY1IivJxo4fdnxGWkT+uULUR9mrhO5COM5istNIQiK/QjjBUYhzf USEmALygUUUZsLBiC3eS6eTAXaq6N/lQv4LC3pGjuIORiiMtkrf7QKpp3ACMztczP0lSVX3aT mPnOjVT00Jk8qxy1sFF4b8krIXSc8qqlYYsAlzJj/Tx5voUplobJs93GrZ4tVXYtM12RATyP/ MSBOTJ8rV5zdDUqDqM9qsmo5Hyin7qmsYy8AOwu4TPSI5Ol9YAgSBagmHK4KwcICz/ZOkfes8 Xo//bBsPumz0T2KMKeQPWo5RY4+9b15/2xqlkvLTtebK3f5TrIQaSymOmTaPV+0LefAvRXv5E GBT0KIFAPV144+jPUJjfUYb8fQ7iKSml06xvFEWVRe1XPH7OivQdcjtx+EhdMv5dnnbB2naPj l0R4HUrBYS5hoBamUKO0GRwMreMvFULV8of+xiFpzeubN/LuX+Jn9qzNYD2UDWUQW+HO23YYM 8Av1lXbYhesclS9BCIRoWkW2S/40D4QRSUPr8w== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 8f23cade04..499aaa2f3d 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 = ((insn & 0x3f) == 0x3c); op = (insn >> 9) & 7; opsize = insn_opsize(insn); @@ -2217,32 +2218,73 @@ DISAS_INSN(arith_im) default: abort(); } - SRC_EA(env, src1, opsize, 1, (op == 6) ? NULL : &addr); + + if (with_SR) { + /* SR/CCR can only be used with andi/eori/ori */ + if (op == 2 || op == 3 || op == 6) { + disas_undef(env, s, insn); + return; + } + switch (opsize) { + case OS_BYTE: + src1 = gen_get_ccr(s); + break; + case OS_WORD: + if (IS_USER(s)) { + gen_exception(s, s->insn_pc, EXCP_PRIVILEGE); + return; + } + src1 = gen_get_sr(s); + break; + case OS_LONG: + disas_undef(env, s, insn); + return; + } + } else { + SRC_EA(env, src1, opsize, 1, (op == 6) ? NULL : &addr); + } dest = 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 == 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 == 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 == 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 != 6) { - DEST_EA(env, insn, opsize, dest, &addr); - } tcg_temp_free(dest); } From patchwork Thu Jan 4 01:29:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBrG928K5z9s71 for ; Thu, 4 Jan 2018 12:45:04 +1100 (AEDT) Received: from localhost ([::1]:44848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuac-0003ie-Nd for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:45:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLY-0000wn-9j for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLW-0007Ek-Ci for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:28 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:50509) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLW-0007DE-2I for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:26 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MXXx0-1eS51p1vuA-00WYl2; Thu, 04 Jan 2018 02:29:23 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:12 +0100 Message-Id: <20180104012913.30763-17-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:GhnILsgt0+BlaVkJEQ+tzpWOvhB/DIAVEnpenhgD92kM3EiOI/+ EXjSuxiGFZvQJEskM5PRtQD763/uVPZoy6NzTdqN3vtVSPr1PuClf02kQ6fIrVOl9swV4Jx 1o6ZjhPZMslqNpzQrWkBq+DgbYye1HeAZ8yi3SLRkeNxOmrhkCbin/U14ngrOvGe1TIf7Iz JhKMAvyctAdGSEU/Ilk7g== X-UI-Out-Filterresults: notjunk:1; V01:K0:xKFUt/1bRkk=:MbBEyhUdk1667BfExrGkFh H5MwFhQIRyuwQhNFufF9B/UrEpXa/zNllQXf2QkypmXe7Uhd6iHOcp8foJqq72yWEJpQWienC 1G1GAdamECUSS8p9Y5/84nBDUKW4qJe4YxBUc/KI2a7MKBKMkG34ATbLDpAljto0p35JcOTTD 8z1aGMTvCvULjSXoUspExhCJEWlFutt1aSlyKvV9QwaTvNLq9ZD0ct6d4sdHWRzjsyga+DyAt 1NdR567vjr/SyK2FMeW+gDhRmTcUF1KZnSdwXS4Fc+VeglAjyPAWzTOchFWyElPU+NPbktaEE ZcjZKZeoI4jyzmIdEQYDCHVFF5lMERDdPtWk0XrD+HXVnjLb30SduuPW+569x3THeSyqmaPRv 6AYEXGsSAHXPFizyad8g24fXajKwmXGd/xQ98D6EMfvGFTlnCpPpGO7qhf1RJsQBnyaMzODuc 8NmFAVRoOqGyxiD/IybI3EHPn+YVwb757X7VFIS54dzZDBbvO0bQnI/bgSOrV5ZFdDs98W98P GtBBmHqMHJ+b7k3eVMAtUICqS/2r9pPqttm4PfBY44LpCaT4Y8OLM2Iiz0dFVVow0hNf+Q5yX cjjTZLtodRf+LNjPObBD62ZlzRqc2cBLfDiBjIyK3hbckSWUW+fS5bQZT8NtDBo24bN/DZw7y uw4OvcYK46uUd28ApixaLQGkrmDp1I6NhLc/vRfPO0xBZb4CMPN6Ie0+F8Li1+k8PdQY5IZKj 6lbjbaG3ZN6QofdVfkMLviftFO8Mirhe3juzMw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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); memset(env, 0, offsetof(CPUM68KState, end_reset_fields)); -#if !defined(CONFIG_USER_ONLY) - env->sr = 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 = 0; i < 8; i++) { env->fregs[i].d = nan; } cpu_m68k_set_fpcr(env, 0); env->fpsr = 0; - cpu_m68k_set_ccr(env, 0); /* TODO: We should set PC from the interrupt vector. */ env->pc = 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 { /* 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]; /* Condition flags. */ uint32_t cc_op; @@ -223,6 +223,74 @@ typedef enum { #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 #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 *mem_buf, int n) } else { switch (n) { case 16: - env->sr = tmp; + cpu_m68k_set_sr(env, tmp); break; case 17: env->pc = 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. */ } -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 = m68k_env_get_cpu(env); switch (reg) { - case 0x02: /* CACR */ + case M68K_CR_CACR: env->cacr = 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 = val; break; /* TODO: Implement control registers. */ default: - cpu_abort(CPU(cpu), "Unimplemented control register write 0x%x = 0x%x\n", + cpu_abort(CPU(cpu), + "Unimplemented control register write 0x%x = 0x%x\n", reg, val); } } +void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val) +{ + M68kCPU *cpu = m68k_env_get_cpu(env); + + switch (reg) { + /* MC680[1234]0 */ + case M68K_CR_VBR: + env->vbr = val; + return; + /* MC680[234]0 */ + case M68K_CR_CACR: + env->cacr = val; + m68k_switch_sp(env); + return; + /* MC680[34]0 */ + case M68K_CR_USP: + env->sp[M68K_USP] = val; + return; + case M68K_CR_MSP: + env->sp[M68K_SSP] = val; + return; + case M68K_CR_ISP: + env->sp[M68K_ISP] = val; + return; + } + cpu_abort(CPU(cpu), "Unimplemented control register write 0x%x = 0x%x\n", + reg, val); +} + +uint32_t HELPER(m68k_movec_from)(CPUM68KState *env, uint32_t reg) +{ + M68kCPU *cpu = 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; env->sp[env->current_sp] = env->aregs[7]; - new_sp = (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 = M68K_SSP; + } else { + new_sp = M68K_ISP; + } + } else { + new_sp = M68K_USP; + } + } else { + new_sp = (env->sr & SR_S && env->cacr & M68K_CACR_EUSP) + ? M68K_SSP : M68K_USP; + } env->aregs[7] = env->sp[new_sp]; env->current_sp = 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[] = { { "sr", offsetof(CPUM68KState, sr) }, { "ssp", offsetof(CPUM68KState, sp[0]) }, { "usp", offsetof(CPUM68KState, sp[1]) }, + { "isp", offsetof(CPUM68KState, sp[2]) }, { NULL }, }; diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 499aaa2f3d..4d5173c4be 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4514,7 +4514,7 @@ DISAS_INSN(rte) gen_exception(s, s->insn_pc, EXCP_RTE); } -DISAS_INSN(movec) +DISAS_INSN(cf_movec) { uint16_t ext; TCGv reg; @@ -4531,7 +4531,32 @@ DISAS_INSN(movec) } else { reg = 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 = read_im16(env, s); + + if (ext & 0x8000) { + reg = AREG(ext, 12); + } else { + reg = 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); } @@ -5638,7 +5663,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); @@ -5945,6 +5971,14 @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, cpu_fprintf(f, "RP "); break; } + cpu_fprintf(f, "\n"); +#ifdef CONFIG_SOFTMMU + cpu_fprintf(f, "%sA7(MSP) = %08x %sA7(USP) = %08x %sA7(ISP) = %08x\n", + env->current_sp == M68K_SSP ? "->" : " ", env->sp[M68K_SSP], + env->current_sp == M68K_USP ? "->" : " ", env->sp[M68K_USP], + env->current_sp == M68K_ISP ? "->" : " ", env->sp[M68K_ISP]); + cpu_fprintf(f, "VBR = 0x%08x\n", env->vbr); +#endif } void restore_state_to_opc(CPUM68KState *env, TranslationBlock *tb, From patchwork Thu Jan 4 01:29:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBrLd1wvkz9s7n for ; Thu, 4 Jan 2018 12:48:57 +1100 (AEDT) Received: from localhost ([::1]:44960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWueN-0006GK-6k for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 20:48:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWuLX-0000vt-Hk for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWuLW-0007F6-Ju for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:27 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:65235) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWuLW-0007Dh-B6 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 20:29:26 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LqD3Y-1fANxU0geu-00dkV8; Thu, 04 Jan 2018 02:29:24 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 02:29:13 +0100 Message-Id: <20180104012913.30763-18-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104012913.30763-1-laurent@vivier.eu> References: <20180104012913.30763-1-laurent@vivier.eu> X-Provags-ID: V03:K0:Nkw2jCwvr/7f2KiGIPGwOQjO27xETo/GR1+00nMwLzAyh7upK7u 1XAe4XqKp+BcxyjtLk5lf/KqxLg3IeL0mztIa1F8UkgAvO8Lg2jCz59BusXyx7ksuKLsdSl J94P07idxztk9sWky0DbEU6Udl7uN/prmwmm/Rv0ogVyX9EfMAXFckOyBYIg4rZ33PJDWsx +aQjOapLDY0xBE28bjMgg== X-UI-Out-Filterresults: notjunk:1; V01:K0:jWr2xfQ8f2U=:xUhNg5G8G3mWxCYlIKG4ay 9ChAzV8tr1Wwp4wFWtm87p2X9X9V+X6OnWJmT/A1tHz93a7oBQEUqoDAIh/nhqaAAT+RPoExV XcP1c0L4vqGyxFjtOES3HG6Utw4R+ZKIEkchAeoLl/yBj9f60WmCYRtrQFmRIe6bh8d9GRcTJ tvJzSKWsHOIBv8u9Y26aVukxzSWGC2nPEHbgxt/ug/dy74zHbOqF3bfZoleh29ZipWvS4TGqK ROjqKaze+6B7ylLgNTPtx/vQbTAkrkZqKBiJtZL+DRWNpwKwTOs1d5APBfREsZsf85f3L0uH/ lpAU862vaE4QEIFOMywvoZyw5C3mYZWDWz3/OWUyCeE9HQ9cR2CNlciDb/gxV7VKqPMcNrm25 UV97IgcWC25b0e7ldgaIdAyx7WcKgBDKW4aA3uKncupk4OBSXpmaF6ixkb1gp7zyqOKb/9WLS abrbX0NQ+8SeCRJX0HpV3YZ7SQ3iVbWRW5YPnuOFGbUdgk0H+Hmce3PXgOBkMwb+oyCIksNP8 SLSF21l3Y307Wwz80rtkaxscSJZDYraOgUtRx839zi2H66yco1WmnCFa3RqiAKx3Nfc+/lC1z kT9wJRCjx/+oYbiBparpzQKTzJ6/2JsI2SaWaqp1r4PVdU5TWgmO8iSGJUWxChxDZz8e8kzXX 5llgtBkV3QnmTxn0YL7ckLN8VITCzVIg9piNfi6mBrO5e874VTY9F75KY/4VHiRy0G1/4KrMi 6wS6xZZ0/TaCdveb+3tGIwpws4befC6VwcVMSg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PATCH v7 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 #define M68K_SSP 0 #define M68K_USP 1 diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 4d5173c4be..4a6d799ee2 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5936,9 +5936,12 @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, } cpu_fprintf (f, "PC = %08x ", env->pc); sr = env->sr | cpu_m68k_get_ccr(env); - cpu_fprintf(f, "SR = %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 = %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 = %08x %c%c%c%c ", env->fpsr, (env->fpsr & FPSR_CC_A) ? 'A' : '-', (env->fpsr & FPSR_CC_I) ? 'I' : '-',