cputlb: Hoist tlb portions in tlb_flush_one_mmuidx_locked

No functional change, but the smaller expressions make
the code easier to read.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2019-12-07 12:00:56 -08:00
parent 71ccd47ba5
commit 5c948e3175
1 changed files with 10 additions and 9 deletions

View File

@ -230,15 +230,16 @@ static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx) static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
{ {
tlb_mmu_resize_locked(&env_tlb(env)->d[mmu_idx], &env_tlb(env)->f[mmu_idx]); CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
env_tlb(env)->d[mmu_idx].n_used_entries = 0; CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];
env_tlb(env)->d[mmu_idx].large_page_addr = -1;
env_tlb(env)->d[mmu_idx].large_page_mask = -1; tlb_mmu_resize_locked(desc, fast);
env_tlb(env)->d[mmu_idx].vindex = 0; desc->n_used_entries = 0;
memset(env_tlb(env)->f[mmu_idx].table, -1, desc->large_page_addr = -1;
sizeof_tlb(&env_tlb(env)->f[mmu_idx])); desc->large_page_mask = -1;
memset(env_tlb(env)->d[mmu_idx].vtable, -1, desc->vindex = 0;
sizeof(env_tlb(env)->d[0].vtable)); memset(fast->table, -1, sizeof_tlb(fast));
memset(desc->vtable, -1, sizeof(desc->vtable));
} }
static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx) static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)