From patchwork Fri Apr 25 16:50:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 884419 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4064402wrs; Fri, 25 Apr 2025 09:51:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUfKvB1JeZT/cSh9yGgNX8yQIijqRKRWRJ2R0B/LfWiy51eWQDExkxOw3DJ5a4P7uR5cxqnnw==@linaro.org X-Google-Smtp-Source: AGHT+IGvdVoQ+6temFrGtehsGkf755rO95NqRzi/10TkZKYBe57Iebdaij6hmHCII9S4ltq/CeaQ X-Received: by 2002:a05:620a:414d:b0:7c7:c6e9:963c with SMTP id af79cd13be357-7c9612d165bmr516892385a.4.1745599898983; Fri, 25 Apr 2025 09:51:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745599898; cv=none; d=google.com; s=arc-20240605; b=XdxWvf8M9MgbrG7v8hj2xczsLuGGxTXBI/RZ7JOxtv6PoGAFvYHjaw3NzKCVv0rw1h P4aVU5g7VSiWkE8AiqJN/bGWprgzqter9qJhaEhadgIodx1jD/3z67SfYZkopLYfDoEU /2EV6ozapPvgNrMXrebeoecqSUZ4X4qJ7T6yBQ4TZiBxoywi+LQ77qHcjK4Mjdze5ZdT 0maJxzqIbZYRHQSlCpkmw8YlBMypEtvhRFgtI/0xzLtWbP9bJF6Dh88NmvT8PWUtCiG/ Fc8tSLAbgp4u86E1ImTJf8+hT+TzQ+fmuPo1nAsfIbl7Rnjq1bnjI5SWFdrt/gDjEHrr Surw== 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=DjBezA6rw6kjbWq+raeDJ4udUADeZB6guIKyj/zwrZk=; fh=tbsDrCdppOEjIVmMhMa/fTPU8DqwnjNG7rxGE3k2FrY=; b=OSJfGQ/8RE5SFQxOlUv2AnQ6gUWYVxwJNKBUjxGM9wSmPlBaZWWaw+C41N7jY9LyFO 6eK1FKEMAOyuKsOCVUXCOFUiS5SJQRUmsVk7y/C4YGsBAz99Q7b/0YBSenH6ILi0QkNc 4jTWaW48AbO3fD06kPENCl5EC4MXtV62v6EWpOxK4MSmwAKwEzoPIbjJru5hDNx2JJo6 116s8eS+YYqMezQ7qXRcDtAAa3qMgryz5YSQt90iDLewBdRVbttS4Di6i0AcBgJx6qjP 4a8RVeyoDULmoWE8YOdjXBqorRHc0NWeR0pMyRzHSBB2foca/hwC0uFXIkdUykPQ73fU s/4w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I8CiU+ed; 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-7c958d86fb0si413970985a.293.2025.04.25.09.51.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 09:51:38 -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=I8CiU+ed; 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 1u8MGW-0006Mm-A7; Fri, 25 Apr 2025 12:51:06 -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 1u8MGT-0006L1-Hf for qemu-devel@nongnu.org; Fri, 25 Apr 2025 12:51:01 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8MGR-0006xT-0p for qemu-devel@nongnu.org; Fri, 25 Apr 2025 12:51:00 -0400 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-aee773df955so3151789a12.1 for ; Fri, 25 Apr 2025 09:50:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745599857; x=1746204657; 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=DjBezA6rw6kjbWq+raeDJ4udUADeZB6guIKyj/zwrZk=; b=I8CiU+edSuJo9RQXHNIAbM8Vhb8/3FHa7piyMQP7O5TyDfJT49YJhidlEUI986Qwhj TuHjcLF03toE4sJa1ktxJdnGlYOCp5978SLP8GHSEsoTsLclCwb+MlzSklE1l6CcyJwo n7BvrUwPofYRqAnCvqm7zgmE8mOO3wlzNfdSrQAXOR/T9uhoHSmmPmB5IcgChDyborGM 5hj8s931Ovn9zM+5xpRamUyd1vbvBYVD+gTlMujpjwi00YroQYg1RMgf/nNhKTck0Utm QPUDOu+mjeOd6L8YOPsrWA+U/SSojyFv0jN2NBxnQqDimgEhO0SUNLovI+Fc37SqmwCm GdeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745599857; x=1746204657; 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=DjBezA6rw6kjbWq+raeDJ4udUADeZB6guIKyj/zwrZk=; b=AinE4ygJSLxDA7O4SOg1XQkrck+Hvr7s9Ia1wKT6sxPcli0LHdMWxZPJHpgSjIo4eD lKKjvJsOqv+MyFeXtB4FNLtLcG8f5bvImzKw+WaCSrW11g28LBYXvs9R2UU4XHPhz8H9 ot40xRCU7NNfpKKfD7IJMje9HqwpeTqGbJqK1pv4OXjlbgHoYsXWbMd9RCLWYkxkli+W iojdeIHlicJdhqC8BsoTb8sh5nOkaAuIwETgYPUutD8uUFG1N9pUU4XmcDupsta/C2eO grFkP91V4pyU9C0t4DlpSBNsQWvoBq9y7ZZ1o2SjxYtHk453YEIGvyoUBnviPBDOEqgP qxbg== X-Gm-Message-State: AOJu0Yw3V47LnIwW9NVoMAAQjHgd4MeKlwYV0d1ohWI/P/4L0YbwMNnU jK3q/5uBTjQFJn2E1zL2sfobssVj1pjLDe2GA/ReoVVoqmC06LvZepHxKBoXP8EkFpOgNN0VYT5 N X-Gm-Gg: ASbGncuC1J1GrrsxzFMypnLI3benXY1aVzQLnAHDcCpsGK5AcDSCTOeBXdPcQPAOLsl bUBPQyENWPRMqHM/Nb9xcjipOGi8WfMZA91AxZl/R0Lq7NwGNG5yPoFjTXXpvliFz7sBeWhRho1 VlmBg8rPtVOMSI9RK8m5DMWNBd2qp2ZOiNHQGTL9MeG1shL86+anT1DuCMcXlTtjnrUe9c5dL1C BT418AhI6OLuCAk67GS3XKnplLX65p9X5bevJujb1RCIClv/PeMJpYOnaPvJuOx7wPZe/2i4irn sYYDVu5apUaR7vH9Rz2HWXgF03TCMv8DQ8ond1xoTsw/Btf6tRBKn8QlraZ+4CMHgMBqbJ5dSno = X-Received: by 2002:a17:902:ebd2:b0:223:fb95:b019 with SMTP id d9443c01a7336-22db49988a5mr98732455ad.24.1745599856906; Fri, 25 Apr 2025 09:50:56 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db50fff4dsm34637305ad.159.2025.04.25.09.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 09:50:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, dbarboza@ventanamicro.com Subject: [PATCH alternate 0/2] target/riscv: Fix write_misa vs aligned next_pc Date: Fri, 25 Apr 2025 09:50:53 -0700 Message-ID: <20250425165055.807801-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52a.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 This is an alternate, but less exact approach. It assumes that there will never be a 16 or 48-bit csr write instruction. This feels dirtier, but it's a fair assumption involves much less faff. r~ Richard Henderson (2): target/riscv: Update pc before csrw, csrrw target/riscv: Fix write_misa vs aligned next_pc target/riscv/csr.c | 9 ++++++--- target/riscv/insn_trans/trans_rvi.c.inc | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-)