[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 1/7] cputlb: cleanup get_page_addr_code to use VIC
From: |
Edgar E. Iglesias |
Subject: |
[Qemu-devel] [PULL v1 1/7] cputlb: cleanup get_page_addr_code to use VICTIM_TLB_HIT |
Date: |
Wed, 14 Jun 2017 19:45:47 +0200 |
From: KONRAD Frederic <address@hidden>
This replaces env1 and page_index variables by env and index
so we can use VICTIM_TLB_HIT macro later.
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: KONRAD Frederic <address@hidden>
---
cputlb.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/cputlb.c b/cputlb.c
index 743776a..1cc382d 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -751,21 +751,21 @@ static inline ram_addr_t
qemu_ram_addr_from_host_nofail(void *ptr)
* 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 *env1, target_ulong addr)
+tb_page_addr_t get_page_addr_code(CPUArchState *env, target_ulong addr)
{
- int mmu_idx, page_index, pd;
+ int mmu_idx, index, pd;
void *p;
MemoryRegion *mr;
- CPUState *cpu = ENV_GET_CPU(env1);
+ CPUState *cpu = ENV_GET_CPU(env);
CPUIOTLBEntry *iotlbentry;
- page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
- mmu_idx = cpu_mmu_index(env1, true);
- if (unlikely(env1->tlb_table[mmu_idx][page_index].addr_code !=
+ 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(env1, addr);
+ cpu_ldub_code(env, addr);
}
- iotlbentry = &env1->iotlb[mmu_idx][page_index];
+ 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)) {
@@ -777,7 +777,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1,
target_ulong addr)
report_bad_exec(cpu, addr);
exit(1);
}
- p = (void *)((uintptr_t)addr +
env1->tlb_table[mmu_idx][page_index].addend);
+ p = (void *)((uintptr_t)addr + env->tlb_table[mmu_idx][index].addend);
return qemu_ram_addr_from_host_nofail(p);
}
--
2.7.4
- [Qemu-devel] [PULL v1 0/7] MMIO Exec pull request, Edgar E. Iglesias, 2017/06/14
- [Qemu-devel] [PULL v1 1/7] cputlb: cleanup get_page_addr_code to use VICTIM_TLB_HIT,
Edgar E. Iglesias <=
- [Qemu-devel] [PULL v1 2/7] cputlb: move get_page_addr_code, Edgar E. Iglesias, 2017/06/14
- [Qemu-devel] [PULL v1 4/7] qdev: add MemoryRegion property, Edgar E. Iglesias, 2017/06/14
- [Qemu-devel] [PULL v1 5/7] introduce mmio_interface, Edgar E. Iglesias, 2017/06/14
- [Qemu-devel] [PULL v1 3/7] cputlb: fix the way get_page_addr_code fills the tlb, Edgar E. Iglesias, 2017/06/14
- [Qemu-devel] [PULL v1 7/7] xilinx_spips: allow mmio execution, Edgar E. Iglesias, 2017/06/14
- [Qemu-devel] [PULL v1 6/7] exec: allow to get a pointer for some mmio memory region, Edgar E. Iglesias, 2017/06/14
- Re: [Qemu-devel] [PULL v1 0/7] MMIO Exec pull request, no-reply, 2017/06/14
- Re: [Qemu-devel] [PULL v1 0/7] MMIO Exec pull request, Peter Maydell, 2017/06/23