From patchwork Thu May 1 14:55:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 886340 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp358685wrq; Thu, 1 May 2025 07:56:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWMOpxOseooAskrDujXK/LVk2H2Ge7i9JGFCwNgiiSZjzjiEiYUL4bCxlRcQ1TEmdIyeJc62w==@linaro.org X-Google-Smtp-Source: AGHT+IEYtWEUsO3Yr/sgs9ipzyyTqhl5C0aDPi5Dy/R4/+oM6bVmcgRxXGGOn8G0eiY6EMkACrT1 X-Received: by 2002:a05:6214:21cb:b0:6f4:b876:5fb8 with SMTP id 6a1803df08f44-6f4fe03c694mr97762646d6.1.1746111394406; Thu, 01 May 2025 07:56:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746111394; cv=none; d=google.com; s=arc-20240605; b=jOCxOfpW9NslcnRBdSEAlYUJe4vLZ20quwf6dOcz20rjY/Kfh8jRueHMP5ZZB9SZLC ewf72usOsYEar2TGomHykyJ2L1QVA+Pm2odfiUA6auFD72LW2uVx7xwF6n1N+eysTzI3 QmGfNtFUWzL9xI21gaFhYd+hCkEmGE//zPXb611XlJfmogkgZAfbSNPHiqounhtWbOXz SMCWcu8fFYzOwNasTUrOh8XbiP8q6YTH26pWFs7L8CbtQopjI9+1pO2klprovit6ZbGN 33aYU6tIxs/x6tpsgJNeqIorNdaDuj2K9zxJ2FlegpsjpodpiHx0f2boXYBJcxj0zQMK wuNA== 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:to:from :dkim-signature; bh=NpsPRpqYy0EdExgjwMRc7rUCQIZJoGgOry5zvIX2oes=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=kEWxB+mrGpiHoTEIYN8F63TDjm6OjhwFNuWqWvXxCj2INtTZfykBJ19raQke68rgR9 hYvVj8sXpW+Fg03Tcz7XK80gVLkswR2hxR450vdQWY2qXAfoBCRkxDWC1IRy5lL9txIU aA8E9nJPs7SyjjCkx/R6fOrFiSO2R09LvyEHpXYKsPQP2WFQJ5LctUtMi/0gv+CZOo8Q zhqeERSYkv8PLZ2hBrPmug75P4D6cxKL4Oriz4jDsQOQoeNk/hecuYVHrnB2KlmJaaLp xBr3kqZ2ZoyCJBrJhy8bF7UvIsXeLkGflsnuZvDqg6c21mFW/tfAQh58yzGUrjC80NFU /qUg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gDmTO3ym; 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-6f50f4abcf4si9081406d6.449.2025.05.01.07.56.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 07:56:34 -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=gDmTO3ym; 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 1uAVKB-0005jf-D7; Thu, 01 May 2025 10:55:43 -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 1uAVK2-0005i4-7U for qemu-devel@nongnu.org; Thu, 01 May 2025 10:55:34 -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 1uAVJz-0005Xx-0f for qemu-devel@nongnu.org; Thu, 01 May 2025 10:55:32 -0400 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-7fd35b301bdso1303365a12.2 for ; Thu, 01 May 2025 07:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746111329; x=1746716129; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NpsPRpqYy0EdExgjwMRc7rUCQIZJoGgOry5zvIX2oes=; b=gDmTO3ymeJj/466t7O2qs5cwyfmf4fVSjht1MjXZjUMSVyMVAMkfnHhNfsRsG2XUQb YqF7q7rdDpAS/4i3V8bp2JVt8hIizOjf+KK0uaaTUvuA7NPT4O4ZfkiltZ97AXbLCDmm g2lY8khXDngiv3RYzgLRZmWfLmUrtThhwu8n9tbDe9i9Z/L8IkOgPnXRMG4RkAWm2FP5 9FbRqCjUX/lAsvGVL33Q9xKr5jBRibghAM3mZ1Q8+03lR1a7P3JmNBw+9VW2zEDqxZNq MzYTrgAevYfqH0V8y2oABmu2zjUZ04tekmiK+C6CghqdqLG7SOpoxDkqkTLN0vNwoC/S 4sjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746111329; x=1746716129; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NpsPRpqYy0EdExgjwMRc7rUCQIZJoGgOry5zvIX2oes=; b=tRj7cONz6zL90c6bJ7k4zPLmJufk8khiAhAtHdiAzQVksI+tyJ76QKqr3E5Yqd5Bpk 1jasEO+LjWPoeERUKXH0KSNIb7qk9/SbO5m5TcVIO5JHetwKls8jTTN6dOs1arPCBM+I qoue+/SfyundzWTEmESGeh6DkcBjrY3JXo0+0/35dxVNA4tOwHSnz1S8b7z537tWHKqa Flll3YWLS2yM9LIAIJEXruN4yZdo5HHqA7PhSuzMExYrCn7GFSFYSE8eHYrNd3BRqc6g Z5aNsd3RqD82cscpLGkqG0J3YQ4UKZcBs/ngyc2Sevo5iGCwfberyiYr5xyIQIt15sLm wyFw== X-Gm-Message-State: AOJu0Yy45Sd8VMxZBKOWzPdMSz9Iw/bhYY5RLfS/ABx2NDBaa1o0KYWW phsG++rFNOiT1uQKH0cGbQ3KUENSK5PS6xDYSBCvbjZPzluH9YPOrl9ReoxuwA3v4ez4TVFdAS7 9 X-Gm-Gg: ASbGncsGYLpRjOX2uGR1TPs3zLs7f4X21Y4G1OLD6CYYWo99K50yNmNOcC8HmUFhE0G 40lyVXhzP0e7tKYnt6wRPe1ZS82KeYj1xjbPbmdiPcasi46JPYeVlskmYd3QA/8q6WhqBwPv53e EGOzhbCUreZ51Fih9urmIZZ2J06JbzqGrhlJ1PT1n9ETcHGOB3UR2fH5jMB8bi1uNxFntaoQU1V 4brdaLmdq6FyKCrfoY97gr3cbQFRBdMHaWjrsc9q8Ljka4fdlfn3uiuc8xXgN9IJq1088CNgY7v 4wjJlysn01zcT+DlhwW/kqCpPYcpB7CxAYcQLzUGuGSJWj/Ex0DbjsjK/d1g252ewUMqsupTHIM fL7uyWU+4+g== X-Received: by 2002:a17:90b:2247:b0:2ff:52e1:c49f with SMTP id 98e67ed59e1d1-30a34467cbfmr9183749a91.26.1746111329146; Thu, 01 May 2025 07:55:29 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e0bb0e770sm7644415ad.92.2025.05.01.07.55.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 May 2025 07:55:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 11/11] accel/tcg: Build user-exec.c once Date: Thu, 1 May 2025 07:55:19 -0700 Message-ID: <20250501145520.2695073-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250501145520.2695073-1-richard.henderson@linaro.org> References: <20250501145520.2695073-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=richard.henderson@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 Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- accel/tcg/user-exec.c | 5 ++--- accel/tcg/meson.build | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 085da0c036..f25d80e2dc 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -19,13 +19,12 @@ #include "qemu/osdep.h" #include "accel/tcg/cpu-ops.h" #include "disas/disas.h" -#include "cpu.h" #include "exec/vaddr.h" #include "exec/tlb-flags.h" #include "tcg/tcg.h" #include "qemu/bitops.h" #include "qemu/rcu.h" -#include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-ldst-common.h" #include "accel/tcg/helper-retaddr.h" #include "accel/tcg/probe.h" #include "user/cpu_loop.h" @@ -33,7 +32,7 @@ #include "qemu/main-loop.h" #include "user/page-protection.h" #include "exec/page-protection.h" -#include "exec/helper-proto.h" +#include "exec/helper-proto-common.h" #include "qemu/atomic128.h" #include "qemu/bswap.h" #include "qemu/int128.h" diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 9b86051b82..d6f533f9a1 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -21,11 +21,8 @@ endif libuser_ss.add_all(tcg_ss) libsystem_ss.add_all(tcg_ss) -tcg_specific_ss = ss.source_set() -tcg_specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) -specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss) - libuser_ss.add(files( + 'user-exec.c', 'user-exec-stub.c', ))