From 8f3e03cb73dce9eac207cfe0f37d87d6490421a0 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 24 May 2013 16:45:30 +0200 Subject: cputlb: simplify tlb_set_page The same "if" condition is repeated twice. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- cputlb.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'cputlb.c') diff --git a/cputlb.c b/cputlb.c index aba7e44e1e..b56bc0102c 100644 --- a/cputlb.c +++ b/cputlb.c @@ -262,17 +262,14 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr, #endif address = vaddr; - if (!(memory_region_is_ram(section->mr) || - memory_region_is_romd(section->mr))) { - /* IO memory case (romd handled later) */ + if (!memory_region_is_ram(section->mr) && !memory_region_is_romd(section->mr)) { + /* IO memory case */ address |= TLB_MMIO; - } - if (memory_region_is_ram(section->mr) || - memory_region_is_romd(section->mr)) { + addend = 0; + } else { + /* TLB_MMIO for rom/romd handled below */ addend = (uintptr_t)memory_region_get_ram_ptr(section->mr) + memory_region_section_addr(section, paddr); - } else { - addend = 0; } code_address = address; -- cgit v1.2.1