From patchwork Mon Aug 4 13:53:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 34837 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9933521F5F for ; Mon, 4 Aug 2014 13:55:07 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kx10sf50735265pab.8 for ; Mon, 04 Aug 2014 06:55:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=SYUkM9KXuvJ4yyIVwsL6LhskJZoGcPSpSbkKMevKAQU=; b=YId6A6PdjTzUht+tj1T12ZdAjgMCg76UTBxr/gwXyiC+Vo+zBDPJ3Qg9FUbjqFXNSo 74jU2P1OOZEEWkPuseuask1syZoUe6dJ9CSmxCNMeD0HTWdrbIbpV1xLZ/H++P4NUs3J M5M/lOAh2l1bmWIZIWmXO713NwTBEm1JrSjtbTaU1IiYd+neO0WfcDZiqPzRriSgNjPY hPsqHnlK868X+BWelFdVvM19EKXlsbK5xVoBQ6FSxJHjcWb/TEZmUSt4b7wnMvJw9kes A9kBZ2P8dqUGn6oq+wzDU/Dy68YU/w6T1xmNd7V9uZBGwFaZUH7HmV0mIOk1CHzhnrhN ZJUA== X-Gm-Message-State: ALoCoQm6y0Z9HjUyUMA/5Goc6qrtCcaW4t5G94/UOgzW5bTncSk6LwBR+fG7G1lCHVnVdtiK7gjR X-Received: by 10.66.90.193 with SMTP id by1mr9080580pab.30.1407160506888; Mon, 04 Aug 2014 06:55:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.142 with SMTP id r14ls2167054qgr.16.gmail; Mon, 04 Aug 2014 06:55:06 -0700 (PDT) X-Received: by 10.52.113.37 with SMTP id iv5mr19811405vdb.51.1407160506653; Mon, 04 Aug 2014 06:55:06 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id qu14si1055291vdb.23.2014.08.04.06.55.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:55:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id la4so11001508vcb.5 for ; Mon, 04 Aug 2014 06:55:06 -0700 (PDT) X-Received: by 10.52.244.138 with SMTP id xg10mr19853149vdc.40.1407160506527; Mon, 04 Aug 2014 06:55:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp306276vcb; Mon, 4 Aug 2014 06:55:06 -0700 (PDT) X-Received: by 10.229.68.131 with SMTP id v3mr36748694qci.10.1407160505411; Mon, 04 Aug 2014 06:55:05 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r1si28643356qak.82.2014.08.04.06.55.05 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:55:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:52447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIjB-0006DU-12 for patch@linaro.org; Mon, 04 Aug 2014 09:55:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIi9-00054V-Py for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEIi7-0007Ng-Ep for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:01 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIi7-0006mN-7k for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:53:59 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XEIhd-0001BE-CC for qemu-devel@nongnu.org; Mon, 04 Aug 2014 14:53:29 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 4 Aug 2014 14:53:27 +0100 Message-Id: <1407160408-4467-12-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1407160408-4467-1-git-send-email-peter.maydell@linaro.org> References: <1407160408-4467-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 11/12] 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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; }