target/riscv: Remove target_ulong use in get_physical_address()
Use uint32_t for RV32, uint64_t otherwise. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> Message-ID: <20260527201348.29511-6-philmd@linaro.org> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Philippe Mathieu-Daudé committed
May 27, 2026 at 22:13 UTC
8968f8ac7ea7b65a46b689acd4e8f91cb501009d
1 file changed
+8
-6
target/riscv/cpu_helper.c
+8
-6
@@ -1675,16 +1675,18 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical,
1675
return TRANSLATE_FAIL;
1676
}
1677
1678
- target_ulong *pte_pa = qemu_map_ram_ptr(mr->ram_block, addr1);
1679
- target_ulong old_pte;
1678
+ void *pte_pa = qemu_map_ram_ptr(mr->ram_block, addr1);
1679
+ uint64_t old_pte;
1680
1681
if (riscv_cpu_sxl(env) == MXL_RV32) {
1682
- old_pte = qatomic_cmpxchg((uint32_t *)pte_pa, cpu_to_le32(pte),
1683
- cpu_to_le32(updated_pte));
1682
+ uint32_t cmp = cpu_to_le32(pte);
1683
+ uint32_t val = cpu_to_le32(updated_pte);
1684
+ old_pte = qatomic_cmpxchg((uint32_t *)pte_pa, cmp, val);
1685
old_pte = le32_to_cpu(old_pte);
1686
} else {
1686
- old_pte = qatomic_cmpxchg(pte_pa, cpu_to_le64(pte),
1687
- cpu_to_le64(updated_pte));
1687
+ uint64_t cmp = cpu_to_le64(pte);
1688
+ uint64_t val = cpu_to_le64(updated_pte);
1689
+ old_pte = qatomic_cmpxchg((uint64_t *)pte_pa, cmp, val);
1690
old_pte = le64_to_cpu(old_pte);
1691
}
1692
if (old_pte != pte) {