| Message ID | 1406733627-24255-2-git-send-email-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show
Return-Path: <patchwork-forward+bncBDJONKHTZ4PRBF454SPAKGQE2B754OI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D7BCD20792 for <linaro@patches.linaro.org>; Wed, 30 Jul 2014 15:26:15 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id fp1sf8024729pdb.1 for <linaro@patches.linaro.org>; Wed, 30 Jul 2014 08:26:15 -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:cc: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=uzUm1lngOQT25ofjF8F2NxEM54PTkIW0iDXNl9I1aEE=; b=P0PMCt/hok3sS9c9BAMK38sPO8l/sP9+UyEemkCuVOmr4H+n0gVRRf4lGIi5VTmcPA GqH6EWs5ndoLvI6CYtVkTxciI0OzUVAdbmclHFfQODMC8QLfMAYy7lMpMS26TkhKcHuj u0uiFXJqt2EKpLYgz5O8UTLtKtDiQuwE2sbemGUk9g87M6D3qoWywOCTAVXJ9Z3N6tnf ad71SL8PQloeSQWxNjQyOz/Bgz1W0TmNwQkjx1ByCmYvYMa1gBUiY79FrD/uKnHSA9Hv Yl+is33zY1srB2FiT6icsLR5CmEHqxAzBrZme6MzvZizKDi0X+tqTX5thABjthJMf5of OECw== X-Gm-Message-State: ALoCoQmDjn6hlaVo8JIbTs4ApuHdJsGYuhVSPZFMRb+FPtV61LZTJHsc7IfJVi6QFr2ukxxQ6WOG X-Received: by 10.68.189.73 with SMTP id gg9mr2022173pbc.4.1406733975187; Wed, 30 Jul 2014 08:26:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.227 with SMTP id s90ls592889qga.95.gmail; Wed, 30 Jul 2014 08:26:15 -0700 (PDT) X-Received: by 10.221.56.132 with SMTP id wc4mr5560602vcb.38.1406733975071; Wed, 30 Jul 2014 08:26:15 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id r1si2013828vcx.25.2014.07.30.08.26.11 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Jul 2014 08:26:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id la4so2038311vcb.23 for <patchwork-forward@linaro.org>; Wed, 30 Jul 2014 08:26:11 -0700 (PDT) X-Received: by 10.52.120.38 with SMTP id kz6mr2003843vdb.86.1406733970187; Wed, 30 Jul 2014 08:26:10 -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 tc5csp36162vcb; Wed, 30 Jul 2014 08:26:09 -0700 (PDT) X-Received: by 10.224.123.80 with SMTP id o16mr7821794qar.21.1406733969602; Wed, 30 Jul 2014 08:26:09 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y96si4440654qgy.90.2014.07.30.08.26.08 for <patch@linaro.org> (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 30 Jul 2014 08:26:09 -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]:51608 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1XCVlY-0001ZB-3f for patch@linaro.org; Wed, 30 Jul 2014 11:26:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) 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 <alex.bennee@linaro.org>) 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 <alex.bennee@linaro.org>) id 1XCVgC-000161-Cn for qemu-devel@nongnu.org; Wed, 30 Jul 2014 11:20:36 -0400 Received: from localhost ([127.0.0.1] helo=zen.linaro.local) by socrates.bennee.com with esmtp (Exim 4.80) (envelope-from <alex.bennee@linaro.org>) id 1XCVpp-0002Zs-B3; Wed, 30 Jul 2014 17:30:33 +0200 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org> To: qemu-devel@nongnu.org Date: Wed, 30 Jul 2014 16:20:23 +0100 Message-Id: <1406733627-24255-2-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.0.3 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 X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: alex.bennee@linaro.org X-SA-Exim-Scanned: No (on socrates.bennee.com); SAEximRunCond expanded to false X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 88.198.71.155 Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org> Subject: [Qemu-devel] [PATCH v2 1/5] 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: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=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: alex.bennee@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.178 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit |
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; }
Otherwise we break quickly when we change TARGET_PAGE_SIZE. Signed-off-by: Alex Bennée <alex.bennee@linaro.org>