From: Frank Chang <[email protected]> Rename riscv_pm_get_virt_pmm() to riscv_pm_get_vm_ldst_pmm() to better reflect its actual usage. This function is used when checking the PMM field for virtual-machine load/store instructions (HLV.* and HSV.*), rather than for VS/VU modes.
Signed-off-by: Frank Chang <[email protected]> Reviewed-by: Daniel Henrique Barboza <[email protected]> Reviewed-by: Alistair Francis <[email protected]> Message-ID: <[email protected]> Signed-off-by: Alistair Francis <[email protected]> --- target/riscv/cpu.h | 2 +- target/riscv/internals.h | 2 +- target/riscv/cpu_helper.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 672f0dab0f..138183e017 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -890,7 +890,7 @@ bool riscv_cpu_is_32bit(RISCVCPU *cpu); bool riscv_cpu_virt_mem_enabled(CPURISCVState *env); RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env); -RISCVPmPmm riscv_pm_get_virt_pmm(CPURISCVState *env); +RISCVPmPmm riscv_pm_get_vm_ldst_pmm(CPURISCVState *env); uint32_t riscv_pm_get_pmlen(RISCVPmPmm pmm); RISCVException riscv_csrr(CPURISCVState *env, int csrno, diff --git a/target/riscv/internals.h b/target/riscv/internals.h index d090db2641..7eb6edbe90 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -209,7 +209,7 @@ static inline target_ulong adjust_addr_body(CPURISCVState *env, /* get pmm field depending on whether addr is */ if (is_virt_addr) { - pmm = riscv_pm_get_virt_pmm(env); + pmm = riscv_pm_get_vm_ldst_pmm(env); } else { pmm = riscv_pm_get_pmm(env); } diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 2b3fea81d5..ef1ff7cb0b 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -214,7 +214,7 @@ RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env) #endif } -RISCVPmPmm riscv_pm_get_virt_pmm(CPURISCVState *env) +RISCVPmPmm riscv_pm_get_vm_ldst_pmm(CPURISCVState *env) { #ifndef CONFIG_USER_ONLY int priv_mode; -- 2.53.0
