From patchwork Wed Mar 2 20:52:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 547536 Delivered-To: patch@linaro.org Received: by 2002:ac0:f585:0:0:0:0:0 with SMTP id s5csp42804imq; Wed, 2 Mar 2022 13:16:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDugtI4+FbphOS4Ijvun0HoryZLeaWVmf7nJLC105HxNquCNAh8+cvaI7RIel+Oka7syYF X-Received: by 2002:a05:6130:388:b0:342:b8e5:15c2 with SMTP id az8-20020a056130038800b00342b8e515c2mr15421903uab.85.1646255813773; Wed, 02 Mar 2022 13:16:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646255813; cv=none; d=google.com; s=arc-20160816; b=TZbd/fSjAAu9jW7NDSJTNvGm7Nzb9oXdyRqjdc15/P4iXByN28UcOQrucpLaPd2h67 TbEKrrnYAmEQZrZF+d67Ojo+X8GhhkmHf6kTigvp6bQozbDThKTSGIMr4K53FOgtUzQl KAs/h0mQfKRokyCxUFDke3odhe+ytWcepOMCic7OSmE/6TU7syPoiymWlp3GXDmcGNQo Lve3j2EiXNru8UBspYPQIBxcIvr+4Lzy5C3zR+dg/XnrpkN8ekNSmZFkokXoYxXBzssA THN32/3GDJj67OqHYLr5XmvJSvLD+RG2igfBVexE70SSam0c0LsGWivPnoCPZ+gScScz HY9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=cRu0ONP9iJRS52TXzF5kbcfgXqfx58WUEunHKG1fNWY=; b=VlJdD0z51PxNEhVMFgudNtI5T397a3IxdkckecImM7pjug3L7Lxx0MvfjTNoXjG4XZ I7gP2NjsfJaRcr0+9ma+dVR9AiHU6g42X2Mr+Fd9edApm41b+i2VOdHPuL0vK8W9gn0y 7dAcx8Y5Op9S6Fn6gdDo4jkroNbziGmcEDznksK+xcoMhNRl7G5D3KQLsqmym2/6QV4S CwMLH67dPMNEr8i39/KODWWAOXTGzUj64H7CHp03tBjTf+w1xpvoMVF5Xz7Khx3lvBfW 8ce/l4zOeghe/P6smff7wA5WWMmyS3njBOP4Sr4OlR9aZB3WJtCctyRJLUJRAUEgT2yT OPIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g9wsUoT7; 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 y9-20020ab07849000000b0034a2e6532f7si18526uaq.1.2022.03.02.13.16.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Mar 2022 13:16:53 -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=pass header.i=@linaro.org header.s=google header.b=g9wsUoT7; 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]:33592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPWL7-0002ME-9n for patch@linaro.org; Wed, 02 Mar 2022 16:16:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPVxm-0005qR-SL for qemu-devel@nongnu.org; Wed, 02 Mar 2022 15:52:47 -0500 Received: from [2a00:1450:4864:20::432] (port=34601 helo=mail-wr1-x432.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPVxl-000896-Dm for qemu-devel@nongnu.org; Wed, 02 Mar 2022 15:52:46 -0500 Received: by mail-wr1-x432.google.com with SMTP id d3so4711639wrf.1 for ; Wed, 02 Mar 2022 12:52:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=cRu0ONP9iJRS52TXzF5kbcfgXqfx58WUEunHKG1fNWY=; b=g9wsUoT7t/OyiAlKggZhUFscxbxonxhiO5zdIh23igdbvzMs5reynbfpkFiYCwut9K x02c6v4+/IHDZEWMy4ke9KwilvFTr5gLnyiq/sPb7hhF/tS8PZcyQjLpqx/3bz2J7zSe jiXoVAZEbscDy7RnmEq4Fa5/yB47ukymsIfEiZT/fL80YzDETlKwDHvVPe0FktdFI0mi GpWDIinBtKVPTh6k5j4NQ3UJs8bTybeSlwKf3A19bbv7Rd5/Sshno4qrTgJXTZiTDHof VF2c3xehlNYz6/mfk9/nkGHOqjXj6b9z4hW32Ar4qme1L1w3rTLjABhwjg8KnGtoUtF4 bKwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cRu0ONP9iJRS52TXzF5kbcfgXqfx58WUEunHKG1fNWY=; b=Qxt2gy+nB9ZaZpzoI3XR+Z9AZtQCtA6srpSocD5tmnpRCa9ha+jLFPHmE2QFZTRNMU KxTrJxIUV+tBBjwTG1PEj9K6damnxsk8XVVv0a/G0y6lv8fBCvfUWovDg+i4ReaMu9wk ya3G68PT7F5GW1tDdv1/AT9tAtFL71roZhWR1NzWZhnyBFwPtHrxQAhrOMY3ePll6iKj qCOHqp/+gClFozOg9/7QlC/gMsbGH8bsuk8rIAyOWmbNOzL2v2mU5t8NTnHA3RoqOU8W fM+tmVZxBzfFIT34eGT/SBNO+XmWVfVykt+zoMOpK2lL3QFrqp41t171eSvwjZ2giEca AliA== X-Gm-Message-State: AOAM532GExYc7xnKc8idbEzDocTTKcNBYCXmADGtjVTKji6xsUbPUUDi EU8dWTC008vfwWTcKzHkhQnsyqVnBudcsw== X-Received: by 2002:a5d:64e7:0:b0:1e4:bb8b:d3eb with SMTP id g7-20020a5d64e7000000b001e4bb8bd3ebmr24247409wri.403.1646254364116; Wed, 02 Mar 2022 12:52:44 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id x13-20020adfec0d000000b001e31279cc38sm90801wrn.11.2022.03.02.12.52.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Mar 2022 12:52:43 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/26] target/arm: Use MAKE_64BIT_MASK to compute indexmask Date: Wed, 2 Mar 2022 20:52:17 +0000 Message-Id: <20220302205230.2122390-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220302205230.2122390-1-peter.maydell@linaro.org> References: <20220302205230.2122390-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::432 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The macro is a bit more readable than the inlined computation. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-id: 20220301215958.157011-7-richard.henderson@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 431b0c14052..675aec4bf30 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);