jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

target/m68k: consolidate physical translation offset into get_physical_address()

Since all callers to get_physical_address() now apply the same page offset to
the translation result, move the logic into get_physical_address() itself to
avoid duplication.

Suggested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200701201531.13828-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>

authored by

Mark Cave-Ayland and committed by
Laurent Vivier 852002b5 78318119

+6 -11
+6 -11
target/m68k/helper.c
··· 643 643 /* Transparent Translation Register bit */ 644 644 env->mmu.mmusr = M68K_MMU_T_040 | M68K_MMU_R_040; 645 645 } 646 - *physical = address & TARGET_PAGE_MASK; 646 + *physical = address; 647 647 *page_size = TARGET_PAGE_SIZE; 648 648 return 0; 649 649 } ··· 771 771 } 772 772 *page_size = 1 << page_bits; 773 773 page_mask = ~(*page_size - 1); 774 - *physical = next & page_mask; 774 + *physical = (next & page_mask) + (address & (*page_size - 1)); 775 775 776 776 if (access_type & ACCESS_PTEST) { 777 777 env->mmu.mmusr |= next & M68K_MMU_SR_MASK_040; ··· 826 826 return -1; 827 827 } 828 828 829 - addr &= TARGET_PAGE_MASK; 830 - phys_addr += addr & (page_size - 1); 831 829 return phys_addr; 832 830 } 833 831 ··· 891 889 ret = get_physical_address(&cpu->env, &physical, &prot, 892 890 address, access_type, &page_size); 893 891 if (likely(ret == 0)) { 894 - address &= TARGET_PAGE_MASK; 895 - physical += address & (page_size - 1); 896 - tlb_set_page(cs, address, physical, 897 - prot, mmu_idx, TARGET_PAGE_SIZE); 892 + tlb_set_page(cs, address & TARGET_PAGE_MASK, 893 + physical & TARGET_PAGE_MASK, prot, mmu_idx, page_size); 898 894 return true; 899 895 } 900 896 ··· 1383 1379 ret = get_physical_address(env, &physical, &prot, addr, 1384 1380 access_type, &page_size); 1385 1381 if (ret == 0) { 1386 - addr &= TARGET_PAGE_MASK; 1387 - physical += addr & (page_size - 1); 1388 - tlb_set_page(env_cpu(env), addr, physical, 1382 + tlb_set_page(env_cpu(env), addr & TARGET_PAGE_MASK, 1383 + physical & TARGET_PAGE_MASK, 1389 1384 prot, access_type & ACCESS_SUPER ? 1390 1385 MMU_KERNEL_IDX : MMU_USER_IDX, page_size); 1391 1386 }