From patchwork Wed Feb 23 22:31:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 545224 X-Google-Smtp-Source: ABdhPJyug8i1UQl3R0Bu205CN2ZKwb3T0pl05GLfMW89CZb/5cIa2Ub+p18RF0WwFeqcsWH5E2L2 X-Received: by 2002:a05:620a:9d8:b0:648:cdf7:936a with SMTP id y24-20020a05620a09d800b00648cdf7936amr1309941qky.337.1645656188073; Wed, 23 Feb 2022 14:43:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645656188; cv=none; d=google.com; s=arc-20160816; b=ymSZOGngornOburHoASW1JaP0R9Q6Hm5uNRmUCjGEBsDLZkW4f0VdE6Bn5Of7chBt1 +ztiGBcNRm4LW4y/Q1L4O1mXQl4c+E2alqK+OsZmkfFRaUl2gA7uUFJQTIhsnv2kuzB5 f78/9VSaGQGNMvFMxFHCkyBErP50mUY4VDjTbt94vGLUJcrSZt++t1RsnEqFLuyGAYco av+T+H0xEP2bS5uZsHb7YVenJh4QsXwqBaqFuWIsadeaY2RvHY5Js5X7zlS9sygQcdz4 Xrlf2rkgmGYK7zUUT+Jogoi+8SK8fPuTN6dJpcSS6jxCVAt5QFag9bhUeRU7qBv2Rntz NsrQ== 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=gIGj1SBy99bk76FDyotKqntArH5MW9KjKA2GprTkmIQ=; b=yfzapoEPzYKzobsx320xvuWRedFtlDGzm3IHRloK3/OM4s/HM+p6qZce514/XV4pqH 9NkhSNDiK3PTc/bpgYQlPWewAZyb8KjQ/vQxClLg+BkES7vszyNMQNlHYDrYMsJCbrdT HenZpKN1jD8afeRswweDvsG6drccctS94PcTnmQGRR/C09u0XBTrRCimCG04hw2TvpQh Y2iLnrAqosWGJ4EJ0a7hSY01tWJ8dL6ec5v1H3gOs5o/a3TmwlVv1ABKh79aosq2f0p8 ed9rTd2zsZfcm2OWHN/YMPhSFpvKalT1VHXeu37e1sP51VCsep1iMwS9KTVLvUIYxIFV PaEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sLvusCfo; 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=fail (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 ke24si433183qvb.74.2022.02.23.14.43.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Feb 2022 14:43:08 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=sLvusCfo; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nN0Lj-00009Y-LJ for patch@linaro.org; Wed, 23 Feb 2022 17:43:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nN0At-0006qq-9O for qemu-devel@nongnu.org; Wed, 23 Feb 2022 17:31:55 -0500 Received: from [2607:f8b0:4864:20::62a] (port=35383 helo=mail-pl1-x62a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nN0Ar-0001E8-BJ for qemu-devel@nongnu.org; Wed, 23 Feb 2022 17:31:54 -0500 Received: by mail-pl1-x62a.google.com with SMTP id i1so85652plr.2 for ; Wed, 23 Feb 2022 14:31:51 -0800 (PST) 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=gIGj1SBy99bk76FDyotKqntArH5MW9KjKA2GprTkmIQ=; b=sLvusCfoq1Ah8GlJxy/j847In4z7s480NBBmtn6FLR+nkSOJTIu7ge+QcHIZc8vM2D 9m6NiuvGwWaZ2SHOdY3QD+uQieG2uXqwmmvqP7KtTQZEbMPbo5azEwEVFOcukCuc/U5G eGH+dMPna0/06OKXrLkupNB7Yni0aAt0ZQbn3KtAo0eFulsbbloCRlAkZyC199o7DmfF m/c7T8jYNAaqbjKMpUxNnmxm6ivncOkzg4p0LwuXUAPSvRSaw1UFk4P1lkvLJgzVimvb HTFjMjv/A6dq05gndNCYm9U9q71xSeAKIZaJNkrUBuFYSo/IMyeMDaBb3JIIROTHnzms sP7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gIGj1SBy99bk76FDyotKqntArH5MW9KjKA2GprTkmIQ=; b=kWZrAiFOoAGIhtqUnPH1G64pX59PcLcxY2nOcNV7CrQkWLo2d0x7I4PU/9pYcjxEzr gfW7EZdyWL+NiF480BXXzTLe77p81lEjPyw1arQduSQAVXUmrWgIcLvKRDHdkBT0EsIm 0P4Zo/bjLk09KNay9e6WgjhSBjIz7H+SRVAtwpFneSZjzOGb+VIAvp9+KpeCUw3jlI7D GBsZZbt8lCW7dJy2hdwoljau/KQSEZlRGV6PrSICndVqqv0UA/bzPW8Ma17n7clLSocb cHkR+SyNX87RykDFbiE5/xKVas1AURf/4a45bj9tuWsjT2C6ucje5B8dFI2NkzUcu7qL jXBA== X-Gm-Message-State: AOAM532w6VUS34RrK0fHOcC6A6HPSX+FEUhJMrudxrIGd8rLIzSCRchS 3pdy34z00BqnjpQoB5t5v/N4BgC6TgUzGw== X-Received: by 2002:a17:90b:2251:b0:1b8:c4cc:2057 with SMTP id hk17-20020a17090b225100b001b8c4cc2057mr11364176pjb.193.1645655511021; Wed, 23 Feb 2022 14:31:51 -0800 (PST) Received: from localhost.localdomain (cpe-50-113-46-110.hawaii.res.rr.com. [50.113.46.110]) by smtp.gmail.com with ESMTPSA id f8sm533815pfv.100.2022.02.23.14.31.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 14:31:50 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 06/17] target/arm: Use MAKE_64BIT_MASK to compute indexmask Date: Wed, 23 Feb 2022 12:31:26 -1000 Message-Id: <20220223223137.114264-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220223223137.114264-1-richard.henderson@linaro.org> References: <20220223223137.114264-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, alex.bennee@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The macro is a bit more readable than the inlined computation. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- 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 431b0c1405..675aec4bf3 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11518,8 +11518,8 @@ static bool get_phys_addr_lpae(CPUARMState *env, uint64_t address, level = startlevel; } - indexmask_grainsize = (1ULL << (stride + 3)) - 1; - indexmask = (1ULL << (inputsize - (stride * (4 - level)))) - 1; + indexmask_grainsize = MAKE_64BIT_MASK(0, stride + 3); + indexmask = MAKE_64BIT_MASK(0, inputsize - (stride * (4 - level))); /* Now we can extract the actual base address from the TTBR */ descaddr = extract64(ttbr, 0, 48);