target/riscv: cpu_helper: Remove compile time XLEN checks

Backports f08c7ff3dc552d423439284a725f384b85b99062
This commit is contained in:
Alistair Francis 2021-03-08 15:29:11 -05:00 committed by Lioncash
parent ea716ff2db
commit 90abfa7c11

View file

@ -441,11 +441,13 @@ restart:
return TRANSLATE_PMP_FAIL; return TRANSLATE_PMP_FAIL;
} }
#if defined(TARGET_RISCV32) target_ulong pte;
target_ulong pte = address_space_ldl(cs->as, pte_addr, attrs, &res); if (riscv_cpu_is_32bit(env)) {
#elif defined(TARGET_RISCV64) pte = address_space_ldl(cs->as, pte_addr, attrs, &res);
target_ulong pte = address_space_ldq(cs->as, pte_addr, attrs, &res); } else {
#endif pte = address_space_ldq(cs->as, pte_addr, attrs, &res);
}
if (res != MEMTX_OK) { if (res != MEMTX_OK) {
return TRANSLATE_FAIL; return TRANSLATE_FAIL;
} }