yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-02 06:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: [tcg,a64] Port to disas_log

Browse source 
Incrementally paves the way towards using the generic instruction translation
loop.

Backports commit 58350fa4b2852fede96cfebad0b26bf79bca419c from qemu
This commit is contained in:
Lluís Vilanova 2018-03-04 20:08:13 -05:00 committed by Lioncash
parent 5d3ff533a1
commit cc00feb2df
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
qemu/target/arm/translate-a64.c
View file

@ -11643,6 +11643,19 @@ static void aarch64_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
} }
} }
static void aarch64_tr_disas_log(const DisasContextBase *dcbase,
CPUState *cpu)
{
// Unicorn: if'd out
#if 0
DisasContext *dc = container_of(dcbase, DisasContext, base);
qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));
log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size,
4 | (bswap_code(dc->sctlr_b) ? 2 : 0));
#endif
}
void gen_intermediate_code_a64(DisasContextBase *dcbase, CPUState *cs, void gen_intermediate_code_a64(DisasContextBase *dcbase, CPUState *cs,
TranslationBlock *tb) TranslationBlock *tb)
{ {
@ -11650,7 +11663,6 @@ void gen_intermediate_code_a64(DisasContextBase *dcbase, CPUState *cs,
TCGContext *tcg_ctx = env->uc->tcg_ctx; TCGContext *tcg_ctx = env->uc->tcg_ctx;
DisasContext *dc = container_of(dcbase, DisasContext, base); DisasContext *dc = container_of(dcbase, DisasContext, base);
int max_insns; int max_insns;
bool block_full = false;
dc->base.tb = tb; dc->base.tb = tb;
dc->base.pc_first = dc->base.tb->pc; dc->base.pc_first = dc->base.tb->pc;
@ -11659,6 +11671,8 @@ void gen_intermediate_code_a64(DisasContextBase *dcbase, CPUState *cs,
dc->base.num_insns = 0; dc->base.num_insns = 0;
dc->base.singlestep_enabled = cs->singlestep_enabled; dc->base.singlestep_enabled = cs->singlestep_enabled;
env->uc->block_full = false;
max_insns = dc->base.tb->cflags & CF_COUNT_MASK; max_insns = dc->base.tb->cflags & CF_COUNT_MASK;
if (max_insns == 0) { if (max_insns == 0) {
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
@ -11735,7 +11749,7 @@ void gen_intermediate_code_a64(DisasContextBase *dcbase, CPUState *cs,
/* if too long translation, save this info */ /* if too long translation, save this info */
if (tcg_op_buf_full(tcg_ctx) || dc->base.num_insns >= max_insns) { if (tcg_op_buf_full(tcg_ctx) || dc->base.num_insns >= max_insns) {
block_full = true; env->uc->block_full = true;
} }
//if (dc->base.tb->cflags & CF_LAST_IO) { //if (dc->base.tb->cflags & CF_LAST_IO) {
@ -11747,22 +11761,19 @@ tb_end:
gen_tb_end(tcg_ctx, tb, dc->base.num_insns); gen_tb_end(tcg_ctx, tb, dc->base.num_insns);
// Unicorn: commented out
#if 0
if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) &&
qemu_log_in_addr_range(dc->base.pc_first)) {
qemu_log_lock();
qemu_log("----------------\n");
qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));
log_target_disas(cs, dc->base.pc_first, dc->pc - dc->base.pc_first,
4 | (bswap_code(dc->sctlr_b) ? 2 : 0));
qemu_log("\n");
qemu_log_unlock();
}
#endif
dc->base.tb->size = dc->pc - dc->base.pc_first; dc->base.tb->size = dc->pc - dc->base.pc_first;
dc->base.tb->icount = dc->base.num_insns; dc->base.tb->icount = dc->base.num_insns;
env->uc->block_full = block_full; // Unicorn: commented out
#ifdef DEBUG_DISAS
if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) &&
qemu_log_in_addr_range(dc->base.pc_first)) {
//qemu_log_lock();
qemu_log("----------------\n");
//qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first));
aarch64_tr_disas_log(&dc->base, cs);
qemu_log("\n");
//qemu_log_unlock();
}
#endif
} }

2
qemu/target/arm/translate.c
View file

@ -12423,6 +12423,8 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
dc->base.num_insns = 0; dc->base.num_insns = 0;
dc->base.singlestep_enabled = cs->singlestep_enabled; dc->base.singlestep_enabled = cs->singlestep_enabled;
env->uc->block_full = false;
max_insns = tb->cflags & CF_COUNT_MASK; max_insns = tb->cflags & CF_COUNT_MASK;
if (max_insns == 0) { if (max_insns == 0) {
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;