From patchwork Mon May 5 01:52:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 887441 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp1826375wrq; Sun, 4 May 2025 19:02:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0MRTl4Jxyg065DoFX76gYqd3WE1E8EOB4/CSu3hPfTbqaV43Guax+NXeXD8muzlTVz4BXTg==@linaro.org X-Google-Smtp-Source: AGHT+IG3TtWQD6+9OdO7CO6TgFjWwj433FPLUl+XwBNZBbv06KqD3fRdY5h3CCcill/kWsW2CC/I X-Received: by 2002:a05:620a:2903:b0:7c9:443e:7026 with SMTP id af79cd13be357-7cad5b2093dmr1472388885a.8.1746410560361; Sun, 04 May 2025 19:02:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746410560; cv=none; d=google.com; s=arc-20240605; b=I+kXlhd0xNKOI0Tc4v1agTYT0l8MQWKMHQzmfQquFKHVCmWFK9qT/Lirlxgt1nXUBn LX887iD2zKwNBEJ5RowtoHGHelZopvtT6S1qNMN7PO/MVm6MwlQJDGBipm4akpsBaRlp TSEIf14zjmtAd8C4Dxy678UuOZVf4cKSqGRnE1Becsc+OsLBKeaLXe6evdjNmkbyihW/ ysCHcpTBLB4gup/02a0KDJ2xlI2VgfEf8nyYLUHC6qBMr8YOEt/exfqPhQJn9rgxNkYz lvPsJ7yg17rHyuDNLawXdOD1ZG1TknZBvegh9XDkwkP/ttuFOCDKtaCD9RsvBBnP11dL WpEw== 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=KAOgrGi4ghC8+gWPIlyM/nbU9ofyXXxCXlHL7nptXa0=; fh=NjGqp/B1Bwp2wtTnyHxTvlXYBfwRSGY9cE7hmKIZquY=; b=DlbEHxPUJhfsBX8/0YrgoX/0oW5/0U5zKXiG2llqZBWSo0SC63nqOdkeZcakkdtRjG SVMFbGw/rQPQI1YUSsDIqOmBHd5j94QfL25m1J6spNflnQZHy19CGxewYSjYpkgqZSPq wZbSG5bHezeQZrRVgewmV8LdtBzAtarrd8PvVXDVfm8fz4gmaPsgHhovHgc7LMIr/dAP Uxbf13FEt6E7BAJEJyucxHfm+yrgwco5OJGFoc9abKPx6QgGD82v8CRfMDtFA6RDH08u 2vsQAbw3uRZtWNskuqb+Q1ACOkLi2EZAVakNPUXEJJVTqCo++zV+dkZWK9hIr5c9nJyw E9vg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IDdoyt5K; 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-7cad2446222si838532285a.531.2025.05.04.19.02.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 May 2025 19:02:40 -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=IDdoyt5K; 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 1uBl4R-0002Tb-Cc; Sun, 04 May 2025 21:56:39 -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 1uBl4K-0001wq-ID for qemu-devel@nongnu.org; Sun, 04 May 2025 21:56:33 -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 1uBl4I-00036k-NA for qemu-devel@nongnu.org; Sun, 04 May 2025 21:56:32 -0400 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-b0b2d0b2843so2882152a12.2 for ; Sun, 04 May 2025 18:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746410189; x=1747014989; 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=KAOgrGi4ghC8+gWPIlyM/nbU9ofyXXxCXlHL7nptXa0=; b=IDdoyt5KpZRbDUKgoqrZp/FYf073AOdli/yQ5laNrKlhuvKfZ82NH4ixEriaWBTD46 9fd/91Z+1AwEY324NCR2i1rO03LJSNpe8udT6OSeOiE0NroWNjl2KOo0povqCS33Ztcw KBdpztRmojh7gTZvcqm21SNPuN/WkWqs/qyQXBApw9DTFnyiHs8KKXm/QElG5/g1yM7i +r0B7XaxQMxM+vw4HEm9HY5XIl3XIk5mllgXjzGUUy88wZD6VxdmCz4dvznz8hCkclHH PzVGmGRH5cHNaFBNFvEXpNQCNY6id7YAS9R9wlnvT38IxGgpod+6nYhIBwA/7n7WMIri VMwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746410189; x=1747014989; 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=KAOgrGi4ghC8+gWPIlyM/nbU9ofyXXxCXlHL7nptXa0=; b=LSxRP8OIJByOcmtzrRo3ABmDFHYZLFezJ0jRT+/+EYnk8FQPZ9pXhv9I06/YzxI0es y0aVhaLfFfp4r1lsS/ZIjNEwlJIsXNy1MFW8pFPvVf7RT/ndAY/9eXm2g1ozpcdCJ4jR hBbcE7fOveTk+Maqr4doQIRWflqgl64lSw7qCbBn2Vz0g23ioUWnxV3TQDpN7+ob9HgF SujKqQI5WhHDHu37IUM1SyGoAknu29f+UPja3dzQtVLia1IH2vd9m9kejRQIyO5k1VXE n3EKsLdhna0r3TAOLm1w3prCTTByjczi8Xw2i6Rgd+f1GoRLX2mB/MSj9i5330102WoR iZaA== X-Gm-Message-State: AOJu0YyoanLwVa8ywyGyZDMcY3rcox5LU48DdFAulx7jsLrZfP5lWmOV UltlGG2yzXtvTvQ3nkHscvXBFSNKYuq3e3xx9JaMLdcjaSCDnQAoZYeQO3Deg9sRO5jKUNY39/S vBuc= X-Gm-Gg: ASbGncvXVbDmKoouso5n770mOHUT7XMjXsxY8cbg0YC6vo2YUA2KUS8lpNPe7o91wWK RI5ApvQjZY2vV7VUlyREPF6hHE1FyeHGAgSwtcCaBJoB3J2sHiFv8/BxD8ScOY2i5LsbOjmca9d WhjWwmKle6dKPjZEkIQBgyr1nyviSva08E+ASgZ9TSq0s0hG/eg0MTDJ3QoD/EPMJFmOJYLkfpQ 3m4uexfXw3oFoG2rOGlAVwC2bcnu8FArWntsdDsE+Aof3OPXEpMrStBTnnXVsANpMjwdfdIITzk kDk/roLWaW+XHyFiaAubNKpAKys0cnZPhT1U9RHy X-Received: by 2002:a17:90b:4c12:b0:305:2d68:8d91 with SMTP id 98e67ed59e1d1-30a4e622226mr16542763a91.28.1746410189330; Sun, 04 May 2025 18:56:29 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a47640279sm7516495a91.44.2025.05.04.18.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 18:56:28 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, kvm@vger.kernel.org, Peter Maydell , anjo@rev.ng, =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v5 46/48] target/arm/tcg/tlb-insns: compile file twice (system, user) Date: Sun, 4 May 2025 18:52:21 -0700 Message-ID: <20250505015223.3895275-47-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505015223.3895275-1-pierrick.bouvier@linaro.org> References: <20250505015223.3895275-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=pierrick.bouvier@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=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 aarch64 specific code is guarded by cpu_isar_feature(aa64*), so it's safe to expose it. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- target/arm/tcg/tlb-insns.c | 7 ------- target/arm/tcg/meson.build | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/target/arm/tcg/tlb-insns.c b/target/arm/tcg/tlb-insns.c index 0407ad5542d..95c26c6d463 100644 --- a/target/arm/tcg/tlb-insns.c +++ b/target/arm/tcg/tlb-insns.c @@ -35,7 +35,6 @@ static CPAccessResult access_ttlbis(CPUARMState *env, const ARMCPRegInfo *ri, return CP_ACCESS_OK; } -#ifdef TARGET_AARCH64 /* Check for traps from EL1 due to HCR_EL2.TTLB or TTLBOS. */ static CPAccessResult access_ttlbos(CPUARMState *env, const ARMCPRegInfo *ri, bool isread) @@ -46,7 +45,6 @@ static CPAccessResult access_ttlbos(CPUARMState *env, const ARMCPRegInfo *ri, } return CP_ACCESS_OK; } -#endif /* IS variants of TLB operations must affect all cores */ static void tlbiall_is_write(CPUARMState *env, const ARMCPRegInfo *ri, @@ -802,7 +800,6 @@ static const ARMCPRegInfo tlbi_el3_cp_reginfo[] = { .writefn = tlbi_aa64_vae3_write }, }; -#ifdef TARGET_AARCH64 typedef struct { uint64_t base; uint64_t length; @@ -1270,8 +1267,6 @@ static const ARMCPRegInfo tlbi_rme_reginfo[] = { .writefn = tlbi_aa64_paallos_write }, }; -#endif - void define_tlb_insn_regs(ARMCPU *cpu) { CPUARMState *env = &cpu->env; @@ -1299,7 +1294,6 @@ void define_tlb_insn_regs(ARMCPU *cpu) if (arm_feature(env, ARM_FEATURE_EL3)) { define_arm_cp_regs(cpu, tlbi_el3_cp_reginfo); } -#ifdef TARGET_AARCH64 if (cpu_isar_feature(aa64_tlbirange, cpu)) { define_arm_cp_regs(cpu, tlbirange_reginfo); } @@ -1309,5 +1303,4 @@ void define_tlb_insn_regs(ARMCPU *cpu) if (cpu_isar_feature(aa64_rme, cpu)) { define_arm_cp_regs(cpu, tlbi_rme_reginfo); } -#endif } diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 9669eab89e3..a5fcf0e7b88 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -34,7 +34,6 @@ arm_ss.add(files( 'mve_helper.c', 'op_helper.c', 'vec_helper.c', - 'tlb-insns.c', 'arith_helper.c', 'vfp_helper.c', )) @@ -65,6 +64,7 @@ arm_common_system_ss.add(files( 'iwmmxt_helper.c', 'neon_helper.c', 'tlb_helper.c', + 'tlb-insns.c', )) arm_user_ss.add(files( 'crypto_helper.c', @@ -72,4 +72,5 @@ arm_user_ss.add(files( 'iwmmxt_helper.c', 'neon_helper.c', 'tlb_helper.c', + 'tlb-insns.c', ))