mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/tricore: Use DisasContextBase API

Browse Source 
this gets rid of the copied fields of TriCore's DisasContext and now
uses the shared DisasContextBase, which is necessary for the conversion
to translate_loop.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
This commit is contained in:
Bastian Koppelmann 2019-06-17 11:53:03 +02:00
parent fe066b4848
commit 6b9f5a421e
1 changed files with 44 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
target/tricore/translate.c
View File

@ -30,6 +30,7 @@
#include "exec/helper-gen.h" #include "exec/helper-gen.h"
#include "tricore-opcodes.h" #include "tricore-opcodes.h"
#include "exec/translator.h"
#include "exec/log.h" #include "exec/log.h"
/* /*
@ -64,24 +65,14 @@ static const char *regnames_d[] = {
}; };
typedef struct DisasContext { typedef struct DisasContext {
struct TranslationBlock *tb; DisasContextBase base;
target_ulong pc, saved_pc, next_pc; target_ulong pc_succ_insn;
uint32_t opcode; uint32_t opcode;
int singlestep_enabled;
/* Routine used to access memory */ /* Routine used to access memory */
int mem_idx; int mem_idx;
uint32_t hflags, saved_hflags; uint32_t hflags, saved_hflags;
int bstate;
} DisasContext; } DisasContext;
enum {
BS_NONE = 0,
BS_STOP = 1,
BS_BRANCH = 2,
BS_EXCP = 3,
};
enum { enum {
MODE_LL = 0, MODE_LL = 0,
MODE_LU = 1, MODE_LU = 1,
@ -3230,12 +3221,12 @@ static inline void gen_save_pc(target_ulong pc)
static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest) static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest)
{ {
if (unlikely(ctx->singlestep_enabled)) { if (unlikely(ctx->base.singlestep_enabled)) {
return false; return false;
} }
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
return (ctx->tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK); return (ctx->base.tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK);
#else #else
return true; return true;
#endif #endif
@ -3246,10 +3237,10 @@ static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest)
if (use_goto_tb(ctx, dest)) { if (use_goto_tb(ctx, dest)) {
tcg_gen_goto_tb(n); tcg_gen_goto_tb(n);
gen_save_pc(dest); gen_save_pc(dest);
tcg_gen_exit_tb(ctx->tb, n); tcg_gen_exit_tb(ctx->base.tb, n);
} else { } else {
gen_save_pc(dest); gen_save_pc(dest);
if (ctx->singlestep_enabled) { if (ctx->base.singlestep_enabled) {
/* raise exception debug */ /* raise exception debug */
} }
tcg_gen_exit_tb(NULL, 0); tcg_gen_exit_tb(NULL, 0);
@ -3261,9 +3252,9 @@ static void generate_trap(DisasContext *ctx, int class, int tin)
TCGv_i32 classtemp = tcg_const_i32(class); TCGv_i32 classtemp = tcg_const_i32(class);
TCGv_i32 tintemp = tcg_const_i32(tin); TCGv_i32 tintemp = tcg_const_i32(tin);
gen_save_pc(ctx->pc); gen_save_pc(ctx->base.pc_next);
gen_helper_raise_exception_sync(cpu_env, classtemp, tintemp); gen_helper_raise_exception_sync(cpu_env, classtemp, tintemp);
ctx->bstate = BS_EXCP; ctx->base.is_jmp = DISAS_NORETURN;
tcg_temp_free(classtemp); tcg_temp_free(classtemp);
tcg_temp_free(tintemp); tcg_temp_free(tintemp);
@ -3275,10 +3266,10 @@ static inline void gen_branch_cond(DisasContext *ctx, TCGCond cond, TCGv r1,
TCGLabel *jumpLabel = gen_new_label(); TCGLabel *jumpLabel = gen_new_label();
tcg_gen_brcond_tl(cond, r1, r2, jumpLabel); tcg_gen_brcond_tl(cond, r1, r2, jumpLabel);
gen_goto_tb(ctx, 1, ctx->next_pc); gen_goto_tb(ctx, 1, ctx->pc_succ_insn);
gen_set_label(jumpLabel); gen_set_label(jumpLabel);
gen_goto_tb(ctx, 0, ctx->pc + address * 2); gen_goto_tb(ctx, 0, ctx->base.pc_next + address * 2);
} }
static inline void gen_branch_condi(DisasContext *ctx, TCGCond cond, TCGv r1, static inline void gen_branch_condi(DisasContext *ctx, TCGCond cond, TCGv r1,
@ -3295,9 +3286,9 @@ static void gen_loop(DisasContext *ctx, int r1, int32_t offset)
tcg_gen_subi_tl(cpu_gpr_a[r1], cpu_gpr_a[r1], 1); tcg_gen_subi_tl(cpu_gpr_a[r1], cpu_gpr_a[r1], 1);
tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_gpr_a[r1], -1, l1); tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_gpr_a[r1], -1, l1);
gen_goto_tb(ctx, 1, ctx->pc + offset); gen_goto_tb(ctx, 1, ctx->base.pc_next + offset);
gen_set_label(l1); gen_set_label(l1);
gen_goto_tb(ctx, 0, ctx->next_pc); gen_goto_tb(ctx, 0, ctx->pc_succ_insn);
} }
static void gen_fcall_save_ctx(DisasContext *ctx) static void gen_fcall_save_ctx(DisasContext *ctx)
@ -3306,7 +3297,7 @@ static void gen_fcall_save_ctx(DisasContext *ctx)
tcg_gen_addi_tl(temp, cpu_gpr_a[10], -4); tcg_gen_addi_tl(temp, cpu_gpr_a[10], -4);
tcg_gen_qemu_st_tl(cpu_gpr_a[11], temp, ctx->mem_idx, MO_LESL); tcg_gen_qemu_st_tl(cpu_gpr_a[11], temp, ctx->mem_idx, MO_LESL);
tcg_gen_movi_tl(cpu_gpr_a[11], ctx->next_pc); tcg_gen_movi_tl(cpu_gpr_a[11], ctx->pc_succ_insn);
tcg_gen_mov_tl(cpu_gpr_a[10], temp); tcg_gen_mov_tl(cpu_gpr_a[10], temp);
tcg_temp_free(temp); tcg_temp_free(temp);
@ -3321,7 +3312,7 @@ static void gen_fret(DisasContext *ctx)
tcg_gen_addi_tl(cpu_gpr_a[10], cpu_gpr_a[10], 4); tcg_gen_addi_tl(cpu_gpr_a[10], cpu_gpr_a[10], 4);
tcg_gen_mov_tl(cpu_PC, temp); tcg_gen_mov_tl(cpu_PC, temp);
tcg_gen_exit_tb(NULL, 0); tcg_gen_exit_tb(NULL, 0);
ctx->bstate = BS_BRANCH; ctx->base.is_jmp = DISAS_NORETURN;
tcg_temp_free(temp); tcg_temp_free(temp);
} }
@ -3336,12 +3327,12 @@ static void gen_compute_branch(DisasContext *ctx, uint32_t opc, int r1,
/* SB-format jumps */ /* SB-format jumps */
case OPC1_16_SB_J: case OPC1_16_SB_J:
case OPC1_32_B_J: case OPC1_32_B_J:
gen_goto_tb(ctx, 0, ctx->pc + offset * 2); gen_goto_tb(ctx, 0, ctx->base.pc_next + offset * 2);
break; break;
case OPC1_32_B_CALL: case OPC1_32_B_CALL:
case OPC1_16_SB_CALL: case OPC1_16_SB_CALL:
gen_helper_1arg(call, ctx->next_pc); gen_helper_1arg(call, ctx->pc_succ_insn);
gen_goto_tb(ctx, 0, ctx->pc + offset * 2); gen_goto_tb(ctx, 0, ctx->base.pc_next + offset * 2);
break; break;
case OPC1_16_SB_JZ: case OPC1_16_SB_JZ:
gen_branch_condi(ctx, TCG_COND_EQ, cpu_gpr_d[15], 0, offset); gen_branch_condi(ctx, TCG_COND_EQ, cpu_gpr_d[15], 0, offset);
@ -3433,26 +3424,26 @@ static void gen_compute_branch(DisasContext *ctx, uint32_t opc, int r1,
break; break;
/* B-format */ /* B-format */
case OPC1_32_B_CALLA: case OPC1_32_B_CALLA:
gen_helper_1arg(call, ctx->next_pc); gen_helper_1arg(call, ctx->pc_succ_insn);
gen_goto_tb(ctx, 0, EA_B_ABSOLUT(offset)); gen_goto_tb(ctx, 0, EA_B_ABSOLUT(offset));
break; break;
case OPC1_32_B_FCALL: case OPC1_32_B_FCALL:
gen_fcall_save_ctx(ctx); gen_fcall_save_ctx(ctx);
gen_goto_tb(ctx, 0, ctx->pc + offset * 2); gen_goto_tb(ctx, 0, ctx->base.pc_next + offset * 2);
break; break;
case OPC1_32_B_FCALLA: case OPC1_32_B_FCALLA:
gen_fcall_save_ctx(ctx); gen_fcall_save_ctx(ctx);
gen_goto_tb(ctx, 0, EA_B_ABSOLUT(offset)); gen_goto_tb(ctx, 0, EA_B_ABSOLUT(offset));
break; break;
case OPC1_32_B_JLA: case OPC1_32_B_JLA:
tcg_gen_movi_tl(cpu_gpr_a[11], ctx->next_pc); tcg_gen_movi_tl(cpu_gpr_a[11], ctx->pc_succ_insn);
/* fall through */ /* fall through */
case OPC1_32_B_JA: case OPC1_32_B_JA:
gen_goto_tb(ctx, 0, EA_B_ABSOLUT(offset)); gen_goto_tb(ctx, 0, EA_B_ABSOLUT(offset));
break; break;
case OPC1_32_B_JL: case OPC1_32_B_JL:
tcg_gen_movi_tl(cpu_gpr_a[11], ctx->next_pc); tcg_gen_movi_tl(cpu_gpr_a[11], ctx->pc_succ_insn);
gen_goto_tb(ctx, 0, ctx->pc + offset * 2); gen_goto_tb(ctx, 0, ctx->base.pc_next + offset * 2);
break; break;
/* BOL format */ /* BOL format */
case OPCM_32_BRC_EQ_NEQ: case OPCM_32_BRC_EQ_NEQ:
@ -3551,7 +3542,7 @@ static void gen_compute_branch(DisasContext *ctx, uint32_t opc, int r1,
gen_loop(ctx, r2, offset * 2); gen_loop(ctx, r2, offset * 2);
} else { } else {
/* OPC2_32_BRR_LOOPU */ /* OPC2_32_BRR_LOOPU */
gen_goto_tb(ctx, 0, ctx->pc + offset * 2); gen_goto_tb(ctx, 0, ctx->base.pc_next + offset * 2);
} }
break; break;
case OPCM_32_BRR_JNE: case OPCM_32_BRR_JNE:
@ -3585,7 +3576,7 @@ static void gen_compute_branch(DisasContext *ctx, uint32_t opc, int r1,
default: default:
generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC); generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC);
} }
ctx->bstate = BS_BRANCH; ctx->base.is_jmp = DISAS_NORETURN;
} }
@ -3933,7 +3924,7 @@ static void decode_sr_system(CPUTriCoreState *env, DisasContext *ctx)
case OPC2_16_SR_RFE: case OPC2_16_SR_RFE:
gen_helper_rfe(cpu_env); gen_helper_rfe(cpu_env);
tcg_gen_exit_tb(NULL, 0); tcg_gen_exit_tb(NULL, 0);
ctx->bstate = BS_BRANCH; ctx->base.is_jmp = DISAS_NORETURN;
break; break;
case OPC2_16_SR_DEBUG: case OPC2_16_SR_DEBUG:
/* raise EXCP_DEBUG */ /* raise EXCP_DEBUG */
@ -6557,11 +6548,11 @@ static void decode_rr_idirect(CPUTriCoreState *env, DisasContext *ctx)
tcg_gen_andi_tl(cpu_PC, cpu_gpr_a[r1], ~0x1); tcg_gen_andi_tl(cpu_PC, cpu_gpr_a[r1], ~0x1);
break; break;
case OPC2_32_RR_JLI: case OPC2_32_RR_JLI:
tcg_gen_movi_tl(cpu_gpr_a[11], ctx->next_pc); tcg_gen_movi_tl(cpu_gpr_a[11], ctx->pc_succ_insn);
tcg_gen_andi_tl(cpu_PC, cpu_gpr_a[r1], ~0x1); tcg_gen_andi_tl(cpu_PC, cpu_gpr_a[r1], ~0x1);
break; break;
case OPC2_32_RR_CALLI: case OPC2_32_RR_CALLI:
gen_helper_1arg(call, ctx->next_pc); gen_helper_1arg(call, ctx->pc_succ_insn);
tcg_gen_andi_tl(cpu_PC, cpu_gpr_a[r1], ~0x1); tcg_gen_andi_tl(cpu_PC, cpu_gpr_a[r1], ~0x1);
break; break;
case OPC2_32_RR_FCALLI: case OPC2_32_RR_FCALLI:
@ -6572,7 +6563,7 @@ static void decode_rr_idirect(CPUTriCoreState *env, DisasContext *ctx)
generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC); generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC);
} }
tcg_gen_exit_tb(NULL, 0); tcg_gen_exit_tb(NULL, 0);
ctx->bstate = BS_BRANCH; ctx->base.is_jmp = DISAS_NORETURN;
} }
static void decode_rr_divide(CPUTriCoreState *env, DisasContext *ctx) static void decode_rr_divide(CPUTriCoreState *env, DisasContext *ctx)
@ -8391,7 +8382,7 @@ static void decode_sys_interrupts(CPUTriCoreState *env, DisasContext *ctx)
case OPC2_32_SYS_RFE: case OPC2_32_SYS_RFE:
gen_helper_rfe(cpu_env); gen_helper_rfe(cpu_env);
tcg_gen_exit_tb(NULL, 0); tcg_gen_exit_tb(NULL, 0);
ctx->bstate = BS_BRANCH; ctx->base.is_jmp = DISAS_NORETURN;
break; break;
case OPC2_32_SYS_RFM: case OPC2_32_SYS_RFM:
if ((ctx->hflags & TRICORE_HFLAG_KUU) == TRICORE_HFLAG_SM) { if ((ctx->hflags & TRICORE_HFLAG_KUU) == TRICORE_HFLAG_SM) {
@ -8404,7 +8395,7 @@ static void decode_sys_interrupts(CPUTriCoreState *env, DisasContext *ctx)
gen_helper_rfm(cpu_env); gen_helper_rfm(cpu_env);
gen_set_label(l1); gen_set_label(l1);
tcg_gen_exit_tb(NULL, 0); tcg_gen_exit_tb(NULL, 0);
ctx->bstate = BS_BRANCH; ctx->base.is_jmp = DISAS_NORETURN;
tcg_temp_free(tmp); tcg_temp_free(tmp);
} else { } else {
/* generate privilege trap */ /* generate privilege trap */
@ -8790,11 +8781,11 @@ static void decode_opc(CPUTriCoreState *env, DisasContext *ctx, int *is_branch)
{ {
/* 16-Bit Instruction */ /* 16-Bit Instruction */
if ((ctx->opcode & 0x1) == 0) { if ((ctx->opcode & 0x1) == 0) {
ctx->next_pc = ctx->pc + 2; ctx->pc_succ_insn = ctx->base.pc_next + 2;
decode_16Bit_opc(env, ctx); decode_16Bit_opc(env, ctx);
/* 32-Bit Instruction */ /* 32-Bit Instruction */
} else { } else {
ctx->next_pc = ctx->pc + 4; ctx->pc_succ_insn = ctx->base.pc_next + 4;
decode_32Bit_opc(env, ctx); decode_32Bit_opc(env, ctx);
} }
} }
@ -8807,33 +8798,32 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns)
int num_insns = 0; int num_insns = 0;
pc_start = tb->pc; pc_start = tb->pc;
ctx.pc = pc_start; ctx.base.pc_next = pc_start;
ctx.saved_pc = -1; ctx.base.tb = tb;
ctx.tb = tb; ctx.base.singlestep_enabled = cs->singlestep_enabled;
ctx.singlestep_enabled = cs->singlestep_enabled; ctx.base.is_jmp = DISAS_NEXT;
ctx.bstate = BS_NONE;
ctx.mem_idx = cpu_mmu_index(env, false); ctx.mem_idx = cpu_mmu_index(env, false);
ctx.hflags = (uint32_t)tb->flags; ctx.hflags = (uint32_t)tb->flags;
tcg_clear_temp_count(); tcg_clear_temp_count();
gen_tb_start(tb); gen_tb_start(tb);
while (ctx.bstate == BS_NONE) { while (ctx.base.is_jmp == DISAS_NEXT) {
tcg_gen_insn_start(ctx.pc); tcg_gen_insn_start(ctx.base.pc_next);
num_insns++; num_insns++;
ctx.opcode = cpu_ldl_code(env, ctx.pc); ctx.opcode = cpu_ldl_code(env, ctx.base.pc_next);
decode_opc(env, &ctx, 0); decode_opc(env, &ctx, 0);
if (num_insns >= max_insns || tcg_op_buf_full()) { if (num_insns >= max_insns || tcg_op_buf_full()) {
gen_save_pc(ctx.next_pc); gen_save_pc(ctx.pc_succ_insn);
tcg_gen_exit_tb(NULL, 0); tcg_gen_exit_tb(NULL, 0);
break; break;
} }
ctx.pc = ctx.next_pc; ctx.base.pc_next = ctx.pc_succ_insn;
} }
gen_tb_end(tb, num_insns); gen_tb_end(tb, num_insns);
tb->size = ctx.pc - pc_start; tb->size = ctx.base.pc_next - pc_start;
tb->icount = num_insns; tb->icount = num_insns;
if (tcg_check_temp_count()) { if (tcg_check_temp_count()) {
@ -8845,7 +8835,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns)
&& qemu_log_in_addr_range(pc_start)) { && qemu_log_in_addr_range(pc_start)) {
qemu_log_lock(); qemu_log_lock();
qemu_log("IN: %s\n", lookup_symbol(pc_start)); qemu_log("IN: %s\n", lookup_symbol(pc_start));
log_target_disas(cs, pc_start, ctx.pc - pc_start); log_target_disas(cs, pc_start, ctx.base.pc_next - pc_start);
qemu_log("\n"); qemu_log("\n");
qemu_log_unlock(); qemu_log_unlock();
} }