From nobody Sun Sep 28 16:34:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1758698818; cv=none; d=zohomail.com; s=zohoarc; b=JR1vte7u732fKdwt4BW5xqAJyl07kuInogReMqUNjBQdaIwoglMZlfgZOi62ZMUvAfSycLT1rMIU9A1ZYqCDVm0l3rB5tdwZNvBjabwpUn2mZHMy7/9/oUV5PAAg3Uy88lZfBKUB2tJNjslz1ERxlxmZdg2N5tI+HwQM7Kw+DxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758698818; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=ui9d7qGLrNXHd9ideOeuKiUKn3f8NG9mb5zPIxxyYtQ=; b=HM9jLu2skvvOgR5TCbeWn1N8YwtPLTYkkhsvmfODkc32HxIyWLSlNdN2tqw1NWg7yWIUBuI8Zcmrf8/D1DZVJT28uapJUL9/yYPNDpQ2974ic5k72y9Ll4gcbfJPSu/3sudKEI+KhLbK6eoquUrw8grwPk76OpCb39egj4KVXFg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758698818078825.2433986879901; Wed, 24 Sep 2025 00:26:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v1Jno-0005sR-0l; Wed, 24 Sep 2025 03:20: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 1v1Jnh-0005pD-TG for qemu-devel@nongnu.org; Wed, 24 Sep 2025 03:20:32 -0400 Received: from rev.ng ([94.130.142.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v1JnZ-0003fm-7d for qemu-devel@nongnu.org; Wed, 24 Sep 2025 03:20:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive:List-Unsubscribe:List-Unsubscribe-Post: List-Help; bh=ui9d7qGLrNXHd9ideOeuKiUKn3f8NG9mb5zPIxxyYtQ=; b=aN9wrBeUSbxiwkO tV/Qu02uCt0Xb9H6Jkm/k6fDJmeWLx1DHohd8L9j1C2MJY8bJmCysJGjPL4kkjoZvfQYVDPQJ0xb+ VHtUZx1XBBXbL+rp6YLZO3G8oblyNT36BkNICK95VamJ9hm5KeLZbJaBRzovxAJBHpWrNSDUOH2cy 2k=; To: qemu-devel@nongnu.org Cc: pierrick.bouvier@linaro.org, philmd@linaro.org, alistair.francis@wdc.com, palmer@dabbelt.com Subject: [RFC PATCH 28/34] target/riscv: Replace target_ulong in riscv_ctr_add_entry() Date: Wed, 24 Sep 2025 09:21:18 +0200 Message-ID: <20250924072124.6493-29-anjo@rev.ng> In-Reply-To: <20250924072124.6493-1-anjo@rev.ng> References: <20250924072124.6493-1-anjo@rev.ng> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.130.142.21; envelope-from=anjo@rev.ng; helo=rev.ng 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: , Reply-to: Anton Johansson From: Anton Johansson via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1758698818521116600 Content-Type: text/plain; charset="utf-8" Widen to 64 bits in size to hold all relevant values. Signed-off-by: Anton Johansson --- target/riscv/cpu.h | 2 +- target/riscv/cpu_helper.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 1498ae063e..592c741947 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -653,7 +653,7 @@ RISCVException smstateen_acc_ok(CPURISCVState *env, int= index, uint64_t bit); =20 void riscv_cpu_set_mode(CPURISCVState *env, uint8_t newpriv, bool virt_en); =20 -void riscv_ctr_add_entry(CPURISCVState *env, target_long src, target_long = dst, +void riscv_ctr_add_entry(CPURISCVState *env, uint64_t src, uint64_t dst, enum CTRType type, uint8_t prev_priv, bool prev_virt); void riscv_ctr_clear(CPURISCVState *env); =20 diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 2945a89a9c..4acfccc9d8 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -925,8 +925,8 @@ static bool riscv_ctr_check_xte(CPURISCVState *env, uin= t8_t src_prv, * entry =3D isel - CTR_ENTRIES_FIRST; * idx =3D (sctrstatus.WRPTR - entry - 1) & (depth - 1); */ -void riscv_ctr_add_entry(CPURISCVState *env, target_long src, target_long = dst, - enum CTRType type, uint8_t src_priv, bool src_virt) +void riscv_ctr_add_entry(CPURISCVState *env, uint64_t src, uint64_t dst, + enum CTRType type, uint8_t src_priv, bool src_vir= t) { bool tgt_virt =3D env->virt_enabled; uint64_t src_mask =3D riscv_ctr_priv_to_mask(src_priv, src_virt); --=20 2.51.0