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

target/riscv: Introduce mmuidx_sum 

In get_physical_address, we should use the setting passed
via mmu_idx rather than checking env->mstatus directly.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Weiwei Li <liweiwei@iscas.ac.cn>
Tested-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Message-Id: <20230325105429.1142530-13-richard.henderson@linaro.org>
Message-Id: <20230412114333.118895-13-richard.henderson@linaro.org>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Richard Henderson 2023-04-12 13:43:20 +02:00 committed by Alistair Francis
parent 3df44173e9
commit 4005a799f1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/riscv/cpu_helper.c
View File

@ -842,7 +842,7 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical,
widened = 2; widened = 2;
} }
/* status.SUM will be ignored if execute on background */ /* status.SUM will be ignored if execute on background */
sum = get_field(env->mstatus, MSTATUS_SUM) || use_background || is_debug; sum = mmuidx_sum(mmu_idx) || use_background || is_debug;
switch (vm) { switch (vm) {
case VM_1_10_SV32: case VM_1_10_SV32:
levels = 2; ptidxbits = 10; ptesize = 4; break; levels = 2; ptidxbits = 10; ptesize = 4; break;

5
target/riscv/internals.h
View File

@ -37,6 +37,11 @@
#define MMUIdx_M 3 #define MMUIdx_M 3
#define MMU_2STAGE_BIT (1 << 2) #define MMU_2STAGE_BIT (1 << 2)
static inline bool mmuidx_sum(int mmu_idx)
{
return (mmu_idx & 3) == MMUIdx_S_SUM;
}
/* share data between vector helpers and decode code */ /* share data between vector helpers and decode code */
FIELD(VDATA, VM, 0, 1) FIELD(VDATA, VM, 0, 1)
FIELD(VDATA, LMUL, 1, 3) FIELD(VDATA, LMUL, 1, 3)