From patchwork Fri Apr 25 15:23:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 884351 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4021803wrs; Fri, 25 Apr 2025 08:24:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXDPeS3DV6gjT2wZANH4o/paclTyA62PGd8uQO+hXY59z+OmMwATY07NIjsgw1XPfuFouWxEA==@linaro.org X-Google-Smtp-Source: AGHT+IHfWL9S1UyNeEimobf+w4X+Y7ub5xmNChREc4W1CrMI48NtKR08Zo7iZXgTlG3VDADbXzob X-Received: by 2002:a05:620a:254d:b0:7c5:4463:29a8 with SMTP id af79cd13be357-7c96685c31cmr982385a.11.1745594667557; Fri, 25 Apr 2025 08:24:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745594667; cv=none; d=google.com; s=arc-20240605; b=OM5EG3ugmWZf3qtM5tPequCFKf0vWtdLH0NNEQ7+zgY77mbdFc2kmeFkY3p1VEQwdZ KMVyTo3BEopvaJM94S+rjs7haf0D6eAy2m1MAoylV56usAr7ggRAeyyYtMPgNXHFn8xR LceaO0f23E4wRcQ+Ya6VNcx8uCmX+tfFRHJBB4e4hiwdAzivV5uo8jfNnt0oaEGaQNNA DCdjrsCFxjsf+HolN5F50UYsybWDpJf/PFzD+H3IeTQqY61Pl81etPjhCj9LU/AHP678 g9HiIcvEjxVkoHpimyjk0gpUn2PtWSJaSkrg+X39goyZOBHCyvakEZuC09i8Swk7sbLk nvqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:cc:to :from:dkim-signature; bh=8BkGqEuOn61y/rqWawhxPHU+tldQWor40BhhDmmwEXQ=; fh=tbsDrCdppOEjIVmMhMa/fTPU8DqwnjNG7rxGE3k2FrY=; b=MudryyznkUZbP7GjXgRLnieadGkQ/Xt/Pgtkd+AhWWlqYYjqxxF/Q5yK/sSz2amnuX KS3lXitu3v0YG6VKSPSShc58gQSKcV5uqHBcR/bItpfNo6yx2PH4wAUoCivS2HDIUGLa Vy4jGrR1ugTZgbjxu/Wb4RcvpHEl7Lrl03txvKlV9gC3fIdDzF4DwKVcl5iJClQZDrBM 4yw6qUcgEc0z0n4WyZ6D2rBdrKPkKgIHmEwL6z8q75Sj/Mpit3abSW/x4725Ydy4Q8PV XX4CH8b98lWl2vSzzjOYYArPJlia+C8hMlF7SgzMgl1Z9RXZm0bPLiDBlqQ0uILj0xpk fLig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SsBbCtFI; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c958c9e306si377685085a.54.2025.04.25.08.24.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 08:24:27 -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=SsBbCtFI; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8Ktc-0001dL-QB; Fri, 25 Apr 2025 11:23:20 -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 1u8Kta-0001cR-PO for qemu-devel@nongnu.org; Fri, 25 Apr 2025 11:23:18 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8KtY-0002oh-4K for qemu-devel@nongnu.org; Fri, 25 Apr 2025 11:23:18 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-736c1138ae5so2394907b3a.3 for ; Fri, 25 Apr 2025 08:23:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745594595; x=1746199395; darn=nongnu.org; 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=8BkGqEuOn61y/rqWawhxPHU+tldQWor40BhhDmmwEXQ=; b=SsBbCtFIw5iTUa0ymAkHo66jiTp5kKdO9N01HHUXtHnfwNJbkNqI6i6RstPmmyFDnT aSVhvlbHW+Yjt6NdJk8So55h0cY17MRmT5B01w4ASRm8ZGW1PF6FAnOlqYXLk5I/8JWZ n2iVgKNrT7QY26YPJIb/7YQhueq07XsxJ/X3gBSl/y0X/HO5KDB2u7NYEPGrzIrpxJAO 4rEcKHqPR/Y0GuFP89jO+rSk6ON4PnwFiASILyr4kLbXVXE3kKk6siau7SyeESE98C8U jer68v5Wyay7R5YruE6m0dRjflcSj70vgvtu9N9yJa42SRE0SWuBTTnCkjgHt07POKQP X6sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745594595; x=1746199395; 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=8BkGqEuOn61y/rqWawhxPHU+tldQWor40BhhDmmwEXQ=; b=Pu4MqJ+y3SC2g+jxrOoyX68QHGq+eLnL7kJILvErLd7eKIejTDsCBaD5vKPDfptEUR 5EE0woga+XAFZBoo62R5S45GjVYZNMMlQ+lDjmOnp/qXvWbCwYe4VVwAkyPvBqeDKlFO LyWFPSf+WWZaRuBssXk53zbc4Zx4YoBw31BydzVJPwi0scTURVYbVo5zYA4iKqcqAqq7 Ku9lmuqE1KfLNODwDxlhPpqTBNIViUVCTQLhpmfPDls1ji8xV3+B56Huetr8o65Cl3Bi 7KwH3ixaNmCB0gEnoz1LVLX9kak86/bgPVieTEQC/fcf4yrxu3IjPJFTmkWmsprwgyZ0 DPiA== X-Gm-Message-State: AOJu0YyWui5h1S4dqa51KYLUkDUsva13lz1OnpMh+IfTgqb/zUnse8+7 np5orDcs4q43PVCT0XzfbYGXY/MwTv2xgHLVEVpiPL/5vGT7KkLVVP48zdo+JlQRDaFJwWt59uO t X-Gm-Gg: ASbGncuHQ44QlfMUsVKUZEoZgT7ycjHjINa58Ulb/amR2/e+Wv5ge7a4fQ5Kepz2miZ hBOuBnvMGM0aGG32SdbC6P3ngU/hzTaZDNxYjLEZrxpTVMSlLsfzc9ncu/0VPZywISLfKICXb+E W2WlBwdVwlFxf0Aa6F0oNmNMOiURj4tNOUBMx+OSlEXFJ7iC3eODCOpxzpALjMzI438ByF/M0ZR 0ywCV4uNb+4TNLf4Ndn0jsIailE5pXhbhQU7tg8IQV3V4zXXJVc43HdDbGKr8Twf/PDZ5ogI9tu Mc1L1LRyHmASptGoDeoQhrOfU8mnfhH1VSGLT71321/VjYFoB5ilxn6tgtVAF8uBDfcgULz//JQ = X-Received: by 2002:a05:6a00:18a2:b0:73e:598:7e5b with SMTP id d2e1a72fcca58-73fd6af4105mr3402564b3a.1.1745594594677; Fri, 25 Apr 2025 08:23:14 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a6a49esm3390466b3a.106.2025.04.25.08.23.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 08:23:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, dbarboza@ventanamicro.com Subject: [PATCH 2/7] target/riscv: Pass ra to riscv_csrrw_do64 Date: Fri, 25 Apr 2025 08:23:06 -0700 Message-ID: <20250425152311.804338-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425152311.804338-1-richard.henderson@linaro.org> References: <20250425152311.804338-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/riscv/csr.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 6f1f69eba6..e9c2f95b6e 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -5516,7 +5516,8 @@ static inline RISCVException riscv_csrrw_check(CPURISCVState *env, static RISCVException riscv_csrrw_do64(CPURISCVState *env, int csrno, target_ulong *ret_value, target_ulong new_value, - target_ulong write_mask) + target_ulong write_mask, + uintptr_t ra) { RISCVException ret; target_ulong old_value = 0; @@ -5546,7 +5547,7 @@ static RISCVException riscv_csrrw_do64(CPURISCVState *env, int csrno, if (write_mask) { new_value = (old_value & ~write_mask) | (new_value & write_mask); if (csr_ops[csrno].write) { - ret = csr_ops[csrno].write(env, csrno, new_value, 0); + ret = csr_ops[csrno].write(env, csrno, new_value, ra); if (ret != RISCV_EXCP_NONE) { return ret; } @@ -5569,7 +5570,7 @@ RISCVException riscv_csrr(CPURISCVState *env, int csrno, return ret; } - return riscv_csrrw_do64(env, csrno, ret_value, 0, 0); + return riscv_csrrw_do64(env, csrno, ret_value, 0, 0, 0); } RISCVException riscv_csrrw(CPURISCVState *env, int csrno, @@ -5581,7 +5582,7 @@ RISCVException riscv_csrrw(CPURISCVState *env, int csrno, return ret; } - return riscv_csrrw_do64(env, csrno, ret_value, new_value, write_mask); + return riscv_csrrw_do64(env, csrno, ret_value, new_value, write_mask, 0); } static RISCVException riscv_csrrw_do128(CPURISCVState *env, int csrno, @@ -5647,9 +5648,7 @@ RISCVException riscv_csrr_i128(CPURISCVState *env, int csrno, * accesses */ target_ulong old_value; - ret = riscv_csrrw_do64(env, csrno, &old_value, - (target_ulong)0, - (target_ulong)0); + ret = riscv_csrrw_do64(env, csrno, &old_value, 0, 0, 0); if (ret == RISCV_EXCP_NONE && ret_value) { *ret_value = int128_make64(old_value); } @@ -5681,7 +5680,7 @@ RISCVException riscv_csrrw_i128(CPURISCVState *env, int csrno, target_ulong old_value; ret = riscv_csrrw_do64(env, csrno, &old_value, int128_getlo(new_value), - int128_getlo(write_mask)); + int128_getlo(write_mask), 0); if (ret == RISCV_EXCP_NONE && ret_value) { *ret_value = int128_make64(old_value); }