From patchwork Sat Mar 8 07:23:46 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: 871530 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp59501wri; Fri, 7 Mar 2025 23:25:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW+c//uBDahQ/sje/ywD37goDNKyhENEkPGpxxzN9JAS7/YGuxWct5U/LO/juG+plzmjSSgPA==@linaro.org X-Google-Smtp-Source: AGHT+IGMr25r2caiCsQe4IH7FFq0eAnOEeDQ6aYVbrh3EdNskJUkHAXyp6wNfCE2fqi9a11VgltE X-Received: by 2002:ac8:7f43:0:b0:474:e033:3efb with SMTP id d75a77b69052e-476624f7f98mr40123361cf.24.1741418710027; Fri, 07 Mar 2025 23:25:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741418710; cv=none; d=google.com; s=arc-20240605; b=Imt12u72b7oGPV2DphmqyPis0Iiz8iQn4eeXKQKVspy8cOPYWn5MiUvtTmScVWXS6I hlMTsGdTJdcu1v3zOTrFOn9aOU3YDzwfmxKeQHXMpQN9isoM48xBwVRRsPNKQbsc167D Ejn6JFg/b+UoNy0aV7WTloQtIXIi9bPIege3R6gaUNVoVhGLujCy3GkOMrM+DQ3JdfDV b7IMwvWKaPA+J8d+dgNdHP4QVR7tz/CQZj8IQ73dR/hK7+X/W5bRIolSPVh1wW6r8r7g sUVdZi0CoEHNPb3qfgFbm69yNJqHS7Ct9KbVO7OCUHyub28O06IwAWnGEvReTqalTI8+ mCLA== 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=O7kazZRyRImLPrA4ARMvw47fAUrwdo+TcmyR6boI+Q8=; fh=pgRJImLGStw4JiZaQ8tZ6Gx4wEkoSwwNn1cV112GpBk=; b=EqSKmAQXS/hWnHbD1LVOUBR55fo3QjkidAledCTKGpBQ8npU7hrd0AZgHsZvJTxnn6 ccR18IS3oLIz2LlDA6PV2IJZCO3GhdyeDOvVB+ciq7vU0+O/o78SD4URFFhqS8iehyVU EdWO3pU6n+DXoY1zllCZ+ANltGyhCKdyFsmfGg0oZWtH+KlUOjZKdNhynmENNIF6ji+C Wjeq9B/8l+TQO+TJW9h++zR3w+QZq/+RJVd/nkGr9qeTcMjsoOfVTaQOVcn1TOFHJ5x0 RdYCQy53q+/REOzrzZ07jo4a1eU7FUU2vV2Izehzb/NtHmZlVG+cJNrspuM2hkGHdSvu 1l4A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uGKueCZa; 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-4751db24206si52229321cf.403.2025.03.07.23.25.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 23:25:10 -0800 (PST) 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=uGKueCZa; 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 1tqoXZ-0001OR-0q; Sat, 08 Mar 2025 02:24:09 -0500 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 1tqoXR-0001NG-QT for qemu-devel@nongnu.org; Sat, 08 Mar 2025 02:24:03 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqoXP-0008KS-92 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 02:24:01 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-438a39e659cso14885665e9.2 for ; Fri, 07 Mar 2025 23:23:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741418637; x=1742023437; 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=O7kazZRyRImLPrA4ARMvw47fAUrwdo+TcmyR6boI+Q8=; b=uGKueCZaxDwRKB0zxm5T4tZqz/88qQOd3UvIxlwNI+rvGiJxX5k9artcXUz0vrcZBf aT+4Z56fm6FhgvgThxo9ARCSQ8AKRuZSNufROqjZkCYHvdQkWan/XTSs/raqkcPMCepC mLpB2boeolp8VYqf/72oCwAuuhVqMspdXP+VZDVVJsYzN1a7fgHGWsZerrSRsjffurnq 3rs6nG8sb26oGBzNJ5Vkgxb3Znf+bHFhbenoDJBQQV0lrBIdb6OrjTW8pyUxvWCt72Rt vDExfkQUCQSK4YMZQIr64RFVP7YXjJbWQ7oqBBZ/kD5ztNblfXnGgIBIHgRJS7yeU0Ao ETIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741418637; x=1742023437; 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=O7kazZRyRImLPrA4ARMvw47fAUrwdo+TcmyR6boI+Q8=; b=wr383qkQST/J7BlxXkkGPYEull8W1pRpqvlYjZFPVpxgOemltfvwIgUUN4J3induLy cseBV5v132e7+6yyUKj03p/INf/vskeSxQ9zm7s6i9Z76mObcUOj3qmh6sBybkJ+Gg4j JPMfq+wsE1RbD2TIJrqVdZ45ukPf1woIu0FI1ckGIwkEVCRBgOuJv2eShATaOwn9FhM6 ykNa09aIJKqqvwKif+AG8z0sHsS4KLz+6Avwe3znkfjWw4nz2C77xkmBYX+mFWeImSwn Bk7/gYTFt/AI54JBUS0+9hMcJt7eaZHLBdK/4rh8XmMHlMU6xk9acQoXLPqmb+/kS3Bo wbUQ== X-Gm-Message-State: AOJu0YxMIYbL50Wlrpj3Q0ARu9upAyssMaEGPupYtfvVUV1zVRClS3u+ fpQC8YHAwwWMbHcJI5DkxBiZVZdYSI3ymHqeh30ynkuYym2jk92Uh111AlJ5QPfFuy19T71qgoI +jmY= X-Gm-Gg: ASbGnctJP5g58PpBocojIWc02E4qxY7oOB5/AqVNqROTQCrxUDkC5vjQSe2DnT78D+M TICzKtqsVq4dIIwnBBPjrxhaSEghq8T9IVX3ve7orB6r6/kGEHxi1RDu/f5pkNjFoF8Yptee9f7 o/G7yThBgArrMILG7/H2yTBuQsKtrEbTQR38Su8dZvFlk5zhgywV7MFHPboP+n3aR+TWh7if4ui HPcIQPXPep34t96e1v9neVWATD/oGBNb9PFwIYNIlOkeG2DY5ouhkPAnxQV25v85XQuDC5CB+a0 X9swD62/klZPeTlWAmxpnFDb1vHRs6xj27QOwymyM4SQMZsljCqY6jfnA9bU/O8ykXvdJo/jNzO rOQaz4t4bT7j+PJ8QPCdLVPfWGiZ76Q== X-Received: by 2002:a05:6000:1789:b0:391:1f9:c59a with SMTP id ffacd0b85a97d-39132dd94dcmr4239025f8f.46.1741418637238; Fri, 07 Mar 2025 23:23:57 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd4352ed7sm104826185e9.26.2025.03.07.23.23.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 23:23:55 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 15/18] accel/tcg: Restrict GETPC_ADJ() to 'tb-internal.h' Date: Sat, 8 Mar 2025 08:23:46 +0100 Message-ID: <20250308072348.65723-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308072348.65723-1-philmd@linaro.org> References: <20250308072348.65723-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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 GETPC_ADJ() is only used within accel/tcg/, no need to expose it to all the code base. Signed-off-by: Philippe Mathieu-Daudé --- accel/tcg/tb-internal.h | 11 +++++++++++ include/exec/exec-all.h | 9 --------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/accel/tcg/tb-internal.h b/accel/tcg/tb-internal.h index 62a59a5307e..68aa8d17f41 100644 --- a/accel/tcg/tb-internal.h +++ b/accel/tcg/tb-internal.h @@ -13,6 +13,17 @@ #include "exec/exec-all.h" #include "exec/translation-block.h" +/* + * The true return address will often point to a host insn that is part of + * the next translated guest insn. Adjust the address backward to point to + * the middle of the call insn. Subtracting one would do the job except for + * several compressed mode architectures (arm, mips) which set the low bit + * to indicate the compressed mode; subtracting two works around that. It + * is also the case that there are no host isas that contain a call insn + * smaller than 4 bytes, so we don't worry about special-casing this. + */ +#define GETPC_ADJ 2 + #ifdef CONFIG_SOFTMMU #define CPU_TLB_DYN_MIN_BITS 6 diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index a758b7a8438..2ac98e56c41 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -186,15 +186,6 @@ extern __thread uintptr_t tci_tb_ptr; ((uintptr_t)__builtin_extract_return_addr(__builtin_return_address(0))) #endif -/* The true return address will often point to a host insn that is part of - the next translated guest insn. Adjust the address backward to point to - the middle of the call insn. Subtracting one would do the job except for - several compressed mode architectures (arm, mips) which set the low bit - to indicate the compressed mode; subtracting two works around that. It - is also the case that there are no host isas that contain a call insn - smaller than 4 bytes, so we don't worry about special-casing this. */ -#define GETPC_ADJ 2 - #if !defined(CONFIG_USER_ONLY) /** From patchwork Sat Mar 8 07:23:47 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: 871528 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp59403wri; Fri, 7 Mar 2025 23:24:46 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWgXZt6ZL/Q00DTtujULc/2YXVIp5a594qymvryAyAYXQ77VkdPXPHLGRe+gG/ZMlEBrBEQSA==@linaro.org X-Google-Smtp-Source: AGHT+IEoXiNIaPTmvEpcm7aUQsQwMgtG/8RX6USqyr9/VOKOjGoQnv5zYl0AFO5PcQ03ivXSvutu X-Received: by 2002:a05:620a:6504:b0:7c5:3ce4:7396 with SMTP id af79cd13be357-7c53ce473e5mr380236585a.48.1741418686492; Fri, 07 Mar 2025 23:24:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741418686; cv=none; d=google.com; s=arc-20240605; b=JJMjKDdXquB32BN0IQLYqP9gGxFLWeHaiokhEqZjTrlWrH9NKM5foo7FES3tGJ2wcH W95FBns3VQx23IBDYR/a/tdNG/HkPE1jOMSCn2WMZcYjBy+2Ul1ma7a2ZNPP/IRZr+yb CdgIO90feU87R5uzzuxt6/mx4Ld4TRtOBOJetlTZbPChTAaePhFNv7S/Rxp5Jxrz1VGk izlEEiXryrNFqJ0QNvfej2Dg/9iqqgR2kMjHseVh+uWzk/nAFkfbp6zxrYl2ly7booAF FT+YpqUTBNyCF7d4y3PBHBH291ffJDC+Y9ScITvdWKjHwnF+dkWpSmz4FdqabUYbrVK2 qqzQ== 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=K4eoVoXXRJyhwukYmalfs9jSQF5Wz6XN2stlsLIjFEk=; fh=pgRJImLGStw4JiZaQ8tZ6Gx4wEkoSwwNn1cV112GpBk=; b=aRdnAOoOpkh9VhrQZuNyPzgTanuQmGvD7NdgUcMAhuhN6oQZYT2FapWolZraqUq/EA 67pnPyNRE1EeZeSdKOuCdQq5KRKEZG3DyDayCL3wOK4TO6WkVcHsgIs7k0GVDNzePqny k0v7Gk+5BjrG4GqPAv6eUf9H6GgGgSBfWu4Q4HTxwijNw9Ip6lSBzoXM9ceBUsrDXy2Q Flx74b/lDaawUUSKLePR//S9V+LiqnjBocCetBLD/mj+3XHmBASTl2adCP4Fz772RgHN iNQYL5DaXTWPyZwnHKJMSpbpZdR1SUIxrX0PXvei28PiAzbufGmWZMk2Pqy1mkkz7S15 KNEg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kn749YMU; 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-7c53e74d9a5si88798585a.182.2025.03.07.23.24.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 23:24:46 -0800 (PST) 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=kn749YMU; 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 1tqoXc-0001P7-6e; Sat, 08 Mar 2025 02:24:12 -0500 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 1tqoXY-0001OC-CK for qemu-devel@nongnu.org; Sat, 08 Mar 2025 02:24:08 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqoXV-0008Ky-4d for qemu-devel@nongnu.org; Sat, 08 Mar 2025 02:24:07 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-390e702d481so1328114f8f.1 for ; Fri, 07 Mar 2025 23:24:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741418643; x=1742023443; 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=K4eoVoXXRJyhwukYmalfs9jSQF5Wz6XN2stlsLIjFEk=; b=kn749YMUmwz3jGsx/x4pU+nfNzlrnZYvtz6WcHwuIjuef69DOOFF5k3UomkM2umEYE IASK3iSeA8lDfjT7JI24PE4fFyMonV0niFD98z50Av8sh16zGzXI+9lHIDagHSaxlbS2 NHJOv4fykr+B5J/qhKKgLufMqG4oGRZwZmKzTROKNLksVGBcMozQnFpuk+x0IfBhkRH1 gV8JGV6+Ln4Pb0QUAjSOoCi/WGSVUYZSGvy0pG+37sxegg5ybxdCQRsqbD7QTBXUvw2E B5xOctjY0tK+KjF77KcFbZsyC7wnJwDrtTU1u2xca7gJWuNPHNv7Dd8fP48y1DA9aD3p +WUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741418643; x=1742023443; 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=K4eoVoXXRJyhwukYmalfs9jSQF5Wz6XN2stlsLIjFEk=; b=mScnazM2nTnMNM/vGji6DWdYwweh42sHeV2aeqaBiA4DxoihzLluEgD3CndPKz5pOg AEq1+9oE2PpuKA0L4A8K53qGFhly0E8C0QYj6QWoCmqQ/0/+uwJF37PGznOSXwasrh0r znJ6FOmcC2YqlaNHL6h+HV61Sm2S70+TfLx2gSN7/iR6+Q5uPDwjslIZBNdRI1MoaWkt FCl2ZmcOusMcRp4unAI3+LqhI6gHUKzkGXTB09KHJPTjHCoBPNY7QdgaBZn+owFExwIZ MIF5mKWXaS+xZgfepjepNVEGleIZP38WEug2s3eykCLJ3pZm4dEotrC3q7LWmsqHDbV5 urYQ== X-Gm-Message-State: AOJu0YxVomhAPoLYQkjmXQ4AkR5hPDi5RmDVnpvXq0BogZJzfgx1VL1t kmzOmiO44pRgZCaVCeLg9n6q6Gj0eDH+C3w8wmp2y+8LaxdOO89sKBzEuIC61xVTW/ycss0tZhf SoSM= X-Gm-Gg: ASbGnctd+5isuCju1ymNmfrnLCwHXd7dfE5iSEQr9faOLYz7ZX1ie/PjdM1EEPssr3R bMoLGs95fQ/FT2+5HJrp88iadqAMdO/QqEPUCjMpr/qTwaVOETZ2nYidgjTr1+rh1FaoaLF0Lfa qmXb2G0wW24vPHstkTkCnA+hPJwI0cyKBgKqk4I/K5aLkWAX60yv9ZiZ3/VRrec+TVkyE59EB9K 0LQqkFCE0Egc62icLbysYong6UpU+6dslbJ9+DjCUYNWgY9i8yzYORLlE4zGS8NySzulOcYcvlr oSxYJVEiisAf0Za2Ad/OgeDZBWqApAxXMRcUWOmmOPJP06sI8RwIM5uEo0BITw+C9kP9sjFdVoz 4XFq8jOs8sBF1D4pxO8g= X-Received: by 2002:a5d:59a8:0:b0:390:f55b:ba94 with SMTP id ffacd0b85a97d-39132d31f55mr3956175f8f.13.1741418642739; Fri, 07 Mar 2025 23:24:02 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfb7aefsm7793583f8f.20.2025.03.07.23.24.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 23:24:02 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 16/18] accel/tcg: Split out getpc.h Date: Sat, 8 Mar 2025 08:23:47 +0100 Message-ID: <20250308072348.65723-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308072348.65723-1-philmd@linaro.org> References: <20250308072348.65723-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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: Richard Henderson Split out GETPC to a target-independent header. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé --- include/accel/tcg/getpc.h | 24 ++++++++++++++++++++++++ include/exec/exec-all.h | 11 ++--------- accel/tcg/tcg-runtime.c | 1 + 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 include/accel/tcg/getpc.h diff --git a/include/accel/tcg/getpc.h b/include/accel/tcg/getpc.h new file mode 100644 index 00000000000..4bb5f7b15cd --- /dev/null +++ b/include/accel/tcg/getpc.h @@ -0,0 +1,24 @@ +/* + * Get host pc for helper unwinding. + * + * Copyright (c) 2003 Fabrice Bellard + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#ifndef ACCEL_TCG_GETPC_H +#define ACCEL_TCG_GETPC_H + +#ifndef CONFIG_TCG +#error Can only include this header with TCG +#endif + +/* GETPC is the true target of the return instruction that we'll execute. */ +#if defined(CONFIG_TCG_INTERPRETER) +extern __thread uintptr_t tci_tb_ptr; +# define GETPC() tci_tb_ptr +#else +# define GETPC() \ + ((uintptr_t)__builtin_extract_return_addr(__builtin_return_address(0))) +#endif + +#endif /* HELPER_GETPC_H */ diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 2ac98e56c41..ce303de8486 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -29,6 +29,8 @@ #if defined(CONFIG_TCG) +#include "accel/tcg/getpc.h" + /** * probe_access: * @env: CPUArchState @@ -177,15 +179,6 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr); void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t last); void tb_set_jmp_target(TranslationBlock *tb, int n, uintptr_t addr); -/* GETPC is the true target of the return instruction that we'll execute. */ -#if defined(CONFIG_TCG_INTERPRETER) -extern __thread uintptr_t tci_tb_ptr; -# define GETPC() tci_tb_ptr -#else -# define GETPC() \ - ((uintptr_t)__builtin_extract_return_addr(__builtin_return_address(0))) -#endif - #if !defined(CONFIG_USER_ONLY) /** diff --git a/accel/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c index 9fa539ad3d7..3d4651b4012 100644 --- a/accel/tcg/tcg-runtime.c +++ b/accel/tcg/tcg-runtime.c @@ -30,6 +30,7 @@ #include "disas/disas.h" #include "exec/log.h" #include "tcg/tcg.h" +#include "accel/tcg/getpc.h" #define HELPER_H "accel/tcg/tcg-runtime.h" #include "exec/helper-info.c.inc" From patchwork Sat Mar 8 07:23:48 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: 871529 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp59404wri; Fri, 7 Mar 2025 23:24:46 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVZkZmMoo1scq9u/RgdDENnQw8Dj4LtHMvmCeEleTx1VtoKVMmkVZqeyDbbFz9KP54Jya29PA==@linaro.org X-Google-Smtp-Source: AGHT+IEZpVOVQCrofWld5l6InASU6dIyAJQqowrHZSAXnjFIi30MiWGGdOPruXFy3w7XFP+wZN7Q X-Received: by 2002:ad4:5f85:0:b0:6e6:6c18:3ab7 with SMTP id 6a1803df08f44-6e900668755mr85504196d6.27.1741418686699; Fri, 07 Mar 2025 23:24:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741418686; cv=none; d=google.com; s=arc-20240605; b=IV18ReFzzM3nYNWuNv6qmUfvL1VrTNyO5tAtTMLRkGy+1phH3yg8FTSqSpepUVGx+f ca36PGaXSH2yrBX22zKgIHJ4fBX87ni6Ec21C1nTmRr5egmFrIJczphQsfYapCJjDgOW PokOtF0qBEqQue3BI7ugQEfaNRFzCgj0X1AQcxsh0PH6hat4cbC4+Qrpk3sBTuIeWR6r YD44eQ5NaJBqYog9pba1LEcE2+npw9zoUopCzhWyjc/2LkYqK+LRgA/30NfaMBC7bR5M ia/kCG+JNSrVsSVSYV60vd/a2sviZ5hH+hZHsc97DERzlDpTAEjto4cTTPtZTwsuUWmy 9zMw== 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=0ZK0fCYsleMzsa/JHC9c5molUW12aA2YIflz9M8WHro=; fh=pgRJImLGStw4JiZaQ8tZ6Gx4wEkoSwwNn1cV112GpBk=; b=aQoRkDvXf/+QwcK0toX+xC1bgvfPpjULKdZQssln19KOAopfK2SfuDRrC+Nz9d6sg0 eLWfnW9wSUsgeKrPmq2Vpebzn0m1M9SX5/4158Ql/+lHNTiqy4vXh9RfJrh6yxzvTYf+ T/B7SyF6Au+ta2DKk1VGei5dVYrGfwTHFcGdk3azTRbb3ClnY8TLTNfB7SQK0ICfCk+V Evm+eVovj0D2cq7CIiw8DVprzgvz04rYh0s7QiTYjep9iVpta8uTSrD3bMea8WDy7rpI +9Z0GbHlkgfIsbFik+1ZlQLjH1QT9/irv4/B9nHl76z+2dJN5AomBaAmrRCWgUWV9o9C zUlQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Xs/IWlWa"; 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-6e8f7487f28si50188706d6.500.2025.03.07.23.24.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 23:24:46 -0800 (PST) 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="Xs/IWlWa"; 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 1tqoXd-0001Q4-Rz; Sat, 08 Mar 2025 02:24:13 -0500 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 1tqoXb-0001P0-IG for qemu-devel@nongnu.org; Sat, 08 Mar 2025 02:24:12 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqoXZ-0008LR-W7 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 02:24:11 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-390e3b3d3f4so1289436f8f.2 for ; Fri, 07 Mar 2025 23:24:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741418648; x=1742023448; 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=0ZK0fCYsleMzsa/JHC9c5molUW12aA2YIflz9M8WHro=; b=Xs/IWlWaHqMWvfxFhzzL75CcMcuPdm1ktOBD/qw2qJItI4Y1fOsAauHhEXoZ8zHySG RwRgjZx+z5NmWeRwxste04EKPbEoIbJ2GqhVoYD0HaWawZUbqKjez6StrJ1/LwuTYsxq /Cjm7EcvIpEMnD5XHbSpsSkdc/XLQYb5qp+czMMmA6Z7BVtg1gfWSiisBziU1H5Wf4Kj dZvnra/6KDNCETyqjYQz3MkIJ0IpOytgAwtZRMoMNLGRSckKuQl1gXygq7xRdDmXFRMe ExIpFXqyyf3iTfp8H1ts200g3p+Vh7OD0UTz/p5BOBAIQG+G5YDk4am5oklmxf/NgyPV vQ8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741418648; x=1742023448; 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=0ZK0fCYsleMzsa/JHC9c5molUW12aA2YIflz9M8WHro=; b=IsweabF2Pe2gioPVdbn+0xP68IAzFwDsiQfhLtHIrJ4bJd9OAwEjJVXj3X7D//tZT1 SwtExux2XJLOLeK902WbYvQbsaP3cpq0C8eQ6vDROuICcGor4liKvqwC7JylV5iHOtXr ba1Ku0PEcD5WlC4lBsIRHKUdQ1AibHf46M8oFzAGGIKizT0TuKbg/QJS3EyoHGcKNWBG gc/Pj4e6c3nk68vLmqyInaMU8mKCU/s0mfDVLZTCcmzN0TObt9qI2nTnL0eWEzgoZDUy P3o7VHlJ2uIY9/Mg+9bXdpDlzVOa8ULqCtIB/cr2BpSEcRTqGkC5z7qwZC3NXOvB+64i Eu9A== X-Gm-Message-State: AOJu0Yw4iHzax0xOW7rN0kErN5PQAbF2SLOxq9B1zYa6raBR1a2pyl4s Y6cKbgbpLX2aKRJowgtBM7iC7rSuBepudzTZkmxaHtEBWzm96uu98mBlNJWEsGBvDnZEH7yEK08 0eW4= X-Gm-Gg: ASbGncsZ68s4H3dOwQwlGIkH2cTRW/Ui6JiBDO1Bu6FwpVJUKJCkc4TpVBAvMWFC5/u aI04jGZtiiz0TiETQHf9g0iZZhKNh7HiEBxKHKyHdiWZ5HTrM+33s1MZULH88eWIywvxDADvV/9 jcirXE4NNKDd7AxvxwHI75BlY2g17UKfkdsr5WONFwMqgznXO8KXTx/A5viLUQaU1zylYmlcRVD gBbOlxfWn7i6AmIiYgBtwIuSh6rumZDeZuSjgql3yg4zC/lFZbBGlkxDsD3VyLpRDY9HfMPz7H6 8z7idOxksKYuQRM992M9NEs7s0OLTTLDWuxeU8skLkaepPeB+OMthQOg1uzMbrouL3anAFZLRbz auvsPg58Hnf1jRRlyd+qWV57Thblcxw== X-Received: by 2002:a5d:5889:0:b0:390:f45e:c851 with SMTP id ffacd0b85a97d-39132d8de73mr4857587f8f.21.1741418648332; Fri, 07 Mar 2025 23:24:08 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd8c3173sm77095155e9.11.2025.03.07.23.24.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 23:24:06 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 17/18] accel/tcg: Build tcg-runtime.c once Date: Sat, 8 Mar 2025 08:23:48 +0100 Message-ID: <20250308072348.65723-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250308072348.65723-1-philmd@linaro.org> References: <20250308072348.65723-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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: Richard Henderson Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé --- accel/tcg/tcg-runtime.c | 7 +------ accel/tcg/meson.build | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/accel/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c index 3d4651b4012..fa7ed9739c7 100644 --- a/accel/tcg/tcg-runtime.c +++ b/accel/tcg/tcg-runtime.c @@ -23,13 +23,8 @@ */ #include "qemu/osdep.h" #include "qemu/host-utils.h" -#include "cpu.h" +#include "exec/cpu-common.h" #include "exec/helper-proto-common.h" -#include "exec/cpu_ldst.h" -#include "exec/exec-all.h" -#include "disas/disas.h" -#include "exec/log.h" -#include "tcg/tcg.h" #include "accel/tcg/getpc.h" #define HELPER_H "accel/tcg/tcg-runtime.h" diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 81fb25da5cc..411fe28deac 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -1,5 +1,6 @@ common_ss.add(when: 'CONFIG_TCG', if_true: files( 'cpu-exec-common.c', + 'tcg-runtime.c', )) tcg_specific_ss = ss.source_set() tcg_specific_ss.add(files( @@ -7,7 +8,6 @@ tcg_specific_ss.add(files( 'cpu-exec.c', 'tb-maint.c', 'tcg-runtime-gvec.c', - 'tcg-runtime.c', 'translate-all.c', 'translator.c', ))