Copied from target-i386
Signed-off-by: Laurent Vivier
---
cpu-exec.c | 6 --
target-m68k/cpu-qom.h | 4
target-m68k/cpu.c | 2 --
target-m68k/cpu.h | 1 +
target-m68k/helper.c| 20
target-m68k/translate.c | 6 +-
6 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/cpu-exec.c b/cpu-exec.c
index bbfcbfb..1193cc3 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -147,12 +147,6 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu,
TranslationBlock *itb)
if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) {
#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
diff --git a/target-m68k/cpu-qom.h b/target-m68k/cpu-qom.h
index c28e55d..1fadf1d 100644
--- a/target-m68k/cpu-qom.h
+++ b/target-m68k/cpu-qom.h
@@ -77,8 +77,4 @@ void m68k_cpu_dump_state(CPUState *cpu, FILE *f,
fprintf_function cpu_fprintf,
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);
-
#endif
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
index baca4f8..81f1579 100644
--- a/target-m68k/cpu.c
+++ b/target-m68k/cpu.c
@@ -272,8 +272,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;
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index c769711..0e4ff08 100644
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -60,6 +60,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];
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index d0a346f..ec37c9d 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -921,23 +921,3 @@ void HELPER(set_mac_extu)(CPUM68KState *env, uint32_t val,
uint32_t acc)
res |= (uint64_t)(val & 0x) << 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);
-}
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index 67d72cc..c7331dc 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -3022,7 +3022,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))) {
@@ -3115,5 +3115,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;
+}
}
--
2.5.5
