mirror of https://github.com/proxmox/mirror_qemu
cputlb: move get_page_addr_code
This just moves the code before VICTIM_TLB_HIT macro definition so we can use it. Reviewed-by: Richard Henderson <rth@twiddle.net> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>master
parent
3416343255
commit
f2553f0489
|
@ -746,41 +746,6 @@ static inline ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr)
|
||||||
return ram_addr;
|
return ram_addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* NOTE: this function can trigger an exception */
|
|
||||||
/* NOTE2: the returned address is not exactly the physical address: it
|
|
||||||
* is actually a ram_addr_t (in system mode; the user mode emulation
|
|
||||||
* version of this function returns a guest virtual address).
|
|
||||||
*/
|
|
||||||
tb_page_addr_t get_page_addr_code(CPUArchState *env, target_ulong addr)
|
|
||||||
{
|
|
||||||
int mmu_idx, index, pd;
|
|
||||||
void *p;
|
|
||||||
MemoryRegion *mr;
|
|
||||||
CPUState *cpu = ENV_GET_CPU(env);
|
|
||||||
CPUIOTLBEntry *iotlbentry;
|
|
||||||
|
|
||||||
index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
|
|
||||||
mmu_idx = cpu_mmu_index(env, true);
|
|
||||||
if (unlikely(env->tlb_table[mmu_idx][index].addr_code !=
|
|
||||||
(addr & TARGET_PAGE_MASK))) {
|
|
||||||
cpu_ldub_code(env, addr);
|
|
||||||
}
|
|
||||||
iotlbentry = &env->iotlb[mmu_idx][index];
|
|
||||||
pd = iotlbentry->addr & ~TARGET_PAGE_MASK;
|
|
||||||
mr = iotlb_to_region(cpu, pd, iotlbentry->attrs);
|
|
||||||
if (memory_region_is_unassigned(mr)) {
|
|
||||||
cpu_unassigned_access(cpu, addr, false, true, 0, 4);
|
|
||||||
/* The CPU's unassigned access hook might have longjumped out
|
|
||||||
* with an exception. If it didn't (or there was no hook) then
|
|
||||||
* we can't proceed further.
|
|
||||||
*/
|
|
||||||
report_bad_exec(cpu, addr);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
p = (void *)((uintptr_t)addr + env->tlb_table[mmu_idx][index].addend);
|
|
||||||
return qemu_ram_addr_from_host_nofail(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
static uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry,
|
static uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry,
|
||||||
target_ulong addr, uintptr_t retaddr, int size)
|
target_ulong addr, uintptr_t retaddr, int size)
|
||||||
{
|
{
|
||||||
|
@ -868,6 +833,41 @@ static bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index,
|
||||||
victim_tlb_hit(env, mmu_idx, index, offsetof(CPUTLBEntry, TY), \
|
victim_tlb_hit(env, mmu_idx, index, offsetof(CPUTLBEntry, TY), \
|
||||||
(ADDR) & TARGET_PAGE_MASK)
|
(ADDR) & TARGET_PAGE_MASK)
|
||||||
|
|
||||||
|
/* NOTE: this function can trigger an exception */
|
||||||
|
/* NOTE2: the returned address is not exactly the physical address: it
|
||||||
|
* is actually a ram_addr_t (in system mode; the user mode emulation
|
||||||
|
* version of this function returns a guest virtual address).
|
||||||
|
*/
|
||||||
|
tb_page_addr_t get_page_addr_code(CPUArchState *env, target_ulong addr)
|
||||||
|
{
|
||||||
|
int mmu_idx, index, pd;
|
||||||
|
void *p;
|
||||||
|
MemoryRegion *mr;
|
||||||
|
CPUState *cpu = ENV_GET_CPU(env);
|
||||||
|
CPUIOTLBEntry *iotlbentry;
|
||||||
|
|
||||||
|
index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
|
||||||
|
mmu_idx = cpu_mmu_index(env, true);
|
||||||
|
if (unlikely(env->tlb_table[mmu_idx][index].addr_code !=
|
||||||
|
(addr & TARGET_PAGE_MASK))) {
|
||||||
|
cpu_ldub_code(env, addr);
|
||||||
|
}
|
||||||
|
iotlbentry = &env->iotlb[mmu_idx][index];
|
||||||
|
pd = iotlbentry->addr & ~TARGET_PAGE_MASK;
|
||||||
|
mr = iotlb_to_region(cpu, pd, iotlbentry->attrs);
|
||||||
|
if (memory_region_is_unassigned(mr)) {
|
||||||
|
cpu_unassigned_access(cpu, addr, false, true, 0, 4);
|
||||||
|
/* The CPU's unassigned access hook might have longjumped out
|
||||||
|
* with an exception. If it didn't (or there was no hook) then
|
||||||
|
* we can't proceed further.
|
||||||
|
*/
|
||||||
|
report_bad_exec(cpu, addr);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
p = (void *)((uintptr_t)addr + env->tlb_table[mmu_idx][index].addend);
|
||||||
|
return qemu_ram_addr_from_host_nofail(p);
|
||||||
|
}
|
||||||
|
|
||||||
/* Probe for whether the specified guest write access is permitted.
|
/* Probe for whether the specified guest write access is permitted.
|
||||||
* If it is not permitted then an exception will be taken in the same
|
* If it is not permitted then an exception will be taken in the same
|
||||||
* way as if this were a real write access (and we will not return).
|
* way as if this were a real write access (and we will not return).
|
||||||
|
|
Loading…
Reference in New Issue