Skip to content

Commit

Permalink
target/tricore: Replace cpu_*_code with translator_*
Browse files Browse the repository at this point in the history
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230828112651.522058-11-kbastian@mail.uni-paderborn.de>
  • Loading branch information
bkoppelmann committed Sep 28, 2023
1 parent 222ff2d commit 1f22db1
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions target/tricore/translate.c
Original file line number Diff line number Diff line change
Expand Up @@ -8398,7 +8398,7 @@ static bool insn_crosses_page(CPUTriCoreState *env, DisasContext *ctx)
* 4 bytes from the page boundary, so we cross the page if the first
* 16 bits indicate that this is a 32 bit insn.
*/
uint16_t insn = cpu_lduw_code(env, ctx->base.pc_next);
uint16_t insn = translator_lduw(env, &ctx->base, ctx->base.pc_next);

return !tricore_insn_is_16bit(insn);
}
Expand All @@ -8411,14 +8411,15 @@ static void tricore_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
uint16_t insn_lo;
bool is_16bit;

insn_lo = cpu_lduw_code(env, ctx->base.pc_next);
insn_lo = translator_lduw(env, &ctx->base, ctx->base.pc_next);
is_16bit = tricore_insn_is_16bit(insn_lo);
if (is_16bit) {
ctx->opcode = insn_lo;
ctx->pc_succ_insn = ctx->base.pc_next + 2;
decode_16Bit_opc(ctx);
} else {
uint32_t insn_hi = cpu_lduw_code(env, ctx->base.pc_next + 2);
uint32_t insn_hi = translator_lduw(env, &ctx->base,
ctx->base.pc_next + 2);
ctx->opcode = insn_hi << 16 | insn_lo;
ctx->pc_succ_insn = ctx->base.pc_next + 4;
decode_32Bit_opc(ctx);
Expand Down

0 comments on commit 1f22db1

Please sign in to comment.