On 1/18/21 6:40 PM, Richard Henderson wrote: > On 1/16/21 8:13 AM, Philippe Mathieu-Daudé wrote: >> +++ b/target/mips/tlb_helper.c >> @@ -21,7 +21,7 @@ >> #include "cpu.h" >> #include "internal.h" >> #include "exec/exec-all.h" >> -#include "exec/cpu_ldst.h" >> +#include "exec/translator.h" >> #include "exec/log.h" >> #include "hw/mips/cpudevs.h" >> >> @@ -526,9 +526,9 @@ static bool get_pte(CPUMIPSState *env, uint64_t vaddr, >> int entry_size, >> return false; >> } >> if (entry_size == 64) { >> - *pte = cpu_ldq_code(env, vaddr); >> + *pte = translator_ldq(env, vaddr); >> } else { >> - *pte = cpu_ldl_code(env, vaddr); >> + *pte = translator_ldl(env, vaddr); >> } >> return true; >> } > > NACK. This is not within the translator.
Oops... Thanks for catching this mistake, Phil.