From patchwork Tue Aug 5 22:41:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 376806 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3E8FF140085 for ; Wed, 6 Aug 2014 08:44:44 +1000 (EST) Received: from localhost ([::1]:34456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEnTG-0001mI-CY for incoming@patchwork.ozlabs.org; Tue, 05 Aug 2014 18:44:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEnQP-0005Eo-Vy for qemu-devel@nongnu.org; Tue, 05 Aug 2014 18:41:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEnQJ-0006ED-7B for qemu-devel@nongnu.org; Tue, 05 Aug 2014 18:41:45 -0400 Received: from qmta04.emeryville.ca.mail.comcast.net ([76.96.30.40]:38927) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEnQI-0006E1-Rr for qemu-devel@nongnu.org; Tue, 05 Aug 2014 18:41:39 -0400 Received: from omta09.emeryville.ca.mail.comcast.net ([76.96.30.20]) by qmta04.emeryville.ca.mail.comcast.net with comcast id b7pc1o0020S2fkCA4Ahd3K; Tue, 05 Aug 2014 22:41:37 +0000 Received: from red.redhat.com ([24.10.254.122]) by omta09.emeryville.ca.mail.comcast.net with comcast id bAhT1o00J2fD5rL8VAhckj; Tue, 05 Aug 2014 22:41:37 +0000 From: Eric Blake To: qemu-devel@nongnu.org Date: Tue, 5 Aug 2014 16:41:13 -0600 Message-Id: <1407278474-17559-3-git-send-email-eblake@redhat.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1407278346-17427-1-git-send-email-eblake@redhat.com> References: <1407278346-17427-1-git-send-email-eblake@redhat.com> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1407278497; bh=rRbQQI8MdsH3ntVR5y+bg5hXnNAYjoKRgpJagg/tt+o=; h=Received:Received:From:To:Subject:Date:Message-Id:MIME-Version: Content-Type; b=cIGZEnBIYPl4B87TbUzHGMyH8u1bVSDDuv7rlBLy1NZlbYZs/WE5iPjlyjh8yUsix A2TWdzr6OK/0VsOP2vbd+TDnbWJYiZUdfgwj86iWL+to6/5TxjWyUZx0nvxpMdlx+h 28Wdd8TfD/aT9NBTkjK/2RSkorsvYcEsBXplsaVJZMyMIUUUUZXTqbXcN/9KNswJd1 TUuiaJTo2LZFYY2pEw4cktKt74MioP5Va1vjl2+CMmdIrqFZp1hizewoNc8NKgjJov SwF2o3F3CdcMyF5w7gPfZ8OlrbTqT5Z4wYYMGy4qOkzEnZaoRtbZH9Pkk+lBnIVkeE CoG4F8+IQ3Mqw== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 76.96.30.40 Cc: Peter Maydell , Fam Zheng , wenchaoqemu@gmail.com, Markus Armbruster , Luiz Capitulino , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [Qemu-devel] [PATCH v2 13/14] target-arm: don't hardcode mask values in arm_cpu_handle_mmu_fault X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Alex Bennée Otherwise we break quickly when we change TARGET_PAGE_SIZE. Signed-off-by: Alex Bennée Message-id: 1406733627-24255-2-git-send-email-alex.bennee@linaro.org Signed-off-by: Peter Maydell --- target-arm/helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index d709285..35c11e7 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; }