From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2AC6AC6FD1F for ; Sat, 25 Mar 2023 11:56:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pg2Uh-0000cd-Bu; Sat, 25 Mar 2023 07:55:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pg2Ue-0000bk-Ja for qemu-devel@nongnu.org; Sat, 25 Mar 2023 07:55:32 -0400 Received: from mail-oa1-x29.google.com ([2001:4860:4864:20::29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pg2Ud-0000QR-26 for qemu-devel@nongnu.org; Sat, 25 Mar 2023 07:55:32 -0400 Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-17683b570b8so4425991fac.13 for ; Sat, 25 Mar 2023 04:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679745329; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7Qi45RbjVmBVTz34gjl4oQKcVrFIWG+fLl/XiM+HKu4=; b=vyK9DAERIeuxreY1S2GGrcegv3LF+tE/N7S76fJ2s+P3x3jf0q0m7CkUzaSaPdnMp1 JU4Z1tpwGsAPYbi051Aq4r3GB7zEW1S77XI1SNT7lvsJTu2vSsu/PyjhXqovuUR8rMTK 99qovgAJUQf3SKJkKbgn2P8rQI4x1u0Q+QEulJqGtF0/6VBdkQYzQgvvFbyBfgGC5JsD GZllD/k9RHESA41S9JGyw/HO/FMSZJ3qu4jRIdKPAb5bC5W7tvof2lTAwiwRq7b0Xpcf ZdA2ae9Lb9WYGpryGmjt1Pp4Z925j3txJk+L7+kD4r9VZLyrHHdoCgYs1FuVSWRU+qmj PUFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679745330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7Qi45RbjVmBVTz34gjl4oQKcVrFIWG+fLl/XiM+HKu4=; b=oSxTtB+T+keWV0sZEcNmDgwa/Kc7ZZofuXpoe1DilA83E1XY5z84qhSvMXhyq6ArWn l8Z59m2Y1X+tPU+G4FNQlLWKZ0zQNHVrvA/5QfuskWN1L3M/AMoH9+rRDlLHNkrEmdQK dGXz88TPdMhP97WZbA239jSAsPX9Upl43G8QiAh//SXQPDPIa3iXRPUxEGyPbsx9+msC G/LMIU0ZDgpFyWO9kwT5f3YPXiyJ6XEkNhSdZGU8JhtQS0zQmwAkk9x/qvZGYWZFTxyf S0ZQ/0mHplClCw7M1wh+kqCGNjv2IAWG96qiU3k7wlFArU1R8PxvSHsuk8m0T/4oRu27 HXXA== X-Gm-Message-State: AAQBX9dADPA8IqFyRpU/wKkDW+8SfWBgfS2D+yTgvlYUPDr3MubsuZS4 n69v9a3XIcPLNzNjiQUqAExaHZ6sZu8gFuZ42DQ= X-Google-Smtp-Source: AKy350ZFbLOFm2BeqkYOUROUzhIQdwbe9nbfcUqMiTMjMAs+Dhwoa9x0I/EXllZxov9GIFMSn6R5pQ== X-Received: by 2002:a17:90b:3502:b0:237:8417:d9e3 with SMTP id ls2-20020a17090b350200b002378417d9e3mr6330234pjb.15.1679741681283; Sat, 25 Mar 2023 03:54:41 -0700 (PDT) Received: from stoup.. ([2602:ae:1544:6601:790a:6e23:4a91:70a]) by smtp.gmail.com with ESMTPSA id p14-20020a17090a2d8e00b0023af4eb597csm1234684pjd.52.2023.03.25.03.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 03:54:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, palmer@dabbelt.com, zhiwei_liu@linux.alibaba.com, fei2.wu@intel.com Subject: [PATCH v6 12/25] target/riscv: Introduce mmuidx_sum Date: Sat, 25 Mar 2023 03:54:16 -0700 Message-Id: <20230325105429.1142530-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230325105429.1142530-1-richard.henderson@linaro.org> References: <20230325105429.1142530-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:4860:4864:20::29; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x29.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org In get_physical_address, we should use the setting passed via mmu_idx rather than checking env->mstatus directly. Signed-off-by: Richard Henderson --- target/riscv/internals.h | 5 +++++ target/riscv/cpu_helper.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/target/riscv/internals.h b/target/riscv/internals.h index 7b63c0f1b6..0b61f337dd 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -37,6 +37,11 @@ #define MMUIdx_M 3 #define MMU_2STAGE_BIT (1 << 2) +static inline bool mmuidx_sum(int mmu_idx) +{ + return (mmu_idx & 3) == MMUIdx_S_SUM; +} + /* share data between vector helpers and decode code */ FIELD(VDATA, VM, 0, 1) FIELD(VDATA, LMUL, 1, 3) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 888f7ae0ef..7e6cd8e0fd 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -852,7 +852,7 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical, widened = 2; } /* status.SUM will be ignored if execute on background */ - sum = get_field(env->mstatus, MSTATUS_SUM) || use_background || is_debug; + sum = mmuidx_sum(mmu_idx) || use_background || is_debug; switch (vm) { case VM_1_10_SV32: levels = 2; ptidxbits = 10; ptesize = 4; break; -- 2.34.1