ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/cris: Use translator_ld* in cris_fetch 

Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-04-04 23:11:25 -10:00
parent 6c19920725
commit 32e07f7dec
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
target/cris/translate.c
View File

@ -222,37 +222,28 @@ static int sign_extend(unsigned int val, unsigned int width)
} }
static int cris_fetch(CPUCRISState *env, DisasContext *dc, uint32_t addr, static int cris_fetch(CPUCRISState *env, DisasContext *dc, uint32_t addr,
unsigned int size, unsigned int sign) unsigned int size, bool sign)
{ {
int r; int r;
switch (size) { switch (size) {
case 4: case 4:
{ r = translator_ldl(env, &dc->base, addr);
r = cpu_ldl_code(env, addr);
break; break;
}
case 2: case 2:
{ r = translator_lduw(env, &dc->base, addr);
if (sign) { if (sign) {
r = cpu_ldsw_code(env, addr); r = (int16_t)r;
} else {
r = cpu_lduw_code(env, addr);
} }
break; break;
}
case 1: case 1:
{ r = translator_ldub(env, &dc->base, addr);
if (sign) { if (sign) {
r = cpu_ldsb_code(env, addr); r = (int8_t)r;
} else {
r = cpu_ldub_code(env, addr);
} }
break; break;
}
default: default:
cpu_abort(CPU(dc->cpu), "Invalid fetch size %d\n", size); g_assert_not_reached();
break;
} }
return r; return r;
} }
@ -2868,7 +2859,7 @@ static unsigned int crisv32_decoder(CPUCRISState *env, DisasContext *dc)
int i; int i;
/* Load a halfword onto the instruction register. */ /* Load a halfword onto the instruction register. */
dc->ir = cris_fetch(env, dc, dc->pc, 2, 0); dc->ir = cris_fetch(env, dc, dc->pc, 2, 0);
/* Now decode it. */ /* Now decode it. */
dc->opcode = EXTRACT_FIELD(dc->ir, 4, 11); dc->opcode = EXTRACT_FIELD(dc->ir, 4, 11);