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

target/mips: Extend gen_scwp() functionality to support EVA 

Extend gen_scwp() functionality to support EVA by adding an
additional argument, modify internals of the function to handle
new functionality, and accordingly change its invocations.

Reviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com>
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
This commit is contained in:
Aleksandar Markovic 2019-01-21 14:37:46 +01:00
parent 5b1e098128
commit 8d5388c1de
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/mips/translate.c
View File

@ -3714,7 +3714,7 @@ static void gen_st_cond (DisasContext *ctx, uint32_t opc, int rt,
} }
static void gen_scwp(DisasContext *ctx, uint32_t base, int16_t offset, static void gen_scwp(DisasContext *ctx, uint32_t base, int16_t offset,
uint32_t reg1, uint32_t reg2) uint32_t reg1, uint32_t reg2, bool eva)
{ {
TCGv taddr = tcg_temp_local_new(); TCGv taddr = tcg_temp_local_new();
TCGv lladdr = tcg_temp_local_new(); TCGv lladdr = tcg_temp_local_new();
@ -3742,7 +3742,7 @@ static void gen_scwp(DisasContext *ctx, uint32_t base, int16_t offset,
tcg_gen_ld_i64(llval, cpu_env, offsetof(CPUMIPSState, llval_wp)); tcg_gen_ld_i64(llval, cpu_env, offsetof(CPUMIPSState, llval_wp));
tcg_gen_atomic_cmpxchg_i64(val, taddr, llval, tval, tcg_gen_atomic_cmpxchg_i64(val, taddr, llval, tval,
ctx->mem_idx, MO_64); eva ? MIPS_HFLAG_UM : ctx->mem_idx, MO_64);
if (reg1 != 0) { if (reg1 != 0) {
tcg_gen_movi_tl(cpu_gpr[reg1], 1); tcg_gen_movi_tl(cpu_gpr[reg1], 1);
} }
@ -21550,7 +21550,8 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *env, DisasContext *ctx)
break; break;
case NM_SCWP: case NM_SCWP:
check_xnp(ctx); check_xnp(ctx);
gen_scwp(ctx, rs, 0, rt, extract32(ctx->opcode, 3, 5)); gen_scwp(ctx, rs, 0, rt, extract32(ctx->opcode, 3, 5),
false);
break; break;
} }
break; break;
@ -21654,7 +21655,8 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *env, DisasContext *ctx)
check_xnp(ctx); check_xnp(ctx);
check_eva(ctx); check_eva(ctx);
check_cp0_enabled(ctx); check_cp0_enabled(ctx);
gen_scwp(ctx, rs, 0, rt, extract32(ctx->opcode, 3, 5)); gen_scwp(ctx, rs, 0, rt, extract32(ctx->opcode, 3, 5),
true);
break; break;
default: default:
generate_exception_end(ctx, EXCP_RI); generate_exception_end(ctx, EXCP_RI);