From: Alex Bennée <alex.bennee@linaro.org>
Date: Mon, 4 Aug 2014 13:41:55 +0000 (+0100)
Subject: target-arm: don't hardcode mask values in arm_cpu_handle_mmu_fault
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=dcd82c118c891571d2d7db5b4ec84d9cf3ea49b3;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

target-arm: don't hardcode mask values in arm_cpu_handle_mmu_fault

Otherwise we break quickly when we change TARGET_PAGE_SIZE.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1406733627-24255-2-git-send-email-alex.bennee@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target-arm/helper.c b/target-arm/helper.c
index d70928550..35c11e780 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -4156,8 +4156,8 @@ int arm_cpu_handle_mmu_fault(CPUState *cs, vaddr address,
                         &page_size);
     if (ret == 0) {
         /* Map a single [sub]page.  */
-        phys_addr &= ~(hwaddr)0x3ff;
-        address &= ~(target_ulong)0x3ff;
+        phys_addr &= TARGET_PAGE_MASK;
+        address &= TARGET_PAGE_MASK;
         tlb_set_page(cs, address, phys_addr, prot, mmu_idx, page_size);
         return 0;
     }