target/m68k: Convert to TranslatorOps

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20180512050250.12774-8-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2018-05-11 22:02:48 -07:00 committed by Laurent Vivier
parent a575cbe01c
commit 11ab74b01e
1 changed files with 86 additions and 90 deletions

View File

@ -6059,113 +6059,109 @@ static void disas_m68k_insn(CPUM68KState * env, DisasContext *s)
do_release(s); do_release(s);
} }
/* generate intermediate code for basic block 'tb'. */ static void m68k_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu)
void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
{ {
CPUM68KState *env = cs->env_ptr; DisasContext *dc = container_of(dcbase, DisasContext, base);
DisasContext dc1, *dc = &dc1; CPUM68KState *env = cpu->env_ptr;
target_ulong pc_start;
int pc_offset;
int num_insns;
int max_insns;
/* generate intermediate code */
pc_start = tb->pc;
dc->base.tb = tb;
dc->env = env; dc->env = env;
dc->base.is_jmp = DISAS_NEXT; dc->pc = dc->base.pc_first;
dc->pc = pc_start;
dc->cc_op = CC_OP_DYNAMIC; dc->cc_op = CC_OP_DYNAMIC;
dc->cc_op_synced = 1; dc->cc_op_synced = 1;
dc->base.singlestep_enabled = cs->singlestep_enabled;
dc->done_mac = 0; dc->done_mac = 0;
dc->writeback_mask = 0; dc->writeback_mask = 0;
num_insns = 0;
max_insns = tb_cflags(tb) & CF_COUNT_MASK;
if (max_insns == 0) {
max_insns = CF_COUNT_MASK;
}
if (max_insns > TCG_MAX_INSNS) {
max_insns = TCG_MAX_INSNS;
}
init_release_array(dc); init_release_array(dc);
}
gen_tb_start(tb); static void m68k_tr_tb_start(DisasContextBase *dcbase, CPUState *cpu)
do { {
pc_offset = dc->pc - pc_start; }
tcg_gen_insn_start(dc->pc, dc->cc_op);
num_insns++;
if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) { static void m68k_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu)
gen_exception(dc, dc->pc, EXCP_DEBUG); {
/* The address covered by the breakpoint must be included in DisasContext *dc = container_of(dcbase, DisasContext, base);
[tb->pc, tb->pc + tb->size) in order to for it to be tcg_gen_insn_start(dc->base.pc_next, dc->cc_op);
properly cleared -- thus we increment the PC here so that }
the logic setting tb->size below does the right thing. */
dc->pc += 2;
break;
}
if (num_insns == max_insns && (tb_cflags(tb) & CF_LAST_IO)) { static bool m68k_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *cpu,
gen_io_start(); const CPUBreakpoint *bp)
} {
DisasContext *dc = container_of(dcbase, DisasContext, base);
dc->base.pc_next = dc->pc; gen_exception(dc, dc->base.pc_next, EXCP_DEBUG);
disas_m68k_insn(env, dc); /* The address covered by the breakpoint must be included in
} while (!dc->base.is_jmp && !tcg_op_buf_full() && [tb->pc, tb->pc + tb->size) in order to for it to be
!cs->singlestep_enabled && properly cleared -- thus we increment the PC here so that
!singlestep && the logic setting tb->size below does the right thing. */
(pc_offset) < (TARGET_PAGE_SIZE - 32) && dc->base.pc_next += 2;
num_insns < max_insns);
if (tb_cflags(tb) & CF_LAST_IO) return true;
gen_io_end(); }
if (unlikely(cs->singlestep_enabled)) {
/* Make sure the pc is updated, and raise a debug exception. */ static void m68k_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
if (!dc->base.is_jmp) { {
update_cc_op(dc); DisasContext *dc = container_of(dcbase, DisasContext, base);
tcg_gen_movi_i32(QREG_PC, dc->pc);
} disas_m68k_insn(cpu->env_ptr, dc);
dc->base.pc_next = dc->pc;
if (dc->base.is_jmp == DISAS_NEXT
&& dc->pc - dc->base.pc_first >= TARGET_PAGE_SIZE - 32) {
dc->base.is_jmp = DISAS_TOO_MANY;
}
}
static void m68k_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
{
DisasContext *dc = container_of(dcbase, DisasContext, base);
if (dc->base.is_jmp == DISAS_NORETURN) {
return;
}
if (dc->base.singlestep_enabled) {
gen_helper_raise_exception(cpu_env, tcg_const_i32(EXCP_DEBUG)); gen_helper_raise_exception(cpu_env, tcg_const_i32(EXCP_DEBUG));
} else { return;
switch (dc->base.is_jmp) {
case DISAS_NEXT:
update_cc_op(dc);
gen_jmp_tb(dc, 0, dc->pc);
break;
case DISAS_JUMP:
/* We updated CC_OP and PC in gen_jmp/gen_jmp_im. */
tcg_gen_lookup_and_goto_ptr();
break;
default:
case DISAS_EXIT:
/* We updated CC_OP and PC in gen_exit_tb, but also modified
other state that may require returning to the main loop. */
tcg_gen_exit_tb(NULL, 0);
break;
case DISAS_NORETURN:
/* nothing more to generate */
break;
}
} }
gen_tb_end(tb, num_insns);
#ifdef DEBUG_DISAS switch (dc->base.is_jmp) {
if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) case DISAS_TOO_MANY:
&& qemu_log_in_addr_range(pc_start)) { update_cc_op(dc);
qemu_log_lock(); gen_jmp_tb(dc, 0, dc->pc);
qemu_log("----------------\n"); break;
qemu_log("IN: %s\n", lookup_symbol(pc_start)); case DISAS_JUMP:
log_target_disas(cs, pc_start, dc->pc - pc_start); /* We updated CC_OP and PC in gen_jmp/gen_jmp_im. */
qemu_log("\n"); tcg_gen_lookup_and_goto_ptr();
qemu_log_unlock(); break;
case DISAS_EXIT:
/* We updated CC_OP and PC in gen_exit_tb, but also modified
other state that may require returning to the main loop. */
tcg_gen_exit_tb(NULL, 0);
break;
default:
g_assert_not_reached();
} }
#endif }
tb->size = dc->pc - pc_start;
tb->icount = num_insns; static void m68k_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu)
{
qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first));
log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size);
}
static const TranslatorOps m68k_tr_ops = {
.init_disas_context = m68k_tr_init_disas_context,
.tb_start = m68k_tr_tb_start,
.insn_start = m68k_tr_insn_start,
.breakpoint_check = m68k_tr_breakpoint_check,
.translate_insn = m68k_tr_translate_insn,
.tb_stop = m68k_tr_tb_stop,
.disas_log = m68k_tr_disas_log,
};
void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb)
{
DisasContext dc;
translator_loop(&m68k_tr_ops, &dc.base, cpu, tb);
} }
static double floatx80_to_double(CPUM68KState *env, uint16_t high, uint64_t low) static double floatx80_to_double(CPUM68KState *env, uint16_t high, uint64_t low)