Commit 8e394cca authored by Richard Henderson's avatar Richard Henderson Committed by Laurent Vivier
Browse files

target-m68k: Print flags properly 



Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 9fdb533f

target-m68k/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -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,

target-m68k/helper.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

target-m68k/translate.c

+7 −7
Original line number Diff line number Diff line
@@ -3145,8 +3145,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);