From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQGSh-0007T2-Vr for qemu-devel@nongnu.org; Fri, 14 Aug 2015 11:00:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZQGSg-0006Hb-2l for qemu-devel@nongnu.org; Fri, 14 Aug 2015 11:00:03 -0400 Received: from mail-qg0-x22f.google.com ([2607:f8b0:400d:c04::22f]:35256) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQGSf-0006Gh-QS for qemu-devel@nongnu.org; Fri, 14 Aug 2015 11:00:02 -0400 Received: by qgj62 with SMTP id 62so53174882qgj.2 for ; Fri, 14 Aug 2015 08:00:01 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Fri, 14 Aug 2015 07:59:16 -0700 Message-Id: <1439564366-11633-2-git-send-email-rth@twiddle.net> In-Reply-To: <1439564366-11633-1-git-send-email-rth@twiddle.net> References: <1439564366-11633-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 01/11] target-m68k: Print flags properly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, schwab@linux-m68k.org, laurent@vivier.eu, gerg@uclinux.org Signed-off-by: Richard Henderson --- target-m68k/cpu.h | 1 + target-m68k/helper.c | 2 +- target-m68k/translate.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index 6d1a140..9708615 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -123,6 +123,7 @@ int cpu_m68k_exec(CPUState *cpu); is returned if the signal was handled by the virtual CPU. */ int cpu_m68k_signal_handler(int host_signum, void *pinfo, void *puc); +uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op); typedef enum { CC_OP_DYNAMIC, /* Use env->cc_op */ diff --git a/target-m68k/helper.c b/target-m68k/helper.c index c7bccf7..2185041 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -130,7 +130,7 @@ void m68k_cpu_init_gdb(M68kCPU *cpu) /* TODO: Add [E]MAC registers. */ } -static uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op) +uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op) { int flags; uint32_t src; diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 80ac63a..c000d0a 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -3236,8 +3236,8 @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, i, u.l.upper, u.l.lower, *(double *)&u.d); } cpu_fprintf (f, "PC = %08x ", env->pc); - sr = env->sr; - cpu_fprintf (f, "SR = %04x %c%c%c%c%c ", sr, (sr & 0x10) ? 'X' : '-', + sr = env->sr | cpu_m68k_flush_flags(env, env->cc_op) | env->cc_x * CCF_X; + 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, "FPRESULT = %12g\n", *(double *)&env->fp_result); -- 2.4.3