ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

accel/tlb: Rename TLBFlushPageBitsByMMUIdxData -> TLBFlushRangeData 

Rename the structure to match the rename of tlb_flush_range_locked.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20210509151618.2331764-4-f4bug@amsat.org
Message-Id: <20210508201640.1045808-1-richard.henderson@linaro.org>
[PMD: Split from bigger patch]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2021-05-09 17:16:12 +02:00 committed by Peter Maydell
parent 3c4ddec169
commit 3960a59f8d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
accel/tcg/cputlb.c
View File

@ -762,11 +762,11 @@ typedef struct {
target_ulong len; target_ulong len;
uint16_t idxmap; uint16_t idxmap;
uint16_t bits; uint16_t bits;
} TLBFlushPageBitsByMMUIdxData; } TLBFlushRangeData;
static void static void
tlb_flush_page_bits_by_mmuidx_async_0(CPUState *cpu, tlb_flush_page_bits_by_mmuidx_async_0(CPUState *cpu,
TLBFlushPageBitsByMMUIdxData d) TLBFlushRangeData d)
{ {
CPUArchState *env = cpu->env_ptr; CPUArchState *env = cpu->env_ptr;
int mmu_idx; int mmu_idx;
@ -790,7 +790,7 @@ tlb_flush_page_bits_by_mmuidx_async_0(CPUState *cpu,
} }
static bool encode_pbm_to_runon(run_on_cpu_data *out, static bool encode_pbm_to_runon(run_on_cpu_data *out,
TLBFlushPageBitsByMMUIdxData d) TLBFlushRangeData d)
{ {
/* We need 6 bits to hold to hold @bits up to 63. */ /* We need 6 bits to hold to hold @bits up to 63. */
if (d.idxmap <= MAKE_64BIT_MASK(0, TARGET_PAGE_BITS - 6)) { if (d.idxmap <= MAKE_64BIT_MASK(0, TARGET_PAGE_BITS - 6)) {
@ -800,11 +800,11 @@ static bool encode_pbm_to_runon(run_on_cpu_data *out,
return false; return false;
} }
static TLBFlushPageBitsByMMUIdxData static TLBFlushRangeData
decode_runon_to_pbm(run_on_cpu_data data) decode_runon_to_pbm(run_on_cpu_data data)
{ {
target_ulong addr_map_bits = (target_ulong) data.target_ptr; target_ulong addr_map_bits = (target_ulong) data.target_ptr;
return (TLBFlushPageBitsByMMUIdxData){ return (TLBFlushRangeData){
.addr = addr_map_bits & TARGET_PAGE_MASK, .addr = addr_map_bits & TARGET_PAGE_MASK,
.idxmap = (addr_map_bits & ~TARGET_PAGE_MASK) >> 6, .idxmap = (addr_map_bits & ~TARGET_PAGE_MASK) >> 6,
.bits = addr_map_bits & 0x3f .bits = addr_map_bits & 0x3f
@ -820,7 +820,7 @@ static void tlb_flush_page_bits_by_mmuidx_async_1(CPUState *cpu,
static void tlb_flush_page_bits_by_mmuidx_async_2(CPUState *cpu, static void tlb_flush_page_bits_by_mmuidx_async_2(CPUState *cpu,
run_on_cpu_data data) run_on_cpu_data data)
{ {
TLBFlushPageBitsByMMUIdxData *d = data.host_ptr; TLBFlushRangeData *d = data.host_ptr;
tlb_flush_page_bits_by_mmuidx_async_0(cpu, *d); tlb_flush_page_bits_by_mmuidx_async_0(cpu, *d);
g_free(d); g_free(d);
} }
@ -828,7 +828,7 @@ static void tlb_flush_page_bits_by_mmuidx_async_2(CPUState *cpu,
void tlb_flush_page_bits_by_mmuidx(CPUState *cpu, target_ulong addr, void tlb_flush_page_bits_by_mmuidx(CPUState *cpu, target_ulong addr,
uint16_t idxmap, unsigned bits) uint16_t idxmap, unsigned bits)
{ {
TLBFlushPageBitsByMMUIdxData d; TLBFlushRangeData d;
run_on_cpu_data runon; run_on_cpu_data runon;
/* If all bits are significant, this devolves to tlb_flush_page. */ /* If all bits are significant, this devolves to tlb_flush_page. */
@ -854,7 +854,7 @@ void tlb_flush_page_bits_by_mmuidx(CPUState *cpu, target_ulong addr,
async_run_on_cpu(cpu, tlb_flush_page_bits_by_mmuidx_async_1, runon); async_run_on_cpu(cpu, tlb_flush_page_bits_by_mmuidx_async_1, runon);
} else { } else {
/* Otherwise allocate a structure, freed by the worker. */ /* Otherwise allocate a structure, freed by the worker. */
TLBFlushPageBitsByMMUIdxData *p = g_memdup(&d, sizeof(d)); TLBFlushRangeData *p = g_memdup(&d, sizeof(d));
async_run_on_cpu(cpu, tlb_flush_page_bits_by_mmuidx_async_2, async_run_on_cpu(cpu, tlb_flush_page_bits_by_mmuidx_async_2,
RUN_ON_CPU_HOST_PTR(p)); RUN_ON_CPU_HOST_PTR(p));
} }
@ -865,7 +865,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus(CPUState *src_cpu,
uint16_t idxmap, uint16_t idxmap,
unsigned bits) unsigned bits)
{ {
TLBFlushPageBitsByMMUIdxData d; TLBFlushRangeData d;
run_on_cpu_data runon; run_on_cpu_data runon;
/* If all bits are significant, this devolves to tlb_flush_page. */ /* If all bits are significant, this devolves to tlb_flush_page. */
@ -893,7 +893,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus(CPUState *src_cpu,
/* Allocate a separate data block for each destination cpu. */ /* Allocate a separate data block for each destination cpu. */
CPU_FOREACH(dst_cpu) { CPU_FOREACH(dst_cpu) {
if (dst_cpu != src_cpu) { if (dst_cpu != src_cpu) {
TLBFlushPageBitsByMMUIdxData *p = g_memdup(&d, sizeof(d)); TLBFlushRangeData *p = g_memdup(&d, sizeof(d));
async_run_on_cpu(dst_cpu, async_run_on_cpu(dst_cpu,
tlb_flush_page_bits_by_mmuidx_async_2, tlb_flush_page_bits_by_mmuidx_async_2,
RUN_ON_CPU_HOST_PTR(p)); RUN_ON_CPU_HOST_PTR(p));
@ -909,7 +909,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus_synced(CPUState *src_cpu,
uint16_t idxmap, uint16_t idxmap,
unsigned bits) unsigned bits)
{ {
TLBFlushPageBitsByMMUIdxData d; TLBFlushRangeData d;
run_on_cpu_data runon; run_on_cpu_data runon;
/* If all bits are significant, this devolves to tlb_flush_page. */ /* If all bits are significant, this devolves to tlb_flush_page. */
@ -935,7 +935,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus_synced(CPUState *src_cpu,
runon); runon);
} else { } else {
CPUState *dst_cpu; CPUState *dst_cpu;
TLBFlushPageBitsByMMUIdxData *p; TLBFlushRangeData *p;
/* Allocate a separate data block for each destination cpu. */ /* Allocate a separate data block for each destination cpu. */
CPU_FOREACH(dst_cpu) { CPU_FOREACH(dst_cpu) {