From patchwork Sat Apr 5 16:13:05 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: 878412 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp4288488wrs; Sat, 5 Apr 2025 09:14:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX9qvGaJRGDOdARAuHamTJHM1V3sXMri7LO2HFKw/uZSWGJ/8T12nEj+659Afx26sz081a5Rg==@linaro.org X-Google-Smtp-Source: AGHT+IH4BFzNm85Bxr73bMSuUZU3uOxfvgLQqn2dIkYwiD/hUyx7J+7NVhKwEnpr1cn5HobgIkMo X-Received: by 2002:a05:6214:2266:b0:6e6:6c7f:111a with SMTP id 6a1803df08f44-6f064b5396bmr82181146d6.40.1743869645919; Sat, 05 Apr 2025 09:14:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743869645; cv=none; d=google.com; s=arc-20240605; b=SL2sPfRJsuU6lmiMWnwGf5GLp8ncv1YO0BAuJG0BHtdcxx/4VHy9yXydynRXzzRr5U Lmq3XPLZI5sYkyn0stloOakWYpmL7nuuy6+UEl7fYUpOPvkLovBe5HuLycXkl9OvKFNg rIDPFS+dZ8oCAyOPBNXZN28zhPVhoHjj3NuL46y8s/BKA52XeJXJRAVuXaBmKMvVVEb7 P0KkhDxCihHcfiVpFkO29Ec2OVdOiXHvke4SKXF31buSw5NPw7tpcWGtItBVGXWU7mdK ESKF4nYac1Zc8P18DDRRU1kNNMu2WbdKZn4GBbfcqogst+9u9G4fMLUeI1gAFBByUy8B ndSg== 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=ANZQVjU67KVuQJeoPfw/89aw1dlWs89ZP1DiG1XztSM=; fh=ZXDWg7hKG7Hj19AbRuutTLw+Zvn/B9RsGUUw/YagpFI=; b=kp8qsSjwSrkifwCXtOhE6KGm/aLindVnSTGVHbZIvk7uHXMGgp0B8uBpQxcrnE/48m XDMisNkHkHgKEi1FrQfX1i5cMrN39A0Q9Ez6ApCxEX/2odj/8x9JU6S+Oqnyzo7rY54s G5UWd4T5C6gjZ78cZgJMFfWvk44q8U3CMhmp5CDPFTpUZPkpi0OiTiIk/dd94OiGlmsu na2ssfH6MvVKtaM0pJjrlCN2trgSHnFDPRdbbHUcc7ZWAacOyY9/QJRqAHikK9HjbywU lzvUab2oZ0hsYZ8WbWMEpQx/K71UK8ix49MTG4mVoCtUgPjW5nwK3g1pFIrRWC/Xl3Ic PsjQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lIxNC42p; 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 6a1803df08f44-6ef0f143b8dsi54068936d6.395.2025.04.05.09.14.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 05 Apr 2025 09:14:05 -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=lIxNC42p; 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 1u169D-0000Ut-U1; Sat, 05 Apr 2025 12:13:31 -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 1u169C-0000US-AK for qemu-devel@nongnu.org; Sat, 05 Apr 2025 12:13:30 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u169A-0005Cb-PO for qemu-devel@nongnu.org; Sat, 05 Apr 2025 12:13:30 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43690d4605dso19556535e9.0 for ; Sat, 05 Apr 2025 09:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743869607; x=1744474407; 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=ANZQVjU67KVuQJeoPfw/89aw1dlWs89ZP1DiG1XztSM=; b=lIxNC42pArGQ15dV3rf4zjzf9VftHLgSKwhsfJA1Ow0KZKLqHdtfmJpkfN5RbFEJ/w pntrEe8HI5VwL8G29PMkXjZkJC21iXUoANPJMEKgsQ18DoyEYNSlDNAeT2BYUia76t5E /jH9kQ6A7DTXAkKDTcevYyReWwANovJAELH0vKGyK+AV4/IgF+EsWJ3vfXadHcTuvDP+ m3rXPGl1ba/uBEoNXbCWsuYyMgUELsmxwa4/1RXOd9mYXYvt8ef9/Dwxmc1LycR5kUw8 Dpuq/LIE/BmNKzh/7AEm03wq9MsPS1c0EEcwsMDSS2QYVPOKmlfOgUEH6eDcxLOus16d YPhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743869607; x=1744474407; 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=ANZQVjU67KVuQJeoPfw/89aw1dlWs89ZP1DiG1XztSM=; b=tZEcql6jTqugvyGlScjowVLh3pYts4d/NtnB/G5r+KMWkmCeKxjNLvRvX9IOowV/Qs Yo2Ac1H1t3FQjbYGSnYUQPi0jfisqHKmXum5gQ2u+j3hJNatVFzW+NmVgFKkZKLQ6b2e vZ5860JuZNUR/oBlQUpMReeo65XTgA/rsDHkG6EMRxTj7Xz+LDjutp8uLM84a5hY1zSd v7K46uiqAVxbDJdJU74oFY2WPOQGgySbXSjXTjdZXdg/CPrsSpMJw9bzRsx0WQHIx+7J bKLgg5v+Ngc11dT5o20lovoJ96XGvj3gSWzK+3BzSWzAtyXmvoCsqv+FfcQ/+PAW1m3F YBEA== X-Gm-Message-State: AOJu0YwqA+mftijFkcPGOP9pg05ml9LnSSYPppjnfTln3NJ7ncknNkrS aTQohPuDXiOYIiO6T1L9lXi187VDIvHFJFkdyHarANtGNsFBealTAoUQ8StHU6pZVLh3NP+wsrb K X-Gm-Gg: ASbGnct/qtgq6+/lLk9hf0AWQ4AVc66RSQ17mI/TpTF2AUrELAOZ5s7kTUpq7gWphYp iMpI2+hor7OShOrkwqTAsc+5R6SIrA+UwNfhMz9WzUacjGa+LG3qSHdHh822y/GQb5R4zMuWaIY EErwt9Uaq9dgm9a+IJHeDjnhRrqZnf4+Ez9BStSMS9FeqRJuZO7iTn2pqBqTnruf5CvzuiIdLqW a9NbxDDnUnRgByWdHafFvcDnWh3PYwPlE69RaMK4YdnyPZ9kk8l6oBHxeUe6xLIdkNjUnbPNpZD Y6sxek2c69qi/pK8pk2FYD3f5pv2VaP08TTT4T6SSVn/pIJbMM9eDreWg4b1c8EheGHcXtn4F2d A6i+C5999PTXJCDEUpuUqBWiZ X-Received: by 2002:a5d:59ae:0:b0:39c:27cc:7ba3 with SMTP id ffacd0b85a97d-39cb35aa8ecmr6867752f8f.33.1743869606962; Sat, 05 Apr 2025 09:13:26 -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-43ec366a699sm76334805e9.38.2025.04.05.09.13.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 05 Apr 2025 09:13:26 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v4 01/16] target/riscv: Remove AccelCPUClass::cpu_class_init need Date: Sat, 5 Apr 2025 18:13:05 +0200 Message-ID: <20250405161320.76854-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250405161320.76854-1-philmd@linaro.org> References: <20250405161320.76854-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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 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é --- 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 ce94253fe42..a23716a5acf 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 ad534cee51f..2b830b33178 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 5d0429b4d00..6a87367f239 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -139,7 +139,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 = { .initialize = riscv_translate_init, .translate_code = riscv_translate_code, .synchronize_from_tb = riscv_cpu_synchronize_from_tb, @@ -1524,24 +1524,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; }