Commit 99c51448 authored by Richard Henderson's avatar Richard Henderson Committed by Laurent Vivier
Browse files

target-m68k: Some fixes to SR and flags management 



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

target-m68k/cpu.h

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

uint32_t cpu_m68k_get_ccr(CPUM68KState *env);

void cpu_m68k_set_ccr(CPUM68KState *env, uint32_t);





/* Instead of computing the condition codes after each m68k instruction,

target-m68k/helper.c

+15 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ void m68k_cpu_init_gdb(M68kCPU *cpu) 
    /* TODO: Add [E]MAC registers.  */

}



uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op)

static uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op)

{

    int flags;

    uint32_t src;
@@ -272,6 +272,18 @@ set_x: 
    return flags;

}



uint32_t cpu_m68k_get_ccr(CPUM68KState *env)

{

    return cpu_m68k_flush_flags(env, env->cc_op) | env->cc_x * CCF_X;

}



void cpu_m68k_set_ccr(CPUM68KState *env, uint32_t val)

{

    env->cc_op = CC_OP_FLAGS;

    env->cc_dest = val & 0xf;

    env->cc_x = (val & CCF_X ? 1 : 0);

}



void HELPER(movec)(CPUM68KState *env, uint32_t reg, uint32_t val)

{

    M68kCPU *cpu = m68k_env_get_cpu(env);
@@ -466,7 +478,8 @@ uint32_t HELPER(addx_cc)(CPUM68KState *env, uint32_t op1, uint32_t op2) 


void HELPER(set_sr)(CPUM68KState *env, uint32_t val)

{

    env->sr = val & 0xffff;

    env->sr = val & 0xffe0;

    cpu_m68k_set_ccr(env, val);

    m68k_switch_sp(env);

}

target-m68k/op_helper.c

+3 −2
Original line number Diff line number Diff line
@@ -63,9 +63,9 @@ static void do_rte(CPUM68KState *env) 
    fmt = cpu_ldl_kernel(env, sp);

    env->pc = cpu_ldl_kernel(env, sp + 4);

    sp |= (fmt >> 28) & 3;

    env->sr = fmt & 0xffff;

    env->aregs[7] = sp + 8;

    m68k_switch_sp(env);



    helper_set_sr(env, fmt);

}



static void do_interrupt_all(CPUM68KState *env, int is_hw)
@@ -112,6 +112,7 @@ static void do_interrupt_all(CPUM68KState *env, int is_hw) 
    fmt |= 0x40000000;

    fmt |= vector << 16;

    fmt |= env->sr;

    fmt |= cpu_m68k_get_ccr(env);



    env->sr |= SR_S;

    if (is_hw) {

target-m68k/translate.c

+1 −1
Original line number Diff line number Diff line
@@ -3145,7 +3145,7 @@ 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_m68k_flush_flags(env, env->cc_op) | env->cc_x * CCF_X;

    sr = env->sr | cpu_m68k_get_ccr(env);

    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' : '-');