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

accel/tcg: Modify probe_access_internal() to use CPUState 

probe_access_internal() is changed to instead take the generic CPUState
over CPUArchState, in order to lessen the target-specific coupling of
cputlb.c. Note: probe_access*() also don't need the full CPUArchState,
but aren't touched in this patch as they are target-facing.

Signed-off-by: Anton Johansson <anjo@rev.ng>
Message-Id: <20230912153428.17816-5-anjo@rev.ng>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
[rth: Use cpu->neg.tlb instead of cpu_tlb()]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Anton Johansson 2023-09-12 17:34:21 +02:00 committed by Richard Henderson
parent 10b32e2cd9
commit 5afec1c63b
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
accel/tcg/cputlb.c
View File

@ -1432,26 +1432,23 @@ static void notdirty_write(CPUState *cpu, vaddr mem_vaddr, unsigned size,
} }
} }
static int probe_access_internal(CPUArchState *env, vaddr addr, static int probe_access_internal(CPUState *cpu, vaddr addr,
int fault_size, MMUAccessType access_type, int fault_size, MMUAccessType access_type,
int mmu_idx, bool nonfault, int mmu_idx, bool nonfault,
void **phost, CPUTLBEntryFull **pfull, void **phost, CPUTLBEntryFull **pfull,
uintptr_t retaddr, bool check_mem_cbs) uintptr_t retaddr, bool check_mem_cbs)
{ {
uintptr_t index = tlb_index(env_cpu(env), mmu_idx, addr); uintptr_t index = tlb_index(cpu, mmu_idx, addr);
CPUTLBEntry *entry = tlb_entry(env_cpu(env), mmu_idx, addr); CPUTLBEntry *entry = tlb_entry(cpu, mmu_idx, addr);
uint64_t tlb_addr = tlb_read_idx(entry, access_type); uint64_t tlb_addr = tlb_read_idx(entry, access_type);
vaddr page_addr = addr & TARGET_PAGE_MASK; vaddr page_addr = addr & TARGET_PAGE_MASK;
int flags = TLB_FLAGS_MASK & ~TLB_FORCE_SLOW; int flags = TLB_FLAGS_MASK & ~TLB_FORCE_SLOW;
bool force_mmio = check_mem_cbs && cpu_plugin_mem_cbs_enabled(env_cpu(env)); bool force_mmio = check_mem_cbs && cpu_plugin_mem_cbs_enabled(cpu);
CPUTLBEntryFull *full; CPUTLBEntryFull *full;
if (!tlb_hit_page(tlb_addr, page_addr)) { if (!tlb_hit_page(tlb_addr, page_addr)) {
if (!victim_tlb_hit(env_cpu(env), mmu_idx, index, if (!victim_tlb_hit(cpu, mmu_idx, index, access_type, page_addr)) {
access_type, page_addr)) { if (!cpu->cc->tcg_ops->tlb_fill(cpu, addr, fault_size, access_type,
CPUState *cs = env_cpu(env);
if (!cs->cc->tcg_ops->tlb_fill(cs, addr, fault_size, access_type,
mmu_idx, nonfault, retaddr)) { mmu_idx, nonfault, retaddr)) {
/* Non-faulting page table read failed. */ /* Non-faulting page table read failed. */
*phost = NULL; *phost = NULL;
@ -1460,8 +1457,8 @@ static int probe_access_internal(CPUArchState *env, vaddr addr,
} }
/* TLB resize via tlb_fill may have moved the entry. */ /* TLB resize via tlb_fill may have moved the entry. */
index = tlb_index(env_cpu(env), mmu_idx, addr); index = tlb_index(cpu, mmu_idx, addr);
entry = tlb_entry(env_cpu(env), mmu_idx, addr); entry = tlb_entry(cpu, mmu_idx, addr);
/* /*
* With PAGE_WRITE_INV, we set TLB_INVALID_MASK immediately, * With PAGE_WRITE_INV, we set TLB_INVALID_MASK immediately,
@ -1474,7 +1471,7 @@ static int probe_access_internal(CPUArchState *env, vaddr addr,
} }
flags &= tlb_addr; flags &= tlb_addr;
*pfull = full = &env_tlb(env)->d[mmu_idx].fulltlb[index]; *pfull = full = &cpu->neg.tlb.d[mmu_idx].fulltlb[index];
flags |= full->slow_flags[access_type]; flags |= full->slow_flags[access_type];
/* Fold all "mmio-like" bits into TLB_MMIO. This is not RAM. */ /* Fold all "mmio-like" bits into TLB_MMIO. This is not RAM. */
@ -1495,8 +1492,9 @@ int probe_access_full(CPUArchState *env, vaddr addr, int size,
bool nonfault, void **phost, CPUTLBEntryFull **pfull, bool nonfault, void **phost, CPUTLBEntryFull **pfull,
uintptr_t retaddr) uintptr_t retaddr)
{ {
int flags = probe_access_internal(env, addr, size, access_type, mmu_idx, int flags = probe_access_internal(env_cpu(env), addr, size, access_type,
nonfault, phost, pfull, retaddr, true); mmu_idx, nonfault, phost, pfull, retaddr,
true);
/* Handle clean RAM pages. */ /* Handle clean RAM pages. */
if (unlikely(flags & TLB_NOTDIRTY)) { if (unlikely(flags & TLB_NOTDIRTY)) {
@ -1518,8 +1516,8 @@ int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size,
phost = phost ? phost : &discard_phost; phost = phost ? phost : &discard_phost;
pfull = pfull ? pfull : &discard_tlb; pfull = pfull ? pfull : &discard_tlb;
int flags = probe_access_internal(env, addr, size, access_type, mmu_idx, int flags = probe_access_internal(env_cpu(env), addr, size, access_type,
true, phost, pfull, 0, false); mmu_idx, true, phost, pfull, 0, false);
/* Handle clean RAM pages. */ /* Handle clean RAM pages. */
if (unlikely(flags & TLB_NOTDIRTY)) { if (unlikely(flags & TLB_NOTDIRTY)) {
@ -1539,8 +1537,9 @@ int probe_access_flags(CPUArchState *env, vaddr addr, int size,
g_assert(-(addr | TARGET_PAGE_MASK) >= size); g_assert(-(addr | TARGET_PAGE_MASK) >= size);
flags = probe_access_internal(env, addr, size, access_type, mmu_idx, flags = probe_access_internal(env_cpu(env), addr, size, access_type,
nonfault, phost, &full, retaddr, true); mmu_idx, nonfault, phost, &full, retaddr,
true);
/* Handle clean RAM pages. */ /* Handle clean RAM pages. */
if (unlikely(flags & TLB_NOTDIRTY)) { if (unlikely(flags & TLB_NOTDIRTY)) {
@ -1560,8 +1559,9 @@ void *probe_access(CPUArchState *env, vaddr addr, int size,
g_assert(-(addr | TARGET_PAGE_MASK) >= size); g_assert(-(addr | TARGET_PAGE_MASK) >= size);
flags = probe_access_internal(env, addr, size, access_type, mmu_idx, flags = probe_access_internal(env_cpu(env), addr, size, access_type,
false, &host, &full, retaddr, true); mmu_idx, false, &host, &full, retaddr,
true);
/* Per the interface, size == 0 merely faults the access. */ /* Per the interface, size == 0 merely faults the access. */
if (size == 0) { if (size == 0) {
@ -1593,7 +1593,7 @@ void *tlb_vaddr_to_host(CPUArchState *env, abi_ptr addr,
void *host; void *host;
int flags; int flags;
flags = probe_access_internal(env, addr, 0, access_type, flags = probe_access_internal(env_cpu(env), addr, 0, access_type,
mmu_idx, true, &host, &full, 0, false); mmu_idx, true, &host, &full, 0, false);
/* No combination of flags are expected by the caller. */ /* No combination of flags are expected by the caller. */
@ -1616,7 +1616,7 @@ tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, vaddr addr,
CPUTLBEntryFull *full; CPUTLBEntryFull *full;
void *p; void *p;
(void)probe_access_internal(env, addr, 1, MMU_INST_FETCH, (void)probe_access_internal(env_cpu(env), addr, 1, MMU_INST_FETCH,
cpu_mmu_index(env, true), false, cpu_mmu_index(env, true), false,
&p, &full, 0, false); &p, &full, 0, false);
if (p == NULL) { if (p == NULL) {