diff options
| author | Richard Henderson <rth@twiddle.net> | 2015-08-14 07:59:16 -0700 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2016-10-25 20:54:47 +0200 |
| commit | 8e394ccabdb1e439aab092de6b9d2f26432e962f (patch) | |
| tree | e8d3c73aa67f370204b764440deb3ea6feedaa99 | |
| parent | 9fdb533fb129b19610941bd1e5dd93e7471a18f5 (diff) | |
target-m68k: Print flags properly
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | target-m68k/cpu.h | 1 | ||||
| -rw-r--r-- | target-m68k/helper.c | 2 | ||||
| -rw-r--r-- | target-m68k/translate.c | 14 |
3 files changed, 9 insertions, 8 deletions
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index f0f670c2e2..2f08a2cf8c 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -158,6 +158,7 @@ M68kCPU *cpu_m68k_init(const char *cpu_model); 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); /* Instead of computing the condition codes after each m68k instruction, diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 0a1ff1105d..d9ea830c67 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -132,7 +132,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 edd8744d20..cecd12c984 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -3140,15 +3140,15 @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, for (i = 0; i < 8; i++) { u.d = env->fregs[i]; - cpu_fprintf (f, "D%d = %08x A%d = %08x F%d = %08x%08x (%12g)\n", - i, env->dregs[i], i, env->aregs[i], - i, u.l.upper, u.l.lower, *(double *)&u.d); + cpu_fprintf(f, "D%d = %08x A%d = %08x F%d = %08x%08x (%12g)\n", + i, env->dregs[i], i, env->aregs[i], + 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 & CCF_N) ? 'N' : '-', (sr & CCF_Z) ? 'Z' : '-', - (sr & CCF_V) ? 'V' : '-', (sr & CCF_C) ? 'C' : '-'); + 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); } |