[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/16] cputlb: Merge tlb_table_flush_by_mmuidx into tlb_flush_one_
From: |
Richard Henderson |
Subject: |
[PULL 07/16] cputlb: Merge tlb_table_flush_by_mmuidx into tlb_flush_one_mmuidx_locked |
Date: |
Tue, 21 Jan 2020 16:49:37 -1000 |
There is only one caller for tlb_table_flush_by_mmuidx. Place
the result at the earlier line number, due to an expected user
in the near future.
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
accel/tcg/cputlb.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 02b381cf50..3a4881cf69 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -224,11 +224,16 @@ static void tlb_mmu_resize_locked(CPUArchState *env, int
mmu_idx)
}
}
-static inline void tlb_table_flush_by_mmuidx(CPUArchState *env, int mmu_idx)
+static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
{
tlb_mmu_resize_locked(env, mmu_idx);
- memset(env_tlb(env)->f[mmu_idx].table, -1, sizeof_tlb(env, mmu_idx));
env_tlb(env)->d[mmu_idx].n_used_entries = 0;
+ env_tlb(env)->d[mmu_idx].large_page_addr = -1;
+ env_tlb(env)->d[mmu_idx].large_page_mask = -1;
+ env_tlb(env)->d[mmu_idx].vindex = 0;
+ memset(env_tlb(env)->f[mmu_idx].table, -1, sizeof_tlb(env, mmu_idx));
+ memset(env_tlb(env)->d[mmu_idx].vtable, -1,
+ sizeof(env_tlb(env)->d[0].vtable));
}
static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)
@@ -289,16 +294,6 @@ void tlb_flush_counts(size_t *pfull, size_t *ppart, size_t
*pelide)
*pelide = elide;
}
-static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
-{
- tlb_table_flush_by_mmuidx(env, mmu_idx);
- env_tlb(env)->d[mmu_idx].large_page_addr = -1;
- env_tlb(env)->d[mmu_idx].large_page_mask = -1;
- env_tlb(env)->d[mmu_idx].vindex = 0;
- memset(env_tlb(env)->d[mmu_idx].vtable, -1,
- sizeof(env_tlb(env)->d[0].vtable));
-}
-
static void tlb_flush_by_mmuidx_async_work(CPUState *cpu, run_on_cpu_data data)
{
CPUArchState *env = cpu->env_ptr;
--
2.20.1
- [PULL 00/16] tcg patch queue, Richard Henderson, 2020/01/21
- [PULL 01/16] cputlb: Handle NB_MMU_MODES > TARGET_PAGE_BITS_MIN, Richard Henderson, 2020/01/21
- [PULL 02/16] util/cacheinfo: fix crash when compiling with uClibc, Richard Henderson, 2020/01/21
- [PULL 03/16] vl: Remove unused variable in configure_accelerators, Richard Henderson, 2020/01/21
- [PULL 04/16] vl: Reduce scope of variables in configure_accelerators, Richard Henderson, 2020/01/21
- [PULL 05/16] vl: Remove useless test in configure_accelerators, Richard Henderson, 2020/01/21
- [PULL 06/16] vl: Only choose enabled accelerators in configure_accelerators, Richard Henderson, 2020/01/21
- [PULL 07/16] cputlb: Merge tlb_table_flush_by_mmuidx into tlb_flush_one_mmuidx_locked,
Richard Henderson <=
- [PULL 08/16] cputlb: Make tlb_n_entries private to cputlb.c, Richard Henderson, 2020/01/21
- [PULL 09/16] cputlb: Pass CPUTLBDescFast to tlb_n_entries and sizeof_tlb, Richard Henderson, 2020/01/21
- [PULL 10/16] cputlb: Hoist tlb portions in tlb_mmu_resize_locked, Richard Henderson, 2020/01/21
- [PULL 11/16] cputlb: Hoist tlb portions in tlb_flush_one_mmuidx_locked, Richard Henderson, 2020/01/21
- [PULL 12/16] cputlb: Split out tlb_mmu_flush_locked, Richard Henderson, 2020/01/21
- [PULL 13/16] cputlb: Partially merge tlb_dyn_init into tlb_init, Richard Henderson, 2020/01/21
- [PULL 15/16] cputlb: Hoist timestamp outside of loops over tlbs, Richard Henderson, 2020/01/21
- [PULL 14/16] cputlb: Initialize tlbs as flushed, Richard Henderson, 2020/01/21
- [PULL 16/16] scripts/git.orderfile: Display decodetree before C source, Richard Henderson, 2020/01/21
- Re: [PULL 00/16] tcg patch queue, Peter Maydell, 2020/01/23