target/s390x: Use cpu_*_mmu instead of helper_*_mmu
The helper_*_mmu functions were the only thing available when this code was written. This could have been adjusted when we added cpu_*_mmuidx_ra, but now we can most easily use the newest set of interfaces. Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
68ad9260e0
commit
bfe5b847af
|
@ -249,13 +249,13 @@ static void do_access_memset(CPUS390XState *env, vaddr vaddr, char *haddr,
|
||||||
* page. This is especially relevant to speed up TLB_NOTDIRTY.
|
* page. This is especially relevant to speed up TLB_NOTDIRTY.
|
||||||
*/
|
*/
|
||||||
g_assert(size > 0);
|
g_assert(size > 0);
|
||||||
helper_ret_stb_mmu(env, vaddr, byte, oi, ra);
|
cpu_stb_mmu(env, vaddr, byte, oi, ra);
|
||||||
haddr = tlb_vaddr_to_host(env, vaddr, MMU_DATA_STORE, mmu_idx);
|
haddr = tlb_vaddr_to_host(env, vaddr, MMU_DATA_STORE, mmu_idx);
|
||||||
if (likely(haddr)) {
|
if (likely(haddr)) {
|
||||||
memset(haddr + 1, byte, size - 1);
|
memset(haddr + 1, byte, size - 1);
|
||||||
} else {
|
} else {
|
||||||
for (i = 1; i < size; i++) {
|
for (i = 1; i < size; i++) {
|
||||||
helper_ret_stb_mmu(env, vaddr + i, byte, oi, ra);
|
cpu_stb_mmu(env, vaddr + i, byte, oi, ra);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -291,7 +291,7 @@ static uint8_t do_access_get_byte(CPUS390XState *env, vaddr vaddr, char **haddr,
|
||||||
* Do a single access and test if we can then get access to the
|
* Do a single access and test if we can then get access to the
|
||||||
* page. This is especially relevant to speed up TLB_NOTDIRTY.
|
* page. This is especially relevant to speed up TLB_NOTDIRTY.
|
||||||
*/
|
*/
|
||||||
byte = helper_ret_ldub_mmu(env, vaddr + offset, oi, ra);
|
byte = cpu_ldb_mmu(env, vaddr + offset, oi, ra);
|
||||||
*haddr = tlb_vaddr_to_host(env, vaddr, MMU_DATA_LOAD, mmu_idx);
|
*haddr = tlb_vaddr_to_host(env, vaddr, MMU_DATA_LOAD, mmu_idx);
|
||||||
return byte;
|
return byte;
|
||||||
#endif
|
#endif
|
||||||
|
@ -325,7 +325,7 @@ static void do_access_set_byte(CPUS390XState *env, vaddr vaddr, char **haddr,
|
||||||
* Do a single access and test if we can then get access to the
|
* Do a single access and test if we can then get access to the
|
||||||
* page. This is especially relevant to speed up TLB_NOTDIRTY.
|
* page. This is especially relevant to speed up TLB_NOTDIRTY.
|
||||||
*/
|
*/
|
||||||
helper_ret_stb_mmu(env, vaddr + offset, byte, oi, ra);
|
cpu_stb_mmu(env, vaddr + offset, byte, oi, ra);
|
||||||
*haddr = tlb_vaddr_to_host(env, vaddr, MMU_DATA_STORE, mmu_idx);
|
*haddr = tlb_vaddr_to_host(env, vaddr, MMU_DATA_STORE, mmu_idx);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue