Commit 8d5388c1 authored by Aleksandar Markovic's avatar Aleksandar Markovic
Browse files

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: default avatarAleksandar Rikalo <arikalo@wavecomp.com>
Signed-off-by: default avatarAleksandar Markovic <amarkovic@wavecomp.com>
parent 5b1e0981

target/mips/translate.c

+6 −4
Original line number Diff line number Diff line
@@ -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,









                    uint32_t reg1, uint32_t reg2)









                    uint32_t reg1, uint32_t reg2, bool eva)









{









    TCGv taddr = 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_atomic_cmpxchg_i64(val, taddr, llval, tval,









                               ctx->mem_idx, MO_64);









                               eva ? MIPS_HFLAG_UM : ctx->mem_idx, MO_64);









    if (reg1 != 0) {









        tcg_gen_movi_tl(cpu_gpr[reg1], 1);









    }








@@ -21550,7 +21550,8 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *env, DisasContext *ctx)







                        break;









                    case NM_SCWP:









                        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;








@@ -21654,7 +21655,8 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *env, DisasContext *ctx)







                        check_xnp(ctx);









                        check_eva(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;









                    default:









                        generate_exception_end(ctx, EXCP_RI);