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' : '-',