From patchwork Thu Jan 4 16:42:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 855724 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 3zCDTz2qk4z9s7G for ; Fri, 5 Jan 2018 03:56:39 +1100 (AEDT) Received: from localhost ([::1]:50303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX8on-0004X2-Ag for incoming@patchwork.ozlabs.org; Thu, 04 Jan 2018 11:56:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX8bf-0007dq-DZ for qemu-devel@nongnu.org; Thu, 04 Jan 2018 11:43:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX8bd-0003gN-Nr for qemu-devel@nongnu.org; Thu, 04 Jan 2018 11:43:03 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:60482) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX8bd-0003e8-BV for qemu-devel@nongnu.org; Thu, 04 Jan 2018 11:43:01 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M1CHs-1emb3j3V5k-00tDcF; Thu, 04 Jan 2018 17:43:00 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 4 Jan 2018 17:42:51 +0100 Message-Id: <20180104164251.26494-18-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180104164251.26494-1-laurent@vivier.eu> References: <20180104164251.26494-1-laurent@vivier.eu> X-Provags-ID: V03:K0:DbCg64bDG7j2yg03BRv60lM+tLRrQqMcQnryGrZGmHJ13brCBWK 70kSgsGMQLLeDd0PZi2xhhIu9jMo5nwlW+GCvwoH1JIoP3mDVjjyBgxvNULKfvrCUo8p8d6 hBwCxnzWb1KbRUyc4JzdKoA2Jk5Sz4iYKcm0cVXthh8F7jA8+EKDXkP79xDcaKbEjSyRSbV Df40xCOImxZQN/vh124uA== X-UI-Out-Filterresults: notjunk:1; V01:K0:whrYWbCVg/E=:W8PDk7DfmKVUJX0Wj0f2fZ tBS6RlY/IaYXtz5c6gplWWgit9/4LYPspgk/33sWydm51JSfNNdgu84tHTmhof9sha2A00v6U CvmXYcyKXx/ajszc/aG+EDVfpw9u9JnuQGQz86ODHR6gVFtLtD9kYxCx8NGS6z+zN76taR1Jp YehGTq9B9iSPi25n9dZ2/qhiBBBvOl5mYTiQiAcrU1CJYcJiBk3PRdS2O6mn2sWw+Xjmn5Zuw nOKdg4h5UkraJTTtFzAkfEuGfGjgBsNX/74WwdNWPtST4lK/lZ2AltDiEA0fbocoENpuZfWdf mdXq5LyO6HUxA42YaHHYJFcSqcgkBH5fq7RqrZbjFj/IOuh4/jv5DpqpPHqkjobNBbTSyhmac RX119Hp7Q1oBnH09GG9CHhH+feuLHQMNhJftVa9fTRQ57Uf3qTiXBLcTZLgiO3BFvx/8FdT+J cmeHA4TkOc/YeKsbkDTSRB0VhUAFLH3CSAuo4y0JmNYAe+IgEmTIROs3a/mYUcQxYfL5YmzJW DyUc8UcLJk9ZaNM+6Xq5srjI51M+QpKbdGiTYEb4+ZYItPktzKCAHiCgaj4P607y2r6U2jJKF 7JxIzJCFVdz2dFUPwPO2T93+w7a7nlZbE2Z+ikZcQ1+yleQCLKLfi+pIbfXtPwfHAksC201cx 1PxLoAkLJiO5LBLBCNkXxCKRHWq47V8tWeNqvjbYr1woGmvTvNSLuZUOFIGgua5pKdeeOCPjw P7m7sFT94YxF1ktQfYY+3dEdE5B4nJw/msms4hCu2tTVYTu0mOhJLuODk5k= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 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: 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 Message-Id: <20180104012913.30763-18-laurent@vivier.eu> --- 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' : '-',