Move the architecture agnostic function prototypes for exec.c out of cputlb.h to exec-all.h. This allows hiding of the arch specific cputlb.h from exec.c which should be getting close to having no architecture specifics. Prepares support for multi-arch, which will have a minimal cpu.h that services exec.c but not cputlb.h.
Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com> --- exec.c | 1 - include/exec/cputlb.h | 14 -------------- include/exec/exec-all.h | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/exec.c b/exec.c index 0cb54f7..71ec173 100644 --- a/exec.c +++ b/exec.c @@ -48,7 +48,6 @@ #endif #include "exec/cpu-all.h" #include "qemu/rcu_queue.h" -#include "exec/cputlb.h" #include "translate-all.h" #include "exec/memory-internal.h" diff --git a/include/exec/cputlb.h b/include/exec/cputlb.h index e0da9d7..9167ff6 100644 --- a/include/exec/cputlb.h +++ b/include/exec/cputlb.h @@ -30,19 +30,5 @@ void cpu_tlb_reset_dirty_all(ram_addr_t start1, ram_addr_t length); void tlb_set_dirty(CPUArchState *env, target_ulong vaddr); extern int tlb_flush_count; -/* exec.c */ -void tb_flush_jmp_cache(CPUState *cpu, target_ulong addr); - -MemoryRegionSection * -address_space_translate_for_iotlb(CPUState *cpu, hwaddr addr, hwaddr *xlat, - hwaddr *plen); -hwaddr memory_region_section_get_iotlb(CPUState *cpu, - MemoryRegionSection *section, - target_ulong vaddr, - hwaddr paddr, hwaddr xlat, - int prot, - target_ulong *address); -bool memory_region_is_unassigned(MemoryRegion *mr); - #endif #endif diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 12630ea..d52885e 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -356,6 +356,21 @@ static inline tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong #else /* cputlb.c */ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr); + +/* exec.c */ +void tb_flush_jmp_cache(CPUState *cpu, target_ulong addr); + +MemoryRegionSection * +address_space_translate_for_iotlb(CPUState *cpu, hwaddr addr, hwaddr *xlat, + hwaddr *plen); +hwaddr memory_region_section_get_iotlb(CPUState *cpu, + MemoryRegionSection *section, + target_ulong vaddr, + hwaddr paddr, hwaddr xlat, + int prot, + target_ulong *address); +bool memory_region_is_unassigned(MemoryRegion *mr); + #endif /* vl.c */ -- 1.9.1
