diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-26 16:49:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-26 16:49:23 +0100 |
| commit | e469b22ffda40188954fafaf6e3308f58d50f8f8 (patch) | |
| tree | 0f2c555f4ef042a2b1db3805d719926156eba105 /cputlb.c | |
| parent | 3b6434953934e6d4a776ed426d8c6d6badee176f (diff) | |
| download | focaccia-qemu-e469b22ffda40188954fafaf6e3308f58d50f8f8.tar.gz focaccia-qemu-e469b22ffda40188954fafaf6e3308f58d50f8f8.zip | |
Make CPU iotlb a structure rather than a plain hwaddr
Make the CPU iotlb a structure rather than a plain hwaddr; this will allow us to add transaction attributes to it. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'cputlb.c')
| -rw-r--r-- | cputlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cputlb.c b/cputlb.c index 38f2151166..5e1cb8f9d2 100644 --- a/cputlb.c +++ b/cputlb.c @@ -301,7 +301,7 @@ void tlb_set_page(CPUState *cpu, target_ulong vaddr, env->iotlb_v[mmu_idx][vidx] = env->iotlb[mmu_idx][index]; /* refill the tlb */ - env->iotlb[mmu_idx][index] = iotlb - vaddr; + env->iotlb[mmu_idx][index].addr = iotlb - vaddr; te->addend = addend - vaddr; if (prot & PAGE_READ) { te->addr_read = address; @@ -349,7 +349,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) (addr & TARGET_PAGE_MASK))) { cpu_ldub_code(env1, addr); } - pd = env1->iotlb[mmu_idx][page_index] & ~TARGET_PAGE_MASK; + pd = env1->iotlb[mmu_idx][page_index].addr & ~TARGET_PAGE_MASK; mr = iotlb_to_region(cpu, pd); if (memory_region_is_unassigned(mr)) { CPUClass *cc = CPU_GET_CLASS(cpu); |