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

target/riscv: Separate pmp_update_rule() in pmpcfg_csr_write 

Use pmp_update_rule_addr() and pmp_update_rule_nums() separately to
update rule nums only once for each pmpcfg_csr_write. Then remove
pmp_update_rule() since it become unused.

Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn>
Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20230517091519.34439-12-liweiwei@iscas.ac.cn>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Weiwei Li 2023-05-17 17:15:18 +08:00 committed by Alistair Francis
parent e924074f13
commit 1b63f2fee6
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/riscv/pmp.c
View File

@ -29,7 +29,6 @@
static bool pmp_write_cfg(CPURISCVState *env, uint32_t addr_index, static bool pmp_write_cfg(CPURISCVState *env, uint32_t addr_index,
uint8_t val); uint8_t val);
static uint8_t pmp_read_cfg(CPURISCVState *env, uint32_t addr_index); static uint8_t pmp_read_cfg(CPURISCVState *env, uint32_t addr_index);
static void pmp_update_rule(CPURISCVState *env, uint32_t pmp_index);
/* /*
* Accessor method to extract address matching type 'a field' from cfg reg * Accessor method to extract address matching type 'a field' from cfg reg
@ -121,7 +120,7 @@ static bool pmp_write_cfg(CPURISCVState *env, uint32_t pmp_index, uint8_t val)
qemu_log_mask(LOG_GUEST_ERROR, "ignoring pmpcfg write - locked\n"); qemu_log_mask(LOG_GUEST_ERROR, "ignoring pmpcfg write - locked\n");
} else if (env->pmp_state.pmp[pmp_index].cfg_reg != val) { } else if (env->pmp_state.pmp[pmp_index].cfg_reg != val) {
env->pmp_state.pmp[pmp_index].cfg_reg = val; env->pmp_state.pmp[pmp_index].cfg_reg = val;
pmp_update_rule(env, pmp_index); pmp_update_rule_addr(env, pmp_index);
return true; return true;
} }
} else { } else {
@ -209,18 +208,6 @@ void pmp_update_rule_nums(CPURISCVState *env)
} }
} }
/*
* Convert cfg/addr reg values here into simple 'sa' --> start address and 'ea'
* end address values.
* This function is called relatively infrequently whereas the check that
* an address is within a pmp rule is called often, so optimise that one
*/
static void pmp_update_rule(CPURISCVState *env, uint32_t pmp_index)
{
pmp_update_rule_addr(env, pmp_index);
pmp_update_rule_nums(env);
}
static int pmp_is_in_range(CPURISCVState *env, int pmp_index, static int pmp_is_in_range(CPURISCVState *env, int pmp_index,
target_ulong addr) target_ulong addr)
{ {
@ -481,6 +468,7 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index,
/* If PMP permission of any addr has been changed, flush TLB pages. */ /* If PMP permission of any addr has been changed, flush TLB pages. */
if (modified) { if (modified) {
pmp_update_rule_nums(env);
tlb_flush(env_cpu(env)); tlb_flush(env_cpu(env));
} }
} }