From patchwork Tue Apr 22 19:28:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883089 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2592954wrs; Tue, 22 Apr 2025 12:50:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWUHI0fk5o3osG+J6VJuwytPSoivUa4rZIcxhDN9g6IUFxQn3WIB6EcOd9H+ae1IZ3Hv0irsw==@linaro.org X-Google-Smtp-Source: AGHT+IEkweDC3TRjf7R6UJWA+QCm7gJG4eIUTDLhpcFfYRi2G7G7qHOKjF3WSuDpI/moFw5H+3w1 X-Received: by 2002:ac8:5fcc:0:b0:476:9847:7c73 with SMTP id d75a77b69052e-47aec3cb93fmr261502321cf.26.1745351452183; Tue, 22 Apr 2025 12:50:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745351452; cv=none; d=google.com; s=arc-20240605; b=lpN047m3cBb1Tjvi7O4+Rb2Ppoq76cP+VKFmqHZ+Tll67jZ7G2F8/n10eJ+vgQsSXw 20ZvbX6LDTj5e2a0g7OTMbFZlkkiCg9vobGb3NdBEUOZ4BwDv8B+xIERWizDttMEuOLE EteFED0YTqVp/mkS1EydHUVIXUB7OLG60topExDE5RE9sTk4KPMXror5w4J+ldZVlQlE +K64C9TtBltxxWaQdU1puppe43sW1YJnLuK/hQyF+Ve8NgE0TQh598uw4YaszrfeuCH+ nINR5cUIvgB5eNu8REH0v7bTW9R2rzDhxRXUO50p3zVvVkF0pLkEUHnm8ZSyR7idYy+G 5uyw== 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=kCb0nI+2CCy6xbgQ0QUcGLa1ZUmAGxVEjmnQDdUz4pI=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=DAcV2Jiq2t0YQgRupCuCiBDgysnSJDFMzN4DeT3/NzzoeEd5hqC6Odf800dOMhevuo ts0FRCxnbqNhqZ12JJ3VBEDlMo7m4hS9AlkHlTrqXEjPhx12AclA11eZ7CqY/4J9pxv8 E7GicjN4ziH5GZZ0rR6r8fQ2gJO31KotK7P1EQRS/Odwhe1uVpUXFOX6KnVmLaoKdn1o jLSJ2glONJ2iRlPcfmgltvTIHAh0uWuASb3IKYP9wAxLikoK5RD+/tSCHERemJ71qhb1 0pCsEGmLQQ7j5cO8XsVvDkY20CwUkS8hYPYhdXrXtTLRquOA9T9kYIqB3kQqCowkjLfH byrA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=t1jd2P++; 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-47ae9c10102si114456191cf.124.2025.04.22.12.50.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 12:50:52 -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=t1jd2P++; 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 1u7JT1-00061p-Vr; Tue, 22 Apr 2025 15:39:40 -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 1u7JSP-0004Ks-31 for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:39:02 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JSM-0007Np-Mc for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:39:00 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-22d95f0dda4so23725265ad.2 for ; Tue, 22 Apr 2025 12:38:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350737; x=1745955537; 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=kCb0nI+2CCy6xbgQ0QUcGLa1ZUmAGxVEjmnQDdUz4pI=; b=t1jd2P++avcm45conNuRd0V9gBEOm2yuhTiMJpRNl2J/TLGBZwdBpIlkYOhYxbDVLD 6zVHhbXsaQN4zJLTn88B6keg5xxtqKB7vGbzbR2VNHdD3H3JJC9V8D7GQ7DTrm/mEYMV hpmaEyLdN7kSySzxYxRcLi4vuPM20+tGXGSkxI5OBa3dVJDt6uHBqJol8TFUFLuWZBBG yqLBhqt3jOi5BC3PVc+ptOwHa2T1UqIK3ICcdEq3OMvNFMBlJP5i734wKobA4WQPVT/J 5F9NRyW8gMhd80qv68RJEm+qK3Zv4VxefrvFAJKEqiFX6f5a+4m/XmIVWM6ota+wiY/k 9/+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350737; x=1745955537; 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=kCb0nI+2CCy6xbgQ0QUcGLa1ZUmAGxVEjmnQDdUz4pI=; b=JVR3G+Hgum23qoCaS6hpDSESne6efxup6+xCbfmEC6qtW0nGSFZRM8/kZmmQ4Jz3Tl g7007BgURwzHgR54UFJKwoEOMlwMUyOc58Fu5Y4Awb8eWfxY52TMpzfw5Tg5imWgw52A aZS5Oul5ehOzcpUF25d+vi2JDVsjFEemdacccqlr0QULGk0uf7qiE/02DKNiL79OyIw3 dXRR7XVRLy00JX2VOwN6kTvxhc2XMCSoIEhurNe+/diK8KlxdiGn6ew0LaWZH4UZedg4 iJz9XpC/UFOXfQZAOinGz3QdP4rrYCzlcLOuZppQ6S2VxhZm37lLKzYT+85OmCvCopfe f6SQ== X-Gm-Message-State: AOJu0YwSB7l2BsxrIag6ViKKSxJK82FbSpj7Z/8nYEMSWVsOEVy5i9RX FxVxisnZUwiYBkR7pc7i8JOn+QefcUFPQnxBvk8LMmoJRIHAw+H/LHohSumGq0LGr1KpQGgfDk/ B X-Gm-Gg: ASbGncsmgJjKMy4FvbE5hQeQ93lqP4eNodYXNRMZGpTt6ZasUjT9NI4VkqcfJY2IgpT Q+6O69aCqzsliy5Z3p/dhXYh2H0IQFRDyGDk/Mqv3nsup5fdeTCESyw/5v0a1Gpgp7MnEjJepDU XW0jrUb7U4VjCSVbeT8SRRbYc+ot4se+ITmXF0vLh8OHi2UhpbGpNOh6NcMXG3tQZ89D+bJ/EfV mM+3vwwOifIzbgsyIIzBFpyHX7U5MlyiASgO/0T+ReOl5Xu2ZrYsGp6adSSE7WN+gPrFOMrTT/M Zkg10luffN8/s5X0vyESdG2Hulv2oCVqN1ihDJ3askmgZNlxuROsX/ir48yqjCBvCSQ33Jo3BjA = X-Received: by 2002:a17:902:cec8:b0:215:a179:14ca with SMTP id d9443c01a7336-22c5357a118mr233458515ad.2.1745350736728; Tue, 22 Apr 2025 12:38: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-22c50eb484dsm88951765ad.148.2025.04.22.12.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:38:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 145/147] target/riscv: Remove AccelCPUClass::cpu_class_init need Date: Tue, 22 Apr 2025 12:28:14 -0700 Message-ID: <20250422192819.302784-146-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::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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é Expose riscv_tcg_ops symbol, then directly set it as CPUClass::tcg_ops in TYPE_RISCV_CPU's class_init(), using CONFIG_TCG #ifdef'ry. No need for the AccelCPUClass::cpu_class_init() handler anymore. Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20250405161320.76854-2-philmd@linaro.org> Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson --- target/riscv/tcg/tcg-cpu.h | 2 ++ target/riscv/cpu.c | 3 +++ target/riscv/tcg/tcg-cpu.c | 16 +--------------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/target/riscv/tcg/tcg-cpu.h b/target/riscv/tcg/tcg-cpu.h index ce94253fe4..a23716a5ac 100644 --- a/target/riscv/tcg/tcg-cpu.h +++ b/target/riscv/tcg/tcg-cpu.h @@ -26,6 +26,8 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp); void riscv_tcg_cpu_finalize_features(RISCVCPU *cpu, Error **errp); bool riscv_cpu_tcg_compatible(RISCVCPU *cpu); +extern const TCGCPUOps riscv_tcg_ops; + struct DisasContext; struct RISCVCPUConfig; typedef struct RISCVDecoder { diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index ad534cee51..2b830b3317 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -3054,6 +3054,9 @@ static void riscv_cpu_common_class_init(ObjectClass *c, void *data) cc->get_arch_id = riscv_get_arch_id; #endif cc->gdb_arch_name = riscv_gdb_arch_name; +#ifdef CONFIG_TCG + cc->tcg_ops = &riscv_tcg_ops; +#endif /* CONFIG_TCG */ device_class_set_props(dc, riscv_cpu_properties); } diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 88f7cdb887..44fdf6c4cf 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -140,7 +140,7 @@ static void riscv_restore_state_to_opc(CPUState *cs, env->excp_uw2 = data[2]; } -static const TCGCPUOps riscv_tcg_ops = { +const TCGCPUOps riscv_tcg_ops = { .guest_default_memory_order = 0, .initialize = riscv_translate_init, @@ -1527,24 +1527,10 @@ static void riscv_tcg_cpu_instance_init(CPUState *cs) } } -static void riscv_tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) -{ - /* - * All cpus use the same set of operations. - */ - cc->tcg_ops = &riscv_tcg_ops; -} - -static void riscv_tcg_cpu_class_init(CPUClass *cc) -{ - cc->init_accel_cpu = riscv_tcg_cpu_init_ops; -} - static void riscv_tcg_cpu_accel_class_init(ObjectClass *oc, void *data) { AccelCPUClass *acc = ACCEL_CPU_CLASS(oc); - acc->cpu_class_init = riscv_tcg_cpu_class_init; acc->cpu_instance_init = riscv_tcg_cpu_instance_init; acc->cpu_target_realize = riscv_tcg_cpu_realize; }