yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-24 22:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/riscv: Add hfence instructions

Browse source 
Backports commit 895c412cb6e79b7b08bd3c2d2fcb70a3cab6ff8a from qemu
This commit is contained in:
Alistair Francis 2020-03-22 01:43:51 -04:00 committed by Lioncash
parent fcc30eac4d
commit 13a7b74827
2 changed files with 56 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
qemu/target/riscv/insn32.decode
View file

@ -63,20 +63,25 @@
@r2_rm ....... ..... ..... ... ..... ....... %rs1 %rm %rd @r2_rm ....... ..... ..... ... ..... ....... %rs1 %rm %rd
@r2 ....... ..... ..... ... ..... ....... %rs1 %rd @r2 ....... ..... ..... ... ..... ....... %rs1 %rd
@hfence_gvma ....... ..... ..... ... ..... ....... %rs2 %rs1
@hfence_bvma ....... ..... ..... ... ..... ....... %rs2 %rs1
@sfence_vma ....... ..... ..... ... ..... ....... %rs2 %rs1 @sfence_vma ....... ..... ..... ... ..... ....... %rs2 %rs1
@sfence_vm ....... ..... ..... ... ..... ....... %rs1 @sfence_vm ....... ..... ..... ... ..... ....... %rs1
# *** Privileged Instructions *** # *** Privileged Instructions ***
ecall 000000000000 00000 000 00000 1110011 ecall 000000000000 00000 000 00000 1110011
ebreak 000000000001 00000 000 00000 1110011 ebreak 000000000001 00000 000 00000 1110011
uret 0000000 00010 00000 000 00000 1110011 uret 0000000 00010 00000 000 00000 1110011
sret 0001000 00010 00000 000 00000 1110011 sret 0001000 00010 00000 000 00000 1110011
hret 0010000 00010 00000 000 00000 1110011 hret 0010000 00010 00000 000 00000 1110011
mret 0011000 00010 00000 000 00000 1110011 mret 0011000 00010 00000 000 00000 1110011
wfi 0001000 00101 00000 000 00000 1110011 wfi 0001000 00101 00000 000 00000 1110011
sfence_vma 0001001 ..... ..... 000 00000 1110011 @sfence_vma hfence_gvma 0110001 ..... ..... 000 00000 1110011 @hfence_gvma
sfence_vm 0001000 00100 ..... 000 00000 1110011 @sfence_vm hfence_bvma 0010001 ..... ..... 000 00000 1110011 @hfence_bvma
sfence_vma 0001001 ..... ..... 000 00000 1110011 @sfence_vma
sfence_vm 0001000 00100 ..... 000 00000 1110011 @sfence_vm
# *** RV32I Base Instruction Set *** # *** RV32I Base Instruction Set ***
lui .................... ..... 0110111 @u lui .................... ..... 0110111 @u

42
qemu/target/riscv/insn_trans/trans_privileged.inc.c
View file

@ -113,3 +113,45 @@ static bool trans_sfence_vm(DisasContext *ctx, arg_sfence_vm *a)
#endif #endif
return false; return false;
} }
static bool trans_hfence_gvma(DisasContext *ctx, arg_sfence_vma *a)
{
#ifndef CONFIG_USER_ONLY
TCGContext *tcg_ctx = ctx->uc->tcg_ctx;
if (ctx->priv_ver >= PRIV_VERSION_1_10_0 &&
has_ext(ctx, RVH)) {
/* Hpervisor extensions exist */
/*
* if (env->priv == PRV_M ||
* (env->priv == PRV_S &&
* !riscv_cpu_virt_enabled(env) &&
* get_field(ctx->mstatus_fs, MSTATUS_TVM))) {
*/
gen_helper_tlb_flush(tcg_ctx, tcg_ctx->cpu_env);
return true;
/* } */
}
#endif
return false;
}
static bool trans_hfence_bvma(DisasContext *ctx, arg_sfence_vma *a)
{
#ifndef CONFIG_USER_ONLY
TCGContext *tcg_ctx = ctx->uc->tcg_ctx;
if (ctx->priv_ver >= PRIV_VERSION_1_10_0 &&
has_ext(ctx, RVH)) {
/* Hpervisor extensions exist */
/*
* if (env->priv == PRV_M ||
* (env->priv == PRV_S &&
* !riscv_cpu_virt_enabled(env) &&
* get_field(ctx->mstatus_fs, MSTATUS_TVM))) {
*/
gen_helper_tlb_flush(tcg_ctx, tcg_ctx->cpu_env);
return true;
/* } */
}
#endif
return false;
}