From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCVgQ-0001s5-1b for qemu-devel@nongnu.org; Wed, 30 Jul 2014 11:20:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCVgC-00016g-Ja for qemu-devel@nongnu.org; Wed, 30 Jul 2014 11:20:49 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:44790 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCVgC-000161-Cn for qemu-devel@nongnu.org; Wed, 30 Jul 2014 11:20:36 -0400 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 30 Jul 2014 16:20:23 +0100 Message-Id: <1406733627-24255-2-git-send-email-alex.bennee@linaro.org> In-Reply-To: <1406733627-24255-1-git-send-email-alex.bennee@linaro.org> References: <1406733627-24255-1-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2 1/5] target-arm: don't hardcode mask values in arm_cpu_handle_mmu_fault List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Otherwise we break quickly when we change TARGET_PAGE_SIZE. Signed-off-by: Alex Bennée diff --git a/target-arm/helper.c b/target-arm/helper.c index a0e57cd..aa5d267 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -4029,8 +4029,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; } -- 2.0.3