From patchwork Thu Apr 24 00:48:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883851 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3204511wrs; Wed, 23 Apr 2025 18:12:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWv+5A9ufPg9N1ZDV8LwW78f+EsKVjcuSnqTymn38ppNrFZKAIaPmEJMIKgc2AGGo2Zu9oH2Q==@linaro.org X-Google-Smtp-Source: AGHT+IFWSk/RZiNyqzUyrZa0763B5JbVdVCT9fLmVGfNl2VKXdlEXwtsVOXDYTP5O0FJYW8DcT+E X-Received: by 2002:a05:620a:248e:b0:7c7:b5f7:31a5 with SMTP id af79cd13be357-7c956f4b072mr147647185a.53.1745457140401; Wed, 23 Apr 2025 18:12:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745457140; cv=none; d=google.com; s=arc-20240605; b=f+IS034UiWPzi7D5GrVY/6tEnq3/mFZh7yfg3AoWzTFbdM+gtW2CAWY2Am4u2KYp9d mejCBGDaYg3exG29ucK/7yl45/uttqTXpbLhFoxSE0TnlVsOLoHrDpO1Q0ICVuRKSDyR WqcZYN9tx/cLzE555Ei1RzETEA5xzxg2Ou3vqgFoTHf3+ifTQjnfIH1ui7Vt/1IST03W MUfFIZ4sDaYbT5xZcH6txYZQJBloH2mFnjiJX07nMCAWDOqf4EVzw+j+KxIlZnHIywDo wFAwvDWkRmeZKvVbBx2HbBQzVbdRSGbALhBn9QNr4LogJof6vXUQhzN9YXNeC2+jPb3H FnbA== 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=z4XK59Un/F/cXTQA+raQ2QBk7p5qcqGVyAJ27nWp3Cg=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=VHk0o6sWoFKl7IxMZFF+inobj1lS3vpWFxAiztDF0MwDE103GMO5AOhaHEnSBWe0lE PPxJADtRew13KN0b66SOV5uELroJip5O/qO+9O7d3xoZ3RqUPCI5XjaG2eWvoZqcACct 4MFWkOaNdQca+NAN0qpHbOuiIhwh29TLhzF1d8rEZEP/VbKZHbNIXQJPBvEzn/s7dwNf Cai/xaGa9YaZFxW7P2AtFVB3OM6YfnFPYlkMvnjmR1VK3S0rrh2k8KH+7wA82HoHRW9p SmQpHq2PAGbzJ1ZkJXP7RcE5Jo1oL1yhE4v+p7ubPGs12y85ZHmYecxjRnpMgZ018470 g3ag==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZovYEuyZ; 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-7c958ed9f6fsi22254885a.588.2025.04.23.18.12.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 18:12:20 -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=ZovYEuyZ; 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 1u7krv-0006wQ-5h; Wed, 23 Apr 2025 20:55:11 -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 1u7kqX-00015l-QI for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:53:46 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7kqK-0004lA-My for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:53:34 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-7376e311086so491029b3a.3 for ; Wed, 23 Apr 2025 17:53:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745456011; x=1746060811; 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=z4XK59Un/F/cXTQA+raQ2QBk7p5qcqGVyAJ27nWp3Cg=; b=ZovYEuyZJj15duiSN6wZ5JElSE7KqVi9sZVS0G8E8oucx/Ru9zncz6rbrtY2cHk66s BVgPuQEhxnHVCJnT6K9tLHUBU35ePbb/VyGtpvkwJLnmCNC/eaC9iNFWNxPwd9Q6mm8i 0dRMVBZ8xg/ML+tHZfuLUm4w7To+VEDHrW5jOKAwi3PeY0cqZbxfd27wzXD357H8xxIO Z0RrdiWwAbv2Kd+tmjLTj0YLUZ4wGeDnOlloC/W0dkQfqlR5zBWXlqX711VvzUxyR+1d +usuKL3d3V5h5FRoZurU36fWGKfn/DPxzcuQ0Cmy3pMoIibRRmwxevZvhv2olL8mrPLk HJEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745456011; x=1746060811; 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=z4XK59Un/F/cXTQA+raQ2QBk7p5qcqGVyAJ27nWp3Cg=; b=Omtm5r/xIOS3LA2tBJXt61Aq3lBaIvxNqBRSljtvE1yE7u3UD4cyvcneEzF898I+bU 6z2WUJKVOsm6WIwQZcLWtxpeXyotSYolQZsH10VU9FMNPPWZIKmdcpci9yeOhSPV2jQr 3CtDEjIA969EZHeGed2SefTyOymP+pBxeqvyH3hhAsJGYlm39kaY2mx5tAaWxXbXqBmy 5Ekysor5Ow9r+qGnKiuUk1LyquPhILRMRRZQm6s6fM3XoHvq1OHIOzKSAHENdVzp5Hvy p16phjiyAcsgiMxlX+RJKUznh/On33XSVd+J6rkocQ5iWEuS98N/E98DzVUFo6T1nskG sVFA== X-Gm-Message-State: AOJu0YxAwz68kzybdBNmrtyNky9cYcyffQP8kppFv+L4sE4kE6Ki0ssv yrO2Xzi7ViGDjR3S7sdAvWDOjQgE5A4ZqBzNo1Miq4T3GAy/SoVdAPQ2h7esV4/zw6/xKEAT9A9 u X-Gm-Gg: ASbGncto6o/yS3b6m5iIYFMPowcmVa1TVA4G5SXKpsxmYBKrxofeYQ1ddemPG8TiD0Q lWDPw2WLuG3oyOX0dCLaP9JiFcD7zyKea/UGH55M0IXB6YIW5eQsx+zQvfUeCEpU8b5ISDjEyN3 qsKR2mxZSHMsmrGZnbtELOc06aPO6MuvpRE4MMfwjf9pniLlZ28vViXkE65ygAQBgiW1Qtu9WGv HvCUqdtCQZycVLXFuwDzQmZo/C6nbPNBhrf/1+MIQqcACy076Yq1YGmsV49gMO7QSCdY+AYs2sF EMOtaVLnTA7lTfKVlB4HT7V7948WnhM+/qVUcMyfINottI9weFtSRJHr3Z6cALcmzW8g+PE4mY4 kCRxz6N93IA== X-Received: by 2002:a05:6a21:3389:b0:1f5:a3e8:64d3 with SMTP id adf61e73a8af0-20444f0024bmr855357637.21.1745456010831; Wed, 23 Apr 2025 17:53:30 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a6a971sm209353b3a.103.2025.04.23.17.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:53:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 075/148] target/arm: Restrict SoftMMU mmu_index() to TCG Date: Wed, 23 Apr 2025 17:48:20 -0700 Message-ID: <20250424004934.598783-76-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424004934.598783-1-richard.henderson@linaro.org> References: <20250424004934.598783-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.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 arm_cpu_mmu_index() within CONFIG_TCG #ifdef'ry, 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-5-philmd@linaro.org> --- target/arm/internals.h | 1 + target/arm/cpu.c | 13 +++++++------ target/arm/tcg/cpu-v7m.c | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 28585c0755..8756c24c08 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -373,6 +373,7 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb); /* Our implementation of TCGCPUOps::cpu_exec_halt */ bool arm_cpu_exec_halt(CPUState *cs); +int arm_cpu_mmu_index(CPUState *cs, bool ifetch); #endif /* CONFIG_TCG */ typedef enum ARMFPRounding { diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 01786ac787..21e8cf1400 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -121,6 +121,12 @@ void arm_restore_state_to_opc(CPUState *cs, env->exception.syndrome = data[2] << ARM_INSN_START_WORD2_SHIFT; } } + +int arm_cpu_mmu_index(CPUState *cs, bool ifetch) +{ + return arm_env_mmu_index(cpu_env(cs)); +} + #endif /* CONFIG_TCG */ #ifndef CONFIG_USER_ONLY @@ -144,11 +150,6 @@ static bool arm_cpu_has_work(CPUState *cs) } #endif /* !CONFIG_USER_ONLY */ -static int arm_cpu_mmu_index(CPUState *cs, bool ifetch) -{ - return arm_env_mmu_index(cpu_env(cs)); -} - void arm_register_pre_el_change_hook(ARMCPU *cpu, ARMELChangeHookFn *hook, void *opaque) { @@ -2674,6 +2675,7 @@ static const TCGCPUOps arm_tcg_ops = { .synchronize_from_tb = arm_cpu_synchronize_from_tb, .debug_excp_handler = arm_debug_excp_handler, .restore_state_to_opc = arm_restore_state_to_opc, + .mmu_index = arm_cpu_mmu_index, #ifdef CONFIG_USER_ONLY .record_sigsegv = arm_cpu_record_sigsegv, @@ -2708,7 +2710,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) &acc->parent_phases); cc->class_by_name = arm_cpu_class_by_name; - cc->mmu_index = arm_cpu_mmu_index; cc->dump_state = arm_cpu_dump_state; cc->set_pc = arm_cpu_set_pc; cc->get_pc = arm_cpu_get_pc; diff --git a/target/arm/tcg/cpu-v7m.c b/target/arm/tcg/cpu-v7m.c index c4dd309272..1a913faa50 100644 --- a/target/arm/tcg/cpu-v7m.c +++ b/target/arm/tcg/cpu-v7m.c @@ -237,6 +237,7 @@ static const TCGCPUOps arm_v7m_tcg_ops = { .synchronize_from_tb = arm_cpu_synchronize_from_tb, .debug_excp_handler = arm_debug_excp_handler, .restore_state_to_opc = arm_restore_state_to_opc, + .mmu_index = arm_cpu_mmu_index, #ifdef CONFIG_USER_ONLY .record_sigsegv = arm_cpu_record_sigsegv,