[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/52] target-m68k: Print flags properly
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH 17/52] target-m68k: Print flags properly |
Date: |
Wed, 4 May 2016 22:11:57 +0200 |
From: Richard Henderson <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
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 8dafaab..b2d9f3a 100644
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -129,6 +129,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 c3e4380..e9ec8bc 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -131,7 +131,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 82c22b2..a116c17 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -3141,8 +3141,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.5.5
- [Qemu-devel] [PATCH 11/52] target-m68k: allow to update flags with operation on words and bytes, (continued)
- [Qemu-devel] [PATCH 11/52] target-m68k: allow to update flags with operation on words and bytes, Laurent Vivier, 2016/05/04
- [Qemu-devel] [PATCH 12/52] target-m68k: Replace helper_xflag_lt with setcond, Laurent Vivier, 2016/05/04
- [Qemu-devel] [PATCH 13/52] target-m68k: update CPU flags management, Laurent Vivier, 2016/05/04
- [Qemu-devel] [PATCH 14/52] target-m68k: update move to/from ccr/sr, Laurent Vivier, 2016/05/04
- [Qemu-devel] [PATCH 15/52] target-m68k: don't update cc_dest in helpers, Laurent Vivier, 2016/05/04
- [Qemu-devel] [PATCH 17/52] target-m68k: Print flags properly,
Laurent Vivier <=
- [Qemu-devel] [PATCH 16/52] target-m68k: update CPU flags management, Laurent Vivier, 2016/05/04
- [Qemu-devel] [PATCH 18/52] target-m68k: Some fixes to SR and flags management, Laurent Vivier, 2016/05/04
- [Qemu-devel] [PATCH 20/52] target-m68k: Remove incorrect clearing of cc_x, Laurent Vivier, 2016/05/04
- [Qemu-devel] [PATCH 19/52] target-m68k: terminate cpu dump with newline, Laurent Vivier, 2016/05/04
- [Qemu-devel] [PATCH 22/52] target-m68k: Introduce DisasCompare, Laurent Vivier, 2016/05/04
- [Qemu-devel] [PATCH 23/52] target-m68k: Use setcond for scc, Laurent Vivier, 2016/05/04