On Wed, Aug 7, 2019 at 7:50 PM Bin Meng <bmeng...@gmail.com> wrote:
>
> For RV32, the root page table's PPN has 22 bits hence its address
> bits could be larger than the maximum bits that target_ulong is
> able to represent. Use hwaddr instead.
>
> Signed-off-by: Bin Meng <bmeng...@gmail.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
>
> ---
>
> Changes in v2:
> - promote ppn, env->satp/env->sptbl to hwaddr otherwise the page
> table base will not be correctly calculated
>
> target/riscv/cpu_helper.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
> index e32b612..b2b4f3a 100644
> --- a/target/riscv/cpu_helper.c
> +++ b/target/riscv/cpu_helper.c
> @@ -176,12 +176,12 @@ static int get_physical_address(CPURISCVState *env,
> hwaddr *physical,
>
> *prot = 0;
>
> - target_ulong base;
> + hwaddr base;
> int levels, ptidxbits, ptesize, vm, sum;
> int mxr = get_field(env->mstatus, MSTATUS_MXR);
>
> if (env->priv_ver >= PRIV_VERSION_1_10_0) {
> - base = get_field(env->satp, SATP_PPN) << PGSHIFT;
> + base = (hwaddr)get_field(env->satp, SATP_PPN) << PGSHIFT;
> sum = get_field(env->mstatus, MSTATUS_SUM);
> vm = get_field(env->satp, SATP_MODE);
> switch (vm) {
> @@ -201,7 +201,7 @@ static int get_physical_address(CPURISCVState *env,
> hwaddr *physical,
> g_assert_not_reached();
> }
> } else {
> - base = env->sptbr << PGSHIFT;
> + base = (hwaddr)(env->sptbr) << PGSHIFT;
> sum = !get_field(env->mstatus, MSTATUS_PUM);
> vm = get_field(env->mstatus, MSTATUS_VM);
> switch (vm) {
> @@ -239,7 +239,7 @@ restart:
> ((1 << ptidxbits) - 1);
>
> /* check that physical address of PTE is legal */
> - target_ulong pte_addr = base + idx * ptesize;
> + hwaddr pte_addr = base + idx * ptesize;
>
> if (riscv_feature(env, RISCV_FEATURE_PMP) &&
> !pmp_hart_has_privs(env, pte_addr, sizeof(target_ulong),
> @@ -251,7 +251,7 @@ restart:
> #elif defined(TARGET_RISCV64)
> target_ulong pte = ldq_phys(cs->as, pte_addr);
> #endif
> - target_ulong ppn = pte >> PTE_PPN_SHIFT;
> + hwaddr ppn = pte >> PTE_PPN_SHIFT;
>
> if (!(pte & PTE_V)) {
> /* Invalid PTE */
> --
> 2.7.4
>
>
