Commit 20a8856e authored by Laurent Vivier's avatar Laurent Vivier
Browse files

target-m68k: remove m68k_cpu_exec_enter() and m68k_cpu_exec_exit() 



Update cc_op directly from tcg_gen_insn_start() and
restore_state_to_opc()

Copied from target-i386

Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent f9083519

cpu-exec.c

+0 −6
Original line number Diff line number Diff line
@@ -151,12 +151,6 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb) 
        && qemu_log_in_addr_range(itb->pc)) {

#if defined(TARGET_I386)

        log_cpu_state(cpu, CPU_DUMP_CCOP);

#elif defined(TARGET_M68K)

        /* ??? Should not modify env state for dumping.  */

        cpu_m68k_flush_flags(env, env->cc_op);

        env->cc_op = CC_OP_FLAGS;

        env->sr = (env->sr & 0xffe0) | env->cc_dest | (env->cc_x << 4);

        log_cpu_state(cpu, 0);

#else

        log_cpu_state(cpu, 0);

#endif

target-m68k/cpu.c

+0 −2
Original line number Diff line number Diff line
@@ -281,8 +281,6 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data) 
#else

    cc->get_phys_page_debug = m68k_cpu_get_phys_page_debug;

#endif

    cc->cpu_exec_enter = m68k_cpu_exec_enter;

    cc->cpu_exec_exit = m68k_cpu_exec_exit;

    cc->disas_set_info = m68k_cpu_disas_set_info;



    cc->gdb_num_core_regs = 18;

target-m68k/cpu.h

+1 −3
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#define EXCP_HALT_INSN      0x101



#define NB_MMU_MODES 2

#define TARGET_INSN_START_EXTRA_WORDS 1



typedef struct CPUM68KState {

    uint32_t dregs[8];
@@ -149,9 +150,6 @@ hwaddr m68k_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); 
int m68k_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);

int m68k_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);



void m68k_cpu_exec_enter(CPUState *cs);

void m68k_cpu_exec_exit(CPUState *cs);



void m68k_tcg_init(void);

void m68k_cpu_init_gdb(M68kCPU *cpu);

M68kCPU *cpu_m68k_init(const char *cpu_model);

target-m68k/helper.c

+0 −20
Original line number Diff line number Diff line
@@ -922,23 +922,3 @@ void HELPER(set_mac_extu)(CPUM68KState *env, uint32_t val, uint32_t acc) 
    res |= (uint64_t)(val & 0xffff0000) << 16;

    env->macc[acc + 1] = res;

}
 


void m68k_cpu_exec_enter(CPUState *cs)

{

    M68kCPU *cpu = M68K_CPU(cs);

    CPUM68KState *env = &cpu->env;



    env->cc_op = CC_OP_FLAGS;

    env->cc_dest = env->sr & 0xf;

    env->cc_x = (env->sr >> 4) & 1;

}



void m68k_cpu_exec_exit(CPUState *cs)

{

    M68kCPU *cpu = M68K_CPU(cs);

    CPUM68KState *env = &cpu->env;



    cpu_m68k_flush_flags(env, env->cc_op);

    env->cc_op = CC_OP_FLAGS;

    env->sr = (env->sr & 0xffe0) | env->cc_dest | (env->cc_x << 4);

}

target-m68k/translate.c

+5 −1
Original line number Diff line number Diff line
@@ -3025,7 +3025,7 @@ void gen_intermediate_code(CPUM68KState *env, TranslationBlock *tb) 
    do {

        pc_offset = dc->pc - pc_start;

        gen_throws_exception = NULL;

        tcg_gen_insn_start(dc->pc);

        tcg_gen_insn_start(dc->pc, dc->cc_op);

        num_insns++;



        if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) {
@@ -3119,5 +3119,9 @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, 
void restore_state_to_opc(CPUM68KState *env, TranslationBlock *tb,

                          target_ulong *data)

{

    int cc_op = data[1];

    env->pc = data[0];

    if (cc_op != CC_OP_DYNAMIC) {

        env->cc_op = cc_op;

    }

}