OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/avr: Change ctx to DisasContext* in gen_intermediate_code 

Prepare for receiving it as a pointer input.

Tested-by: Michael Rolnik <mrolnik@gmail.com>
Reviewed-by: Michael Rolnik <mrolnik@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-06-19 22:42:40 -07:00
parent 93d4d5e485
commit bcef6d7601
1 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
target/avr/translate.c
View File

@ -104,7 +104,7 @@ struct DisasContext {
* used in the following manner (sketch) * used in the following manner (sketch)
* *
* TCGLabel *skip_label = NULL; * TCGLabel *skip_label = NULL;
* if (ctx.skip_cond != TCG_COND_NEVER) { * if (ctx->skip_cond != TCG_COND_NEVER) {
* skip_label = gen_new_label(); * skip_label = gen_new_label();
* tcg_gen_brcond_tl(skip_cond, skip_var0, skip_var1, skip_label); * tcg_gen_brcond_tl(skip_cond, skip_var0, skip_var1, skip_label);
* } * }
@ -114,7 +114,7 @@ struct DisasContext {
* free_skip_var0 = false; * free_skip_var0 = false;
* } * }
* *
* translate(&ctx); * translate(ctx);
* *
* if (skip_label) { * if (skip_label) {
* gen_set_label(skip_label); * gen_set_label(skip_label);
@ -2900,7 +2900,7 @@ static bool canonicalize_skip(DisasContext *ctx)
void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns) void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns)
{ {
CPUAVRState *env = cs->env_ptr; CPUAVRState *env = cs->env_ptr;
DisasContext ctx = { DisasContext ctx1 = {
.base.tb = tb, .base.tb = tb,
.base.is_jmp = DISAS_NEXT, .base.is_jmp = DISAS_NEXT,
.base.pc_first = tb->pc, .base.pc_first = tb->pc,
@ -2911,6 +2911,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns)
.memidx = 0, .memidx = 0,
.skip_cond = TCG_COND_NEVER, .skip_cond = TCG_COND_NEVER,
}; };
DisasContext *ctx = &ctx1;
target_ulong pc_start = tb->pc / 2; target_ulong pc_start = tb->pc / 2;
int num_insns = 0; int num_insns = 0;
@ -2921,23 +2922,23 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns)
*/ */
max_insns = 1; max_insns = 1;
} }
if (ctx.base.singlestep_enabled) { if (ctx->base.singlestep_enabled) {
max_insns = 1; max_insns = 1;
} }
gen_tb_start(tb); gen_tb_start(tb);
ctx.npc = pc_start; ctx->npc = pc_start;
if (tb->flags & TB_FLAGS_SKIP) { if (tb->flags & TB_FLAGS_SKIP) {
ctx.skip_cond = TCG_COND_ALWAYS; ctx->skip_cond = TCG_COND_ALWAYS;
ctx.skip_var0 = cpu_skip; ctx->skip_var0 = cpu_skip;
} }
do { do {
TCGLabel *skip_label = NULL; TCGLabel *skip_label = NULL;
/* translate current instruction */ /* translate current instruction */
tcg_gen_insn_start(ctx.npc); tcg_gen_insn_start(ctx->npc);
num_insns++; num_insns++;
/* /*
@ -2946,65 +2947,66 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns)
* b main - sets breakpoint at address 0x00000100 (code) * b main - sets breakpoint at address 0x00000100 (code)
* b *0x100 - sets breakpoint at address 0x00800100 (data) * b *0x100 - sets breakpoint at address 0x00800100 (data)
*/ */
if (unlikely(!ctx.base.singlestep_enabled && if (unlikely(!ctx->base.singlestep_enabled &&
(cpu_breakpoint_test(cs, OFFSET_CODE + ctx.npc * 2, BP_ANY) || (cpu_breakpoint_test(cs, OFFSET_CODE + ctx->npc * 2, BP_ANY) ||
cpu_breakpoint_test(cs, OFFSET_DATA + ctx.npc * 2, BP_ANY)))) { cpu_breakpoint_test(cs, OFFSET_DATA + ctx->npc * 2, BP_ANY)))) {
canonicalize_skip(&ctx); canonicalize_skip(ctx);
tcg_gen_movi_tl(cpu_pc, ctx.npc); tcg_gen_movi_tl(cpu_pc, ctx->npc);
gen_helper_debug(cpu_env); gen_helper_debug(cpu_env);
goto done_generating; goto done_generating;
} }
/* Conditionally skip the next instruction, if indicated. */ /* Conditionally skip the next instruction, if indicated. */
if (ctx.skip_cond != TCG_COND_NEVER) { if (ctx->skip_cond != TCG_COND_NEVER) {
skip_label = gen_new_label(); skip_label = gen_new_label();
if (ctx.skip_var0 == cpu_skip) { if (ctx->skip_var0 == cpu_skip) {
/* /*
* Copy cpu_skip so that we may zero it before the branch. * Copy cpu_skip so that we may zero it before the branch.
* This ensures that cpu_skip is non-zero after the label * This ensures that cpu_skip is non-zero after the label
* if and only if the skipped insn itself sets a skip. * if and only if the skipped insn itself sets a skip.
*/ */
ctx.free_skip_var0 = true; ctx->free_skip_var0 = true;
ctx.skip_var0 = tcg_temp_new(); ctx->skip_var0 = tcg_temp_new();
tcg_gen_mov_tl(ctx.skip_var0, cpu_skip); tcg_gen_mov_tl(ctx->skip_var0, cpu_skip);
tcg_gen_movi_tl(cpu_skip, 0); tcg_gen_movi_tl(cpu_skip, 0);
} }
if (ctx.skip_var1 == NULL) { if (ctx->skip_var1 == NULL) {
tcg_gen_brcondi_tl(ctx.skip_cond, ctx.skip_var0, 0, skip_label); tcg_gen_brcondi_tl(ctx->skip_cond, ctx->skip_var0,
0, skip_label);
} else { } else {
tcg_gen_brcond_tl(ctx.skip_cond, ctx.skip_var0, tcg_gen_brcond_tl(ctx->skip_cond, ctx->skip_var0,
ctx.skip_var1, skip_label); ctx->skip_var1, skip_label);
ctx.skip_var1 = NULL; ctx->skip_var1 = NULL;
} }
if (ctx.free_skip_var0) { if (ctx->free_skip_var0) {
tcg_temp_free(ctx.skip_var0); tcg_temp_free(ctx->skip_var0);
ctx.free_skip_var0 = false; ctx->free_skip_var0 = false;
} }
ctx.skip_cond = TCG_COND_NEVER; ctx->skip_cond = TCG_COND_NEVER;
ctx.skip_var0 = NULL; ctx->skip_var0 = NULL;
} }
translate(&ctx); translate(ctx);
if (skip_label) { if (skip_label) {
canonicalize_skip(&ctx); canonicalize_skip(ctx);
gen_set_label(skip_label); gen_set_label(skip_label);
if (ctx.base.is_jmp == DISAS_NORETURN) { if (ctx->base.is_jmp == DISAS_NORETURN) {
ctx.base.is_jmp = DISAS_CHAIN; ctx->base.is_jmp = DISAS_CHAIN;
} }
} }
} while (ctx.base.is_jmp == DISAS_NEXT } while (ctx->base.is_jmp == DISAS_NEXT
&& num_insns < max_insns && num_insns < max_insns
&& (ctx.npc - pc_start) * 2 < TARGET_PAGE_SIZE - 4 && (ctx->npc - pc_start) * 2 < TARGET_PAGE_SIZE - 4
&& !tcg_op_buf_full()); && !tcg_op_buf_full());
if (tb->cflags & CF_LAST_IO) { if (tb->cflags & CF_LAST_IO) {
gen_io_end(); gen_io_end();
} }
bool nonconst_skip = canonicalize_skip(&ctx); bool nonconst_skip = canonicalize_skip(ctx);
switch (ctx.base.is_jmp) { switch (ctx->base.is_jmp) {
case DISAS_NORETURN: case DISAS_NORETURN:
assert(!nonconst_skip); assert(!nonconst_skip);
break; break;
@ -3013,19 +3015,19 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns)
case DISAS_CHAIN: case DISAS_CHAIN:
if (!nonconst_skip) { if (!nonconst_skip) {
/* Note gen_goto_tb checks singlestep. */ /* Note gen_goto_tb checks singlestep. */
gen_goto_tb(&ctx, 1, ctx.npc); gen_goto_tb(ctx, 1, ctx->npc);
break; break;
} }
tcg_gen_movi_tl(cpu_pc, ctx.npc); tcg_gen_movi_tl(cpu_pc, ctx->npc);
/* fall through */ /* fall through */
case DISAS_LOOKUP: case DISAS_LOOKUP:
if (!ctx.base.singlestep_enabled) { if (!ctx->base.singlestep_enabled) {
tcg_gen_lookup_and_goto_ptr(); tcg_gen_lookup_and_goto_ptr();
break; break;
} }
/* fall through */ /* fall through */
case DISAS_EXIT: case DISAS_EXIT:
if (ctx.base.singlestep_enabled) { if (ctx->base.singlestep_enabled) {
gen_helper_debug(cpu_env); gen_helper_debug(cpu_env);
} else { } else {
tcg_gen_exit_tb(NULL, 0); tcg_gen_exit_tb(NULL, 0);
@ -3038,7 +3040,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns)
done_generating: done_generating:
gen_tb_end(tb, num_insns); gen_tb_end(tb, num_insns);
tb->size = (ctx.npc - pc_start) * 2; tb->size = (ctx->npc - pc_start) * 2;
tb->icount = num_insns; tb->icount = num_insns;
#ifdef DEBUG_DISAS #ifdef DEBUG_DISAS