From patchwork Tue Mar 25 15:49:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 876019 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2728769wrb; Tue, 25 Mar 2025 08:49:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWYmwio+Uv0bBL+wM1y0XgNaoqHkvgh8JfXdJCe53+kS6gXgVZnCanbfiQX+o3msH2pLTSnKg==@linaro.org X-Google-Smtp-Source: AGHT+IFUy8vqmD1QZMnhm7fRqaQ3WHKsxQD6ZMSh09prRaZg6CxEdBq3LLBnhbBPiJzTvKl5IDrE X-Received: by 2002:a05:600c:46d4:b0:43c:e6d1:efe7 with SMTP id 5b1f17b1804b1-43d50a3b62emr102601175e9.26.1742917789582; Tue, 25 Mar 2025 08:49:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742917789; cv=none; d=google.com; s=arc-20240605; b=D7YAX3cPjngUgSPqFlc2D8AxML34ry+WSahUXVO6n5t0XWyrsyoFrHMC+VUCqwmw2f qcdL9fmpaDDkWcJNDSyDGrXtBa7fulxy/Ng3VcB5ghwwD7CFUzyhEMYB4z6S5nW0msuP b/iYqTMYWBGH2migfXa1FnTySGi4t1IF8SZeWPyjZHuKwhhdVaQpg80crGQyIbGsZ3rY uBGwArM9eSylUV9zDeKAwwhowATCSSdlR9/yviqI7IlxVeOX6f0DcmCCRDwJNXn9Frb4 v9Y8DKiN0g8hI9KgpeVM0iW64WLyHH2Y2jLneR+l23oTiGjDjRiH6UK2a6HEbSX+2sE5 MgmQ== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=cA7Sj8Xho8bkcpSlMx62uWgy6fn6azFGlkA5hKrCWkg=; fh=R+x3mVbxz+VBdxUkNHTlBrc1pdG54C8fOGni6vEtEKQ=; b=EcvND2X/lwBAV6U/ImD13Eu1YGgElxCua33DoQ+TRFbE8fOc/3gd/kedHk5wzE5bpI YJ00bX24krEkJeJ3QTsansw3C7Of5ik+wNFHZNJtujgs5+Zo7Zd/3NKW9djyWoen/yp+ bsqPnNClQ829Bnt03MiFEGHp1VKbLKRn4OISiNWHzNZ9/ZsX7XtaVPAuT0/hJm7nha6M p/MxT775K2yXoNvkwxsCBH4Buhz16/aAIaggRE79R1bhMzmrbA1kLgX1m1qPxF/iIV2l ebhwddeQcmG/vUERxUAqqqWwhrRZ3yoEHDSW00UB+ZLfqKmAMcgPMiEiniDFSwM679oz WHSg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E4GVlyKp; 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 ffacd0b85a97d-3997f9944fesi8222105f8f.237.2025.03.25.08.49.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Mar 2025 08:49:49 -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=E4GVlyKp; 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 1tx6Wo-0003hz-Rc; Tue, 25 Mar 2025 11:49:22 -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 1tx6Wm-0003hQ-Fl for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:49:20 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tx6Wj-0004v2-5h for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:49:20 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-39127512371so3894337f8f.0 for ; Tue, 25 Mar 2025 08:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742917755; x=1743522555; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cA7Sj8Xho8bkcpSlMx62uWgy6fn6azFGlkA5hKrCWkg=; b=E4GVlyKpc8X4Ucw0XN3m46yYm5YvY6Q70fbgMbx8LU+nMHZX7v/4Ji1rrVwRjsEfMG iQZdxhuILsTigoEhqPwgzS4bx7RqYwqUHYN70EiGvqHehHoCnRHOywq1MlqR64KxwfW+ ktBX+43mq+NQeBGydB2Ph95ZARgsyVw/KlSg2DgFhancyd6nYd1WRSCKcQzeqMBin41f w67OWyT5+JMu0vjb77WVS0oyMaavxhoniDT6jlg1WG8DsmWruLHg6Xz8kua1CoGhlKrZ r7nuy3jnxzuHSlFSe9gsvx6QUsZgRftnIRwmvYJ0mAFstNhco0+CbXo0JumM3Qy2mnNg Du6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742917755; x=1743522555; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cA7Sj8Xho8bkcpSlMx62uWgy6fn6azFGlkA5hKrCWkg=; b=sd5EHUBMJFWTgN/b+PBF5doTOYY1x6QPjwLkq2yzDK5b4PCkucr/aTKgKPJJWdKwri PrJfVZv63JvWqPKF6jYBAPIXRoVD6F4Uef9vuP4eiwER/wbHc5WCaSschTys7mUyv3B4 0evbaBrEy67jH7ECP0xXQmh68t3/voMgZ5ZldIpfTu16JqFevskIHODvsZMZQfnXfK1K 1lsudV81FLAHiIxLhh3JQm9CGjOhEuZEXqMzUsRkXX1ZXa1fDMOna/t0Da2ETsukbbek tMN5IQWIhJYp8qc0qpgsu7HQaXFZ8hCssbjzP1pzXvpRzwAGUR4ryw9ZdJjgzjbtKQ95 evjw== X-Gm-Message-State: AOJu0Ywk89/XC9WhgzCmZjfpSJuUSUrdGyEdtdCYx85JmxDNhkd/Hfoj 0nLapP/hG9afnSnPcE2KFR5QnCQeGIcaZ3I5D2jDwEkJoLxbFzGZ5EmpcIMBdnL5+wx4asV2lYK + X-Gm-Gg: ASbGncvtNdrQvVpGOSwa6pNnO6ik9BdzVARCnNaEJVTZPTv5p24Sjnvf+091sl8KV6U BhvdPhZ8bGkauteZKhSXMniwtNJa/hEncO+AWHcznm8XPaXoy+nodmr4cIrdnd1RPuwNpOi35hB AZ+IL26Q+lMdLke2OKNsLyEftWYeimqG/K5VLR8BOIXqC45Cw7Twf0m/THV1EX5Mtty6oxuZ16z dLfbdq6xbjeSAy61ecu/XKQdpuZVsuvFQ98f0z8idfta8iR/tcRXWOVTwadbuPWdPFS8uYF5xcL XDeVtjDh7F9QRvdBrRxQPhvNtK6uhSBTS7sF2wbKeaKCGOEnXJ8Q+Skh1tKbKxekzOMEFm8EZE+ a4i0dgugN6d8R7k4Srwc= X-Received: by 2002:a5d:59a2:0:b0:390:e535:8770 with SMTP id ffacd0b85a97d-3997f8fed26mr15880271f8f.14.1742917755234; Tue, 25 Mar 2025 08:49:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d43f33237sm205735575e9.4.2025.03.25.08.49.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Mar 2025 08:49:14 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Zhao Liu , Alistair Francis , qemu-riscv@nongnu.org, Anton Johansson , Daniel Henrique Barboza , Palmer Dabbelt , Liu Zhiwei , Weiwei Li , Pierrick Bouvier , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2] target/riscv/gdbstub: Replace ldtul_p() -> ldn_p(sizeof(target_ulong)) Date: Tue, 25 Mar 2025 16:49:13 +0100 Message-ID: <20250325154913.95283-1-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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 Replace the few ldtul_p() calls by a generic ldn_p() ones. No logical change. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis --- target/riscv/gdbstub.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c index 18e88f416af..c1dc54e47d6 100644 --- a/target/riscv/gdbstub.c +++ b/target/riscv/gdbstub.c @@ -193,7 +193,7 @@ static int riscv_gdb_set_csr(CPUState *cs, uint8_t *mem_buf, int n) CPURISCVState *env = &cpu->env; if (n < CSR_TABLE_SIZE) { - target_ulong val = ldtul_p(mem_buf); + target_ulong val = ldn_p(mem_buf, sizeof(val)); int result; result = riscv_csrrw_debug(env, n, NULL, val, -1); @@ -229,15 +229,17 @@ static int riscv_gdb_set_virtual(CPUState *cs, uint8_t *mem_buf, int n) RISCVCPU *cpu = RISCV_CPU(cs); CPURISCVState *env = &cpu->env; - target_ulong new_priv = ldtul_p(mem_buf) & 0x3; + target_ulong new_priv; + size_t regsize = sizeof(new_priv); bool new_virt = 0; + new_priv = ldn_p(mem_buf, regsize) & 0x3; if (new_priv == PRV_RESERVED) { new_priv = PRV_S; } if (new_priv != PRV_M) { - new_virt = (ldtul_p(mem_buf) & BIT(2)) >> 2; + new_virt = (ldn_p(mem_buf, regsize) & BIT(2)) >> 2; } if (riscv_has_ext(env, RVH) && new_virt != env->virt_enabled) {