Commit 91f90d71 authored by Laurent Vivier's avatar Laurent Vivier
Browse files

target-m68k: don't update cc_dest in helpers 



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

target-m68k/cpu.h

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

void cpu_m68k_flush_flags(CPUM68KState *, int);





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

target-m68k/helper.c

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

}



void cpu_m68k_flush_flags(CPUM68KState *env, int cc_op)

static uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op)

{

    M68kCPU *cpu = m68k_env_get_cpu(env);

    int flags;

    uint32_t src;

    uint32_t dest;
@@ -202,7 +201,7 @@ void cpu_m68k_flush_flags(CPUM68KState *env, int cc_op) 
    flags = 0;

    src = env->cc_src;

    dest = env->cc_dest;

    switch (cc_op) {

    switch (op) {

    case CC_OP_FLAGS:

        flags = dest;

        break;
@@ -268,10 +267,9 @@ set_x: 
        SET_FLAGS_SHIFT(int32_t);

        break;

    default:

        cpu_abort(CPU(cpu), "Bad CC_OP %d", cc_op);

        g_assert_not_reached();

    }

    env->cc_op = CC_OP_FLAGS;

    env->cc_dest = flags;

    return flags;

}



void HELPER(movec)(CPUM68KState *env, uint32_t reg, uint32_t val)
@@ -422,20 +420,21 @@ uint32_t HELPER(subx_cc)(CPUM68KState *env, uint32_t op1, uint32_t op2) 
{

    uint32_t res;

    uint32_t old_flags;

    int op;



    old_flags = env->cc_dest;

    if (env->cc_x) {

        env->cc_x = (op1 <= op2);

        env->cc_op = CC_OP_SUBX;

        op = CC_OP_SUBX;

        res = op1 - (op2 + 1);

    } else {

        env->cc_x = (op1 < op2);

        env->cc_op = CC_OP_SUB;

        op = CC_OP_SUB;

        res = op1 - op2;

    }

    env->cc_dest = res;

    env->cc_src = op2;

    cpu_m68k_flush_flags(env, env->cc_op);

    env->cc_dest = cpu_m68k_flush_flags(env, op);

    /* !Z is sticky.  */

    env->cc_dest &= (old_flags | ~CCF_Z);

    return res;
@@ -445,20 +444,21 @@ uint32_t HELPER(addx_cc)(CPUM68KState *env, uint32_t op1, uint32_t op2) 
{

    uint32_t res;

    uint32_t old_flags;

    int op;



    old_flags = env->cc_dest;

    if (env->cc_x) {

        res = op1 + op2 + 1;

        env->cc_x = (res <= op2);

        env->cc_op = CC_OP_ADDX;

        op = CC_OP_ADDX;

    } else {

        res = op1 + op2;

        env->cc_x = (res < op2);

        env->cc_op = CC_OP_ADD;

        op = CC_OP_ADD;

    }

    env->cc_dest = res;

    env->cc_src = op2;

    cpu_m68k_flush_flags(env, env->cc_op);

    env->cc_dest = cpu_m68k_flush_flags(env, op);

    /* !Z is sticky.  */

    env->cc_dest &= (old_flags | ~CCF_Z);

    return res;
@@ -790,9 +790,9 @@ void HELPER(mac_set_flags)(CPUM68KState *env, uint32_t acc) 
    }

}



void HELPER(flush_flags)(CPUM68KState *env, uint32_t cc_op)

uint32_t HELPER(flush_flags)(CPUM68KState *env, uint32_t op)

{

    cpu_m68k_flush_flags(env, cc_op);

    return cpu_m68k_flush_flags(env, op);

}



uint32_t HELPER(get_macf)(CPUM68KState *env, uint64_t val)

target-m68k/helper.h

+1 −1
Original line number Diff line number Diff line
@@ -45,5 +45,5 @@ DEF_HELPER_3(set_mac_extf, void, env, i32, i32) 
DEF_HELPER_3(set_mac_exts, void, env, i32, i32)

DEF_HELPER_3(set_mac_extu, void, env, i32, i32)



DEF_HELPER_2(flush_flags, void, env, i32)

DEF_HELPER_2(flush_flags, i32, env, i32)

DEF_HELPER_2(raise_exception, void, env, i32)

target-m68k/translate.c

+2 −2
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static inline void gen_flush_flags(DisasContext *s) 
    if (s->cc_op == CC_OP_FLAGS)

        return;

    gen_flush_cc_op(s);

    gen_helper_flush_flags(cpu_env, QREG_CC_OP);

    gen_helper_flush_flags(QREG_CC_DEST, cpu_env, QREG_CC_OP);

    s->cc_op = CC_OP_FLAGS;

}
@@ -719,6 +719,7 @@ static void gen_jmpcc(DisasContext *s, int cond, TCGLabel *l1) 
    /* TODO: Optimize compare/branch pairs rather than always flushing

       flag state to CC_OP_FLAGS.  */

    gen_flush_flags(s);

    gen_flush_cc_op(s);

    switch (cond) {

    case 0: /* T */

        tcg_gen_br(l1);
@@ -1673,7 +1674,6 @@ DISAS_INSN(branch) 
        /* bsr */

        gen_push(s, tcg_const_i32(s->pc));

    }

    gen_flush_cc_op(s);

    if (op > 1) {

        /* Bcc */

        l1 = gen_new_label();