From nobody Tue Oct 28 04:13:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514937320160194.185162970909; Tue, 2 Jan 2018 15:55:20 -0800 (PST) Received: from localhost ([::1]:59792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWOo-0001KT-Kx for importer@patchew.org; Tue, 02 Jan 2018 18:55:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBY-0007Cl-W8 for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBW-0003C1-8w for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:33 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:60469) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBV-0003Bf-Vi for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:30 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LpAm0-1f98j52LQ4-00er45; Wed, 03 Jan 2018 00:41:27 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:41:08 +0100 Message-Id: <20180102234108.32713-18-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180102234108.32713-1-laurent@vivier.eu> References: <20180102234108.32713-1-laurent@vivier.eu> X-Provags-ID: V03:K0:qxHc71q9/Rua+zbjSWqiunC0R1o2lGEtKJs9h6aB7NzjC06Npd0 Yae/SEr7ABy2frzP73YGXd3SYxJHTyFwciFC6cR5TLDoIjOlXul+kn9cs9hjbnCsk+VKC3s a23BEtb/LfkVjuTL5rMBcbuujkUC/dISSSGYokqfuaCFu59PpdGEmQUeOmqF+DHG9RxK36A i133wLLSd4zN/8ErEaBfw== X-UI-Out-Filterresults: notjunk:1;V01:K0:YA/a1ZPh21c=:zZz23SJ5w34NamfeOSeimU 01+gZzK6knXgubHlBFUlG8q9ELGSkOhMLarU+ccKjUYhqAOS598ngpJmfpt9OM3IVXKiVy+wT oQdZkcMxLxrOGqul66AstXLpmJSJu1Ma2uK5feRqRdYuYuOgn7z2FuAv9QjGt1076rdWJ6R6S ke0Px7UN4VzH4k42z9syFoga8WjqqFqB+sAugFeC3sLBLUK9ytzqs657pDKwgJZ1VxX5B67Q6 eOoj/QaM1M3NQ1jlmdotNiX9Y4nViqlLdd1b40pPmQIwVyyD1DB16V6puZPK/HNmteprGY028 VGUz8W/GtQ8tTQGE0bYu9igA9vELCy/hJvpKPHjXEw2QC5cgambYHwh2I5UVhgWJA8+b6wcTs jzRagx3M322IOTggupOptZJATUaFCdzBNG5nYZ1/qgKgM3bM0Am8BeNNYWbuIqX9K7id7KBnQ YGYgMsPOrdZ0bSMhVrH+yPj6F/DngQ+hKjfBKS4pBjebfTPG7lAACUigu6kTJyrGUVeZrrfxK ut8hI1T55LbOf4GPSD67lylUKoZOnwNVrYxfbUr6/0XQaQ1aOa3yo6t44hIarVygQTMHmnyvr /uObCAds+BnZ+8tukAqkD677bwZt0Ts0ual3qFk0JYcGJfUM7IghaiLtrY+7J6ai+FazxUh5i U8Z5a5YCzmrFyKzvyYtpW1giqszddrddOuMfdTY9hI7vOHHXnx2f9w8BXoLGgZ1bjtpsYDXKO lwHY5qblg22CFG96RNQsJGwa3lvMpcHO3JBaXQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PATCH v6 17/17] target/m68k: fix m68k_cpu_dump_state() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Display correctly the Trace bits for 680x0 (2 bits instead of 1 for Coldfire). Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/cpu.h | 3 ++- target/m68k/translate.c | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 759b30d389..2985b039e1 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -219,7 +219,8 @@ typedef enum { #define SR_I 0x0700 #define SR_M 0x1000 #define SR_S 0x2000 -#define SR_T 0x8000 +#define SR_T_SHIFT 14 +#define SR_T 0xc000 =20 #define M68K_SSP 0 #define M68K_USP 1 diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 9088e87b97..06840c5d00 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5937,9 +5937,12 @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, fpri= ntf_function cpu_fprintf, } cpu_fprintf (f, "PC =3D %08x ", env->pc); sr =3D env->sr | cpu_m68k_get_ccr(env); - cpu_fprintf(f, "SR =3D %04x %c%c%c%c%c ", sr, (sr & CCF_X) ? 'X' : '-', - (sr & CCF_N) ? 'N' : '-', (sr & CCF_Z) ? 'Z' : '-', - (sr & CCF_V) ? 'V' : '-', (sr & CCF_C) ? 'C' : '-'); + cpu_fprintf(f, "SR =3D %04x T:%x I:%x %c%c %c%c%c%c%c\n", + sr, (sr & SR_T) >> SR_T_SHIFT, (sr & SR_I) >> SR_I_SHIFT, + (sr & SR_S) ? 'S' : 'U', (sr & SR_M) ? '%' : 'I', + (sr & CCF_X) ? 'X' : '-', (sr & CCF_N) ? 'N' : '-', + (sr & CCF_Z) ? 'Z' : '-', (sr & CCF_V) ? 'V' : '-', + (sr & CCF_C) ? 'C' : '-'); cpu_fprintf(f, "FPSR =3D %08x %c%c%c%c ", env->fpsr, (env->fpsr & FPSR_CC_A) ? 'A' : '-', (env->fpsr & FPSR_CC_I) ? 'I' : '-', --=20 2.14.3