From patchwork Mon May 19 04:05:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 891100 Delivered-To: patch@linaro.org Received: by 2002:adf:e88a:0:b0:3a3:61c9:c5d4 with SMTP id d10csp898610wrm; Sun, 18 May 2025 21:25:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUA0Mhcpdl5ijh44rrnUpPG4w6nyUVNq5tzLbYHtid/pZb/SQHIcRXmX/5HqVblsqRz2I6FQw==@linaro.org X-Google-Smtp-Source: AGHT+IEzMlbzZTlqOMiUfex2bGCZrg6gS+eT6CpwsqIz5da4FmQFktxrEY7w5XLENXq8Ma0jglj9 X-Received: by 2002:a05:6214:f23:b0:6f8:aa6f:438b with SMTP id 6a1803df08f44-6f8b08352f5mr199597906d6.3.1747628713075; Sun, 18 May 2025 21:25:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747628713; cv=none; d=google.com; s=arc-20240605; b=SRz3cnmySBU8rOfMQCUIaBkcHtIYNN6uG52f/O7xJ0Hb8LkWxO6riUfQ4N2szCUt8x uPagPBl0Wgn2K117wQwP6za4KEFIf3eDvX5piTHLFjn2TvTVspXlNhbVqfO9ARUpLSP6 wYc+7pxMca1kVwle1O2UFCD3bOhnYZlaEWpWsaFNk4Oq9Wl+cY1LjZtB4JJrxamq+YAj MeThSXFiwSOyLLT1ucxus1FDqS7Q6TI4c4Sr7EIv+PCQZ/9i1/fMXGax6X7Dg1z/uoLK x6RIH4mMUTJ5LnrcLBe/W/O7iVrTgrMUSMFYpvjX2g/yhJtXpExGVYsciB3Ka4QLEDGd h+2A== 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=YIo9lWxZ4TjsB8FoVA9uJ0EOvUm7HwUR23Lv43bqgeg=; fh=HDQYu5lPAnkQefrBKmRl4cF3eYSeew0dhs6uIHrlDww=; b=imaDcJo/+MXRZ5vLHdxANEYpc1RBNICu8yza4WiL2TLxuGWiTdpDWhOlaCd94vvO6/ 6iyHR7no73wU28ZcvW4smFgva4ggFKL3xpNDhBKVQt3lXTkh7eiee3+XWb2HoYGruDSj T+fPOV6P07PJmdhadTRAQ2w8UuqV1pKUHfynD1iST2t7CPJCDzMhPQty/fCKc3NsuymS 1Utc1Tr8Yha62AFcEokMZyW1H1YvYNxUErV4L4Nrj+7JUEKDvZU/KGeEjOGkVr1Wtmiq znt9OJZuNEujxa69mm8PHvGkRTaZ/fX213n7lkS/3/u6/MD22oCzVslhoayHjg8bj3B1 FsoA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nk2Q365p; 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=QUARANTINE dis=NONE) header.from=gmail.com; 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 6a1803df08f44-6f8b09d1bd7si78327836d6.475.2025.05.18.21.25.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 18 May 2025 21:25:13 -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=@gmail.com header.s=20230601 header.b=nk2Q365p; 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=QUARANTINE dis=NONE) header.from=gmail.com; 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 1uGs3N-0000cD-Nv; Mon, 19 May 2025 00:24:41 -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 1uGroC-0007Bl-2I for qemu-devel@nongnu.org; Mon, 19 May 2025 00:09:00 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uGroA-0004IC-BP for qemu-devel@nongnu.org; Mon, 19 May 2025 00:08:59 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-30ec226b7d6so1022261a91.2 for ; Sun, 18 May 2025 21:08:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747627737; x=1748232537; 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=YIo9lWxZ4TjsB8FoVA9uJ0EOvUm7HwUR23Lv43bqgeg=; b=nk2Q365ptujq+pd5aBuVR0GvUQ71viSXik2R8zfU0VOxdQuX++yv+/3hIMfxiAmylT ST4igzn/se/6u1lpXC33iL/VwnIzXiKSv/eWl70YFX3epXuzZr3ERHJYivXaYp+49FY3 mfKg9yP+XvM93L8wHGR+HfhZP63VXQl14ab9cF4IJtg3Ty/ELpGHYgnWFO60g/7VptmV N+0g/wSZwXi/WEWupADdJyDcrC2ctvAmidCgk/wqLr0XWBUkHcN3pKr4gU3dEfI177gq u5gpSckaFMI0CF7DySB8z4p8xKPY4ZbRrVhwC0I5yJhGH0aNPqJmv23s8yS4ZJT2FMSG iFZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747627737; x=1748232537; 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=YIo9lWxZ4TjsB8FoVA9uJ0EOvUm7HwUR23Lv43bqgeg=; b=kEIXe5PZXCLn4uaKHZkUp3X9H7IqhOwVAmAwUTSH0hLfRVq/pX9VUaDRR8G0QAZsOv CSa3sCwotU8QeGRvOZ+QGFVSHfuizQb31L2YPMNLLzb8q5CTjeovLuYbnazC+8XaWj02 HYcF1YvI5wvLRs1oZRCFzB+EEyIUdbsmJPbRF/8GUsShhl4pC5jQv6YKfXQ72+XmXyhD Mgqf2p1GYJ0cuR5Rd9urwCcPEVsBgL2xLB9w6yzViEem+DUF50OUnoVZUB3/FGvnfUIu wdxKjjgHFV5v2juDtlDTuh5Eig4mvUS7RCQ4mIBIL7oMP/D6lSlG69zYH+P5+6T/+wPp gpcQ== X-Gm-Message-State: AOJu0YzNJQ0qLdQeURO9hphvxDtupaAc0f33vMtolqw+RuGWvzwqAGzf QFrnjKFUJH2NJqJ7nEXP6dRDmjIZZSXAhtx5yx/vc8oRAel6d0B2vAYBrvIxkg== X-Gm-Gg: ASbGncsWycUN0u6wP8BnTQhaAtg2Y4WdSNp8PelXUYErV18Pfp4ZUvL9kdY0+KdR9yG VDVNucHl+G/K2GuV+usFojFgI2vmZV+HYOxT8VI6TmZXgjgnfV1Du8RLzy7drTrMXu+8cw7Exp+ KdZJs50EDXG95jiWGHXEifqGRPBfgwow5Pqidmdi1dPsR79xvbAESs0KGeze07tQ+Q6DxhCm7eK zyUp4eB+t6gdgzSidGBgtB2YdsgvQ1z6/yySHz0amYnOWcEFao/OfNj0gFE3q7kCEUVuz7DdiFP 0rE/Al6f0cJF0mSSTwZiv3G6n5MVu4DUn2fGM0DtfLDNa77rAqnWDnypISooRmjk1GVCji2awZT E1mauHljhvrBpTrsYR7x6vNrB2wP/+Ya5MFApnZ2wColauj8hEtWADrlq X-Received: by 2002:a17:903:2bcb:b0:215:b75f:a1cb with SMTP id d9443c01a7336-231d43d99bamr161659835ad.9.1747627736595; Sun, 18 May 2025 21:08:56 -0700 (PDT) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231ecd5ea41sm41750035ad.228.2025.05.18.21.08.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 May 2025 21:08:55 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Richard Henderson , Alistair Francis , Daniel Henrique Barboza , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PULL 34/56] target/riscv: Pass ra to riscv_csrrw_do128 Date: Mon, 19 May 2025 14:05:31 +1000 Message-ID: <20250519040555.3797167-35-alistair.francis@wdc.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250519040555.3797167-1-alistair.francis@wdc.com> References: <20250519040555.3797167-1-alistair.francis@wdc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=alistair23@gmail.com; helo=mail-pj1-x102f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Signed-off-by: Richard Henderson Reviewed-by: Alistair Francis Reviewed-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250425152311.804338-4-richard.henderson@linaro.org> Signed-off-by: Alistair Francis --- target/riscv/csr.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 22149bd3fc..8af0304a36 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -5588,7 +5588,7 @@ RISCVException riscv_csrrw(CPURISCVState *env, int csrno, static RISCVException riscv_csrrw_do128(CPURISCVState *env, int csrno, Int128 *ret_value, Int128 new_value, - Int128 write_mask) + Int128 write_mask, uintptr_t ra) { RISCVException ret; Int128 old_value; @@ -5610,7 +5610,7 @@ static RISCVException riscv_csrrw_do128(CPURISCVState *env, int csrno, } } else if (csr_ops[csrno].write) { /* avoids having to write wrappers for all registers */ - ret = csr_ops[csrno].write(env, csrno, int128_getlo(new_value), 0); + ret = csr_ops[csrno].write(env, csrno, int128_getlo(new_value), ra); if (ret != RISCV_EXCP_NONE) { return ret; } @@ -5637,7 +5637,7 @@ RISCVException riscv_csrr_i128(CPURISCVState *env, int csrno, if (csr_ops[csrno].read128) { return riscv_csrrw_do128(env, csrno, ret_value, - int128_zero(), int128_zero()); + int128_zero(), int128_zero(), 0); } /* @@ -5667,7 +5667,8 @@ RISCVException riscv_csrrw_i128(CPURISCVState *env, int csrno, } if (csr_ops[csrno].read128) { - return riscv_csrrw_do128(env, csrno, ret_value, new_value, write_mask); + return riscv_csrrw_do128(env, csrno, ret_value, + new_value, write_mask, 0); } /*