From patchwork Fri Oct 25 14:21:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 177751 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3798919ill; Fri, 25 Oct 2019 07:39:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqx151vjP2fW5f+HAKLn4N5ErQArTo83DD+v2G92cz8gUDOsBi6VF7s3VG56zVtrG/RTzArX X-Received: by 2002:a17:906:d055:: with SMTP id bo21mr3846161ejb.199.1572014352137; Fri, 25 Oct 2019 07:39:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572014352; cv=none; d=google.com; s=arc-20160816; b=kBBKuiywYPnIRKFHuWEc2jltIunI4fr/6muIcjTvRo+RiXURNGGZmUifn5+W+EFkoV u1dvve+IXT2Rw4vGcPBnHLdUoqae49HsGuVSlG8G8wop6XXPAK2wG2rqNbm616QLFX9S SSd++pfL+/zxoFBWsSmVWbLEmcUUYpOq3QZLndsQ7N8ThchgSVP/jCoRoNUyiyG93F9y 1qrO9YfZJbykSG96SIEW48rSXjXAmOc85eKa3tJ4TaNaT2O0Z1eBdFMkJUkP5ynQRV1m qetQ4Pt6Ef9Cq34LADX/XASuD5AbpYuuwwt+FzB9n9/dxUT/FkSyPW8INcS1nVzY8SeS hlxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=nmU+yKlQiV860VrF5+z5rPYXmAQaQLmhxeuYjoE3BVY=; b=Avn+Cfkf29/7GNohrtel7YqDw+0FKHlzaF5u7tDoH50E+nGCeyyLKSKK8D9sFsA9kC jzb6ozdJAzEjuW/ImoQQBLU8HaTadNe+NXV2QC/OjmDwvqTMeYUGAlrMbq/A6w6YZ69v 1uPLbyyfdjm7NZD743Lb8Borp1ydXpcI5+Y6XYIkVgM8RNEh2C9yBaoGfl8WncwYQIh+ NzqSQPOqWU558nRyybzz6DFEHJfe0FtoxdfH6+dV+PDzaLZepwi391C1vDtcrMmrk7uT 9GwpyC4zHt0w6t4W9U+T9EIHJ915tfU4FFMg+TNCZybxrWSeNhvt2YN+/wmpnzenQpZ6 cENA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fD6MAh+b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e58si1513209eda.7.2019.10.25.07.39.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Oct 2019 07:39:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fD6MAh+b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO0kA-0007OA-A8 for patch@linaro.org; Fri, 25 Oct 2019 10:39:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44369) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO0Tl-00059k-Jx for qemu-devel@nongnu.org; Fri, 25 Oct 2019 10:22:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO0Tk-0001fA-A6 for qemu-devel@nongnu.org; Fri, 25 Oct 2019 10:22:13 -0400 Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]:43331) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iO0Tk-0001ey-4c for qemu-devel@nongnu.org; Fri, 25 Oct 2019 10:22:12 -0400 Received: by mail-qt1-x833.google.com with SMTP id t20so3429934qtr.10 for ; Fri, 25 Oct 2019 07:22:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nmU+yKlQiV860VrF5+z5rPYXmAQaQLmhxeuYjoE3BVY=; b=fD6MAh+bxQtMs/bJ07nmJGgn+oDCqxJ3K69D7N5gASS2Wak5SmbB0ZdAHG915UuQyr FbNZO09QWFqkVDiip+Sw8pTmuv/Z1fyfXH6cKxSOTeYfS274MyaBQuq2w2VwjC/dzRrW fFsIAtZHAEeRpyPgwrTzeqgh5USBmkvHyJ6yxNO4/2+Tiz2DaiPVDGGuZfI2DuNHyKAD 5o9ck4DomF1Td5+RWZMLdQjwJtDF/5C00XgCqAIRCMpcTzJhMx5e6y6dsXQ7G/Mq+WN3 1qIWYlbXJAD0y0/m6FYUEDUhOWVg1XQrvzaeJLNqrNcW0l4ZaBXbV4jD8ENqJWvMdWSW VURg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nmU+yKlQiV860VrF5+z5rPYXmAQaQLmhxeuYjoE3BVY=; b=G/cBSFIl4JRQHGzNIXpkNcxojwqcFC0dviBKhUD9DXvfIqNYhuoXUg+msZGqkahpTt 8OXSymRJS7cO1kDjI3Yj9cSsKXka1CpljqOEyqc9JuYKDMFQKpZjKxJFeKgBhYWZ2g0H 4clBw+LiV/7KU68KLWs15VjCIVUG9tLJ8AUjAh4NHwRXu8CRzTLs31JNuePYw6ciY6Dd +qTSoRCSlNpS05so9AwgeQmYDmhjbZNJRBXLvnjCCf3t+JHhpY8P0aYMD2azPTTvmAOL E4JXIbrP6vLXNEPEtxD7P19v9hWl+RwNot8viv/6RrH8FJXAXLcXWtR3LtLt9x9hF2o0 /Tng== X-Gm-Message-State: APjAAAViWsn7zN/SBy/nOSTzOyKjpSYzzNAmL7vMyzBC5lKdIIfiQMee OsRsjFjbxFX1r9IvN01F17yd1cJ2aVE= X-Received: by 2002:a0c:fe02:: with SMTP id x2mr3309774qvr.117.1572013331146; Fri, 25 Oct 2019 07:22:11 -0700 (PDT) Received: from localhost.localdomain (rrcs-172-254-253-50.nyc.biz.rr.com. [172.254.253.50]) by smtp.gmail.com with ESMTPSA id q17sm1137050qtq.58.2019.10.25.07.22.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2019 07:22:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 08/12] exec: Promote TARGET_PAGE_MASK to target_long Date: Fri, 25 Oct 2019 10:21:55 -0400 Message-Id: <20191025142159.12459-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191025142159.12459-1-richard.henderson@linaro.org> References: <20191025142159.12459-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::833 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There are some uint64_t uses that expect TARGET_PAGE_MASK to extend for a 32-bit, so this must continue to be a signed type. Define based on TARGET_PAGE_BITS not TARGET_PAGE_SIZE; this will make a following patch more clear. This should not have a functional effect so far. Reviewed-by: Alex Bennée Reviewed-by: Paolo Bonzini Signed-off-by: Richard Henderson --- include/exec/cpu-all.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index d3e4660d50..ba6d3306bf 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -229,7 +229,7 @@ extern TargetPageBits target_page; #endif #define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS) -#define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1) +#define TARGET_PAGE_MASK ((target_long)-1 << TARGET_PAGE_BITS) #define TARGET_PAGE_ALIGN(addr) ROUND_UP((addr), TARGET_PAGE_SIZE) /* Using intptr_t ensures that qemu_*_page_mask is sign-extended even