From cc5bea608df30263f8d20facfd55d8b6ce15053d Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 14 Apr 2012 14:56:48 +0000 Subject: cputlb: prepare private memory API for public consumption Fold is_ram_rom and is_ram_rom_romd() into callers. Change is_romd() and section_addr() to take MemoryRegion instead of MemoryRegionSection for consistency and use memory_region_ prefix. Reviewed-by: Richard Henderson Signed-off-by: Blue Swirl --- cputlb.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'cputlb.h') diff --git a/cputlb.h b/cputlb.h index 0b0b764..80f9b66 100644 --- a/cputlb.h +++ b/cputlb.h @@ -32,8 +32,8 @@ void tlb_set_dirty(CPUArchState *env, target_ulong vaddr); extern int tlb_flush_count; /* exec.c */ -target_phys_addr_t section_addr(MemoryRegionSection *section, - target_phys_addr_t addr); +target_phys_addr_t memory_region_section_addr(MemoryRegionSection *section, + target_phys_addr_t addr); void tb_flush_jmp_cache(CPUArchState *env, target_ulong addr); target_phys_addr_t memory_region_section_get_iotlb(CPUArchState *env, MemoryRegionSection *section, @@ -43,21 +43,9 @@ target_phys_addr_t memory_region_section_get_iotlb(CPUArchState *env, target_ulong *address); bool memory_region_is_unassigned(MemoryRegion *mr); -static inline bool is_ram_rom(MemoryRegionSection *s) +static inline bool memory_region_is_romd(MemoryRegion *mr) { - return memory_region_is_ram(s->mr); -} - -static inline bool is_romd(MemoryRegionSection *s) -{ - MemoryRegion *mr = s->mr; - return mr->rom_device && mr->readable; } -static inline bool is_ram_rom_romd(MemoryRegionSection *s) -{ - return is_ram_rom(s) || is_romd(s); -} - #endif #endif -- cgit v1.1