From patchwork Mon Oct 28 14:59:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 177944 Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp3187931ocf; Mon, 28 Oct 2019 08:14:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqxJzFQyqZ4WUbjZ5LbA9fIC4x+Lylvq2XNZ0UFr15+Fc2bXUjxgEyMzBU8XYp+NHcvs/Jwx X-Received: by 2002:ac8:23d3:: with SMTP id r19mr3207245qtr.297.1572275685123; Mon, 28 Oct 2019 08:14:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572275685; cv=none; d=google.com; s=arc-20160816; b=K48O0C5f1AWu62i9qTMvrKpduBAcMK6/B3iXU1v3YqkUv7j549ZjNq4NiumGQUJxbN TnXtGGP3Z2XBcZ3ftpp4Jjl8q0KC2kY6yM+r36dz1b+iONsHpoogcyh4hb/x0Gnuh3bk lJbKgWhiUF3GIvvJpa9X/OMC6ZuefXBH0poB0DydoeFv1ejDZN9z75JLvZVCCkhuQwf4 rpXSP4LnViA8x92XhdZ7y9zTHtscjuBJCNr6z6u/zuX/iXPq1g/VAmcUBcrT0itXq2YT NZ5lL7qd+XhooIeecfYUhh3/UgzzZjcShSRiu6tQ8A1r8uq+kS27bJZMGBsjlF9rNt/V EMDw== 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=0fs1ku4GpjAYa04lupxk+gKk8sjfZMUU6XuR/WsE7FA=; b=oOUwQ6odaOHc7xXXnzVpKF2LfKbljqAqERC2XjtmcERhPomPk4K4+fr8jrmXcKwRaI UWAnwtJten7DWsgwiVmnDNq4qbWx6EXyLyuIGfL0r+KL+EuoK90wBMcfWTKlcETVT0Hb jUlpLUwdxDojBpxdmhNcng6pQUNytWaGb61ZEiCB6pyd17RxiLDh/c/xONXrKyFIBtpy fCAeS9PqMteaDh1T7ELZzy9bUzjeLRXBUCRi0myWBJ2TkTHO3BgP3kJiWh3U2HO0Ybd3 eUBB7OSsimkZ7LH4WrgqRyqrPai5cBPU1h4J9izCORxrZnLQWxShIs931zT2ewbczg1L bc7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Na24R2mV; 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 z24si9561691qkg.244.2019.10.28.08.14.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Oct 2019 08:14:45 -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=Na24R2mV; 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]:46070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iP6jE-0000My-4h for patch@linaro.org; Mon, 28 Oct 2019 11:14:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44618) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iP6Uq-0007YW-PZ for qemu-devel@nongnu.org; Mon, 28 Oct 2019 10:59:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iP6Uo-00045D-2P for qemu-devel@nongnu.org; Mon, 28 Oct 2019 10:59:52 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45515) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iP6Un-00044P-1h for qemu-devel@nongnu.org; Mon, 28 Oct 2019 10:59:50 -0400 Received: by mail-wr1-x42b.google.com with SMTP id q13so10207874wrs.12 for ; Mon, 28 Oct 2019 07:59:48 -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=0fs1ku4GpjAYa04lupxk+gKk8sjfZMUU6XuR/WsE7FA=; b=Na24R2mVEeeLhwHOwkNVLqmDId9gPgkjejP+02yQ7DOa7LHmPXDSoCfUXcN/SVvif9 hL2OFf3rI3A3oc62FbI3RQy/qFVkh5zuFBAO/BkxbpQREvOwRTYxeXgOgxQyza876P1S +WeaKlZGM3lseU5V6QPOhsYVf13cE1hv0+ougMeWHXyvpVoX4qSFkBDPD/KQ3H/VrBP8 twcDNWq3ub2FiEXHqiXVrQmMpPcfXFwaKHoTV/q8gsowkmFGeRLccJ/jkZCvXU1ZWvfz mJIbxOlBKitIBx5Pt+fmBH2u9qUpaD39h4O5cElq71E9FaWsQfbWhTFiLGfxPGDfVFYt fs0g== 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=0fs1ku4GpjAYa04lupxk+gKk8sjfZMUU6XuR/WsE7FA=; b=ixfM/4JjEPC0IuXoOBKT9zZFKCEc99SGVJhYzKaaEPoXnrqc9gSfg+Kp8uQjPrCcFI 0NYYWDeOx376aLofKsnXFuR2PEoP4pW24BYTbI1HzdaMnD4gyr9PTwUufIvkZGf9XnWa Pa+Eal3xDU2AR/MDyapJ8hZJJH2NRrQm9Sl08CIIql5X0/pOsiG7WSP1i1phqR/F2upR 5bmjPEjBBO1aZFpVTwddUliOXURfMbTfKchNbFr0uUSz4hNNYaDLX1Xw4SeotZf9zps6 dXdD47YlA1zO2Q0r+sVKlkwOhg4QvOGOjpfJzbyyRIpbxqFs5MIqb0WfCHIK7iA6ZcRD 73cw== X-Gm-Message-State: APjAAAXlx4Ia44ZiiWm3zxUcHCSzAXLvpswi2+cov3qeJalPHbhD53WD bW8W2twg8FPhIf2x8BsT2ydvJLjaVob2/g== X-Received: by 2002:adf:e5cf:: with SMTP id a15mr16289868wrn.143.1572274786801; Mon, 28 Oct 2019 07:59:46 -0700 (PDT) Received: from localhost.localdomain (230.106.138.88.rev.sfr.net. [88.138.106.230]) by smtp.gmail.com with ESMTPSA id 143sm14842876wmb.33.2019.10.28.07.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2019 07:59:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL v2 08/12] exec: Promote TARGET_PAGE_MASK to target_long Date: Mon, 28 Oct 2019 15:59:33 +0100 Message-Id: <20191028145937.10914-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191028145937.10914-1-richard.henderson@linaro.org> References: <20191028145937.10914-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: 2a00:1450:4864:20::42b 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 525059970c..0543359d0f 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