From patchwork Tue Apr 22 19:27:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883104 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2595123wrs; Tue, 22 Apr 2025 12:56:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVdWTUZQ6a3Row2dLnslSWrOyzDjRQvxt8qmu3G0s4I2RpZLaCYxsWVn8Ir9q29Abx8WMf1Dw==@linaro.org X-Google-Smtp-Source: AGHT+IHxfz8V+C15guMMjePd/2X/wR5P6UNlNROtC76QcLeAjRHyzosaNjPAu7SVWcY/3kkBOm7u X-Received: by 2002:ac8:5711:0:b0:476:b82b:ac91 with SMTP id d75a77b69052e-47aec4dc98emr334591531cf.49.1745351807095; Tue, 22 Apr 2025 12:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745351807; cv=none; d=google.com; s=arc-20240605; b=JBQUPiB+j02yVmriyvaae09bvjJhDDDZ9ieqzp+YVUdDbzm66FXt9xWvmDIILhp/Vq imYcBbAU5de0+5emi8EiOl/cMTTlFrOpwUCHS5ni6HwRVjPLlSU0Ozrw5D1A+boGc14F 1asorPnUYvJhLyh7wTikXmNIaqK3AV/gtSTFhyce/KEI/MjGrieue6k7BuS81X78+YlX I883RkiO4BzgipuuKvXR8hCrmuPOkeNaaxwT6KbU5IJnh588yWcJgakKZq7x7O0ifaq5 zWBduVQHqSrpIlB/l52FeeXVKHlQfM5h6N+WvkrFgaGv9hCLL755WvZGtw8ocQffJlu7 a9Lw== 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=CTmftL2su6jwrf+15dG9AUJcmzSAFqQvTSHtk/3sj+U=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=Y89uB3qbX1rnTlbzlTD0P/8ZWWF+iRLgMfOD0Ii8A6RNj37K2r5R9iqkI6iMhLWnTn 7IhxuKUSAyhniGUhgcIpTOAZEbVjvG10rOyP0iZlvzAOUs4OHC8rEYi6omdRO9vg1/H8 fhRH2sGh5mLpfzQQZJDzS9G0AFG67RicuLv7mQ7BKmLttU3mIhiq0Uu/Dtsa+DV/+J43 lk5QHAEEMW99mSMChkq2SPHGtM2CX3Lc/RSpQE7u+i+nNeEKNoJ6vvRSOjXN+vqI6jAr 7hvIeXWIVN/0nwUOzDuSVHr0H7PmgNjECOl3H9902ZXn841cqFkq0DNBIgQarG2zOV05 k90w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B08RjbiH; 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 d75a77b69052e-47ae9cd409csi118257811cf.503.2025.04.22.12.56.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 12:56:47 -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=B08RjbiH; 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 1u7JRM-0001jP-KZ; Tue, 22 Apr 2025 15:37:56 -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 1u7JOs-00054X-78 for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:35:30 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JOp-00071j-Or for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:35:21 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-223fd89d036so69452925ad.1 for ; Tue, 22 Apr 2025 12:35:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350518; x=1745955318; 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=CTmftL2su6jwrf+15dG9AUJcmzSAFqQvTSHtk/3sj+U=; b=B08RjbiH8y8/3G6mzimTaWpak4VNv6I0K9M9WfQ0QWBRkYEGenSsOrU+cgFKZOhUYJ H+JYiKiHXCF436K/46qBRh3ZQybO9Z29XClYdJ70E51vbOm6ZFlEiK15J7TBUTofn/1C kW24wsGjcc9e+Z/oQu07AO57hWhBpC5bx4/OUDLMAIslhd7rCugMVb2VZE37r1JbOoYe xUCgQNW4dZVfb9Z9InxASuApi9OFtCTHe6XSSJLbDTTkPkr1j1K1PzsRU/Ufanr4ReJJ +iDVZUKhJauPyw7GycJMUcgkQiptSY10pi1VtKntMbGsmFXvZK9yo/l5PJNnQ2MVSgoU 0zlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350518; x=1745955318; 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=CTmftL2su6jwrf+15dG9AUJcmzSAFqQvTSHtk/3sj+U=; b=xJvmpooxkYl/kK5D3Y5/fPh4ITWMC2LGCQq3RDdj5nekSRKuyHCCQRYSZN76Q9KOJl njrsbtKkbkeW7OpQ9ts4V1dU7e868i1zv2VLVv9WrehrYO8+cglyIuj8U5NzvRVKXWcw 6P/4j99BwoIfetgLBsKJKjYC4xB7Tvdbg3kF7Kjmrf7wi4nBf2hxW6SH2KP6YaZY2JWg O9pxYWbe9SsIyoH0UpPf1RDqKs7qrI9HeZ0zc4Ovi9RFkGwJCZYw1B911zAOtQjs2RVj bqnpfRIbEOtYD8XsxBPt2h94Nlz+gHNqU3itJ+Mz8BmT+iW7Ie/30tPV+w/WbgA7Ux2X btmA== X-Gm-Message-State: AOJu0YxPx4HhmPpgMKOVuy3n2v8Mneir1udKAzb4p2sej+/z1JrN+Gw8 8ETh5O+N6y6kOFryzLQa3F7gzW7fMfF0nPsh5fXSrOEFiK2ujDsJveNwCJNK55ekdffA7vo0eek h X-Gm-Gg: ASbGncs0pqtnY9NcnAD+GSRUvBPFwVOmjahTMEjzFjyNqXtESuPBizm2T9kze3V3iK5 XDfcNJbIdB3IBCL/zglftkDerG0vY9n8K03UgBZ/GMsn+J7fCFgTROEbZ5m3E4ljjyAkYWMw8Pe 0KqhE0cvccC/W4I6IE/ysvQbDckNp8aHBFSuVMw4xLmVglIVDRPsQ2/RsOJnkHhabB7gAjV42fH VgsWA3zC0oI08ir7e5p4bz3UUMate2uq4/4izAGxgWEkzj5qqx+Cnqg9PjbxNwvrnLE87nqC1D3 AzFVCGiwXjwMPUDc496U4moDu1SeJJogPQ7fsgEe779yu48Y5Ooh5GIo/pEVNTYG5AciX0h3dQ0 = X-Received: by 2002:a17:902:ce8c:b0:21f:4b01:b978 with SMTP id d9443c01a7336-22c53607c5bmr255596385ad.36.1745350517832; Tue, 22 Apr 2025 12:35:17 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50fdf1f1sm88996795ad.237.2025.04.22.12.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:35:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 087/147] target/riscv: Restrict SoftMMU mmu_index() to TCG Date: Tue, 22 Apr 2025 12:27:16 -0700 Message-ID: <20250422192819.302784-88-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250422192819.302784-1-richard.henderson@linaro.org> References: <20250422192819.302784-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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=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: Philippe Mathieu-Daudé Move riscv_cpu_mmu_index() to the TCG-specific file, convert CPUClass::mmu_index() to TCGCPUOps::mmu_index(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson Message-ID: <20250401080938.32278-17-philmd@linaro.org> --- target/riscv/cpu.c | 6 ------ target/riscv/tcg/tcg-cpu.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 09ded6829a..430b02d2a5 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1021,11 +1021,6 @@ bool riscv_cpu_has_work(CPUState *cs) } #endif /* !CONFIG_USER_ONLY */ -static int riscv_cpu_mmu_index(CPUState *cs, bool ifetch) -{ - return riscv_env_mmu_index(cpu_env(cs), ifetch); -} - static void riscv_cpu_reset_hold(Object *obj, ResetType type) { #ifndef CONFIG_USER_ONLY @@ -3049,7 +3044,6 @@ static void riscv_cpu_common_class_init(ObjectClass *c, void *data) &mcc->parent_phases); cc->class_by_name = riscv_cpu_class_by_name; - cc->mmu_index = riscv_cpu_mmu_index; cc->dump_state = riscv_cpu_dump_state; cc->set_pc = riscv_cpu_set_pc; cc->get_pc = riscv_cpu_get_pc; diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 5aef9eef36..bee7dfd803 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -91,6 +91,11 @@ static const char *cpu_priv_ver_to_str(int priv_ver) return priv_spec_str; } +static int riscv_cpu_mmu_index(CPUState *cs, bool ifetch) +{ + return riscv_env_mmu_index(cpu_env(cs), ifetch); +} + static void riscv_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb) { @@ -138,6 +143,7 @@ static const TCGCPUOps riscv_tcg_ops = { .translate_code = riscv_translate_code, .synchronize_from_tb = riscv_cpu_synchronize_from_tb, .restore_state_to_opc = riscv_restore_state_to_opc, + .mmu_index = riscv_cpu_mmu_index, #ifndef CONFIG_USER_ONLY .tlb_fill = riscv_cpu_tlb_fill,