[Qemu-devel] [PATCH 01/11] target-m68k: Print flags properly

[Richard Henderson <rth@twiddle.net>]

Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 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