From nobody Tue Oct 28 12:15:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514856136175185.519862961218; Mon, 1 Jan 2018 17:22:16 -0800 (PST) Received: from localhost ([::1]:50928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWBHT-00029v-Ce for importer@patchew.org; Mon, 01 Jan 2018 20:22:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWB6L-0001YB-QO for qemu-devel@nongnu.org; Mon, 01 Jan 2018 20:10:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWB6K-00059F-Sl for qemu-devel@nongnu.org; Mon, 01 Jan 2018 20:10:45 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:55851) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWB6K-00058N-JG for qemu-devel@nongnu.org; Mon, 01 Jan 2018 20:10:44 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MceGG-1eEVj02bui-00HdnX; Tue, 02 Jan 2018 02:10:42 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 2 Jan 2018 02:10:32 +0100 Message-Id: <20180102011032.30056-18-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180102011032.30056-1-laurent@vivier.eu> References: <20180102011032.30056-1-laurent@vivier.eu> X-Provags-ID: V03:K0:sPuLd+FnoaWTAIRXdtECU+iB2VcQjjGXsLvZtzjHrorVtu5XUup oAv/vdv01egkAJgH9mQFHYWJxHFWxA4IeVpRRbtu5NCp81JPT7i4YFzn2pQKRt9DYX66P7f ruH3hfTgGCkOyxK55K+0JyyB57cFozZlBker4KOnskhyFIG0icVeASHzboyZFXx2lClCs8x Fc1ZkaOzvoE6i57fIpDNA== X-UI-Out-Filterresults: notjunk:1;V01:K0:ubh6RujvGgk=:5CYiftWYamJsP05jPou8ob MMZ2T/S4ZMcY9AQTTpI+Mqm1d2qbDQv6VdV+xzL6p6v5zRQLCM0oNXY1LxCWH9/E10/Mboseh Ay6iCn14la3b+1KVYKJpTnlPj31tbXmo1e+agMtYbxuk2eK8uiD8Xa+8c65ToSK5gVeXYYJsb IeiSdSBmma91GkW98OHHd4rRV9sGroPQI0EXuuD8jXnR+LWd2bUe4zyiiHm09uNd2pRmFDvW0 8IyY7XTurQKGunCg0jvPePOcfD6VFbT0nMOeU7zmSfibbU2viKv1uTAqARDGTeNZLQKWb8Px5 0U7xYKeA4ddFOux9G3e6zwD+gqsBBBueHDXLSrAxa+SSIp/jQtxwzv9a8+0eY+YLAvagnCNiq a7XAxrr1bGe+wxXAyNkNf697H0jTWzcIAvMdA56zTVOeSA8DdkLfmDzVlE15FtcSkf1UA2QAv 9jMY5d4Jw+bIS7To3J9ocPv9J/n605g+skfvD48T5djx3LrUrVQkHRTLj3JMYUyI2We5EU+ES zpGmsMy/zQKxnZQ/5GuMt4d5RRsKdE92YoiJCwX16AvYTwpd8+i75ahRVWnXGpmy3gTWv1Ano kq57+Ri8q9+l6tRl+JZ6DpWCmCG3Dg0se4MKDPvqSpEy0ujbGhEAcI6kETGNjMrgHpdF4Z9JS MGaBq7RDCEfsPXPoi/r7NExDsYnKPxTIAm5qOXfocAUKi9TJZlV8Cx0hf28EXcw2QYagcqcht QnvwPIoNhJoqLSDl5tP24m6VjtyE0vyqJxlDnw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH v5 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 , 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 fdb780c81c..41714d8fd6 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -218,7 +218,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 bd43e60a23..a7937de8d0 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5997,9 +5997,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