From patchwork Mon Jun 5 20:15:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 689266 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp2288816wru; Mon, 5 Jun 2023 13:27:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7wh8oIx+QycVh+94E32BihuPtacv3DrA9uCZBEjcwaHxIXDjg0t2CgP7Zt14EB15zXSGbL X-Received: by 2002:a05:6214:767:b0:623:8214:14c8 with SMTP id f7-20020a056214076700b00623821414c8mr7924708qvz.51.1685996860341; Mon, 05 Jun 2023 13:27:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685996860; cv=none; d=google.com; s=arc-20160816; b=irj3YgAWKOPzfRV54Z0XSgcBsSBYeQdt+korXWrNJOSdXCjDotjmiZGukaKR8JkXp8 DCMxltg2Hl6z1DF7PCOP4IXs5WAe57sPdfdT+1RBsSzKi8ZcSS9oin3EW5l5tmDUzrOG OkZvc8N/uRwwiZ1kpW3fRc8T/4cug6uYwLLBiwY4sX1H87kk540WFYkWyLC/dNlQwEID 9kF9yRM3qAEbf+8UBx2CVW37Bd4eHe7TwK79YJAGR0hLwiEvtFcISeONBpImzJoSYyTt IF+XDKByNHYAr0Gw9xVUo2r6DTZzbIAurNiHsEPYJkFT1J9u6P1uqltEbNiLbby56GQ9 T6AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=nAImCar6oyDgjZqzKCPoy2LdZjs1Hux2vEDU7Qe1ybQ=; b=N+LO3muy76Z/Envb9C54odrRbmIC6vtqkMODk8G1Uf6/U1EGBtEDo8ZF3FmRL3oFs4 3h6LZZ6bLvibim1DWtOIbcUNVAu+GIIiCobWyzqk+W/vhEHn+65gJuZWr9ASoD/z2sEf ybax+HrQoZxU2cgzIqa/rLPDtxblV+/fi2ZRYudl/Z7asyc6Yv0f21acglqH5ACY14jk PLxm47JynhMSTwg6UkA8ILA4VlA+Ms8WA6F6oOwiOULFc/uUL+Y6TltN0kduDPnI4Ncm eY17p+DnSBMw3HZo/cjJdckrcXPQcG52dkJ25WE6uOZ+U45nCmerfVlNo9LO0ggslSCF JSnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="l/nPa24f"; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id eo6-20020ad45946000000b005aadafa8f0esi5255148qvb.69.2023.06.05.13.27.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Jun 2023 13:27: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="l/nPa24f"; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6GgI-0007GD-CF; Mon, 05 Jun 2023 16:19:58 -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 1q6Gfr-0006tG-Hl for qemu-devel@nongnu.org; Mon, 05 Jun 2023 16:19:32 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6Gfo-0005k6-Jj for qemu-devel@nongnu.org; Mon, 05 Jun 2023 16:19:30 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-653f9c7b3e4so1955562b3a.2 for ; Mon, 05 Jun 2023 13:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685996367; x=1688588367; 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=nAImCar6oyDgjZqzKCPoy2LdZjs1Hux2vEDU7Qe1ybQ=; b=l/nPa24fQUIv0eQA2WuXBq4Cctm5bbcT8k06GzuFhVZH2dwjQ8pglwBwlAlFfR6tK+ +jAUrnguNt3bgXJ658gR46qm5iPpD7bqtwE+Xskn+3rF5bI16zvVM5VaqkN46K8f/fjk TDHSazgOBdXqLnt4wdEE9/qGF0uQ9wtkj6SujlXN3PffIXK4TGMl4cdVYaVhf29FiRCz hAdieSxXCJesq8de7B0aweMGNdvmkLCxZPwIzaMDxWXFlPIjHexEBQrHsoTWqZUpWLZb ziHM4vURqkEpp02AVMugfKLzHQncKmruKniTFnbLVN4gZl+RmwE38Ercl8mJWz8TrJxS Y+Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685996367; x=1688588367; 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=nAImCar6oyDgjZqzKCPoy2LdZjs1Hux2vEDU7Qe1ybQ=; b=N+czNV5MadTKEj2+gA4smn7n5toniFif1ukCW7iIK+l9e7BAjAbGDNcfb4a44G7kYW ldVX14EKeBgavNPIaQRdzp5yjwW6zVnXJtIvtzkrucY/Omrw+HMa/3/Ofl9jlYhJY5T9 HMvtxbFnBwaL9W/mQbJsfRRWDAInsVWmT9JVsR+vP33QrMDtH0bXJyFzJQXY9FC1lUzL CrAPNbJFnu+I74FLni8KwN3TYQSC45hfQhhZABwQEcgRVvWMgGrBPrdYeTct/InLGfaM kLTxzoBXhswYFtEFFFegEhkYvThjkpJTZuUiSk06b+BLC58/ub4vxLvAlDK5q8zs1E3K F5Ag== X-Gm-Message-State: AC+VfDxrgLCc2JrhhwDoS1S3U+GX58WL2ulE1I82UxwQ50sDPAuL9kb1 RTjxghZ55yyjnfV/cN+JYkKbk6Sksm+gkX2Cgq4= X-Received: by 2002:a17:902:7c0c:b0:1b2:1b20:c45b with SMTP id x12-20020a1709027c0c00b001b21b20c45bmr1420740pll.54.1685996367323; Mon, 05 Jun 2023 13:19:27 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:3f85:a600:6a3e:e465]) by smtp.gmail.com with ESMTPSA id w20-20020a170902c79400b001a980a23802sm7018184pla.111.2023.06.05.13.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 13:19:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 43/52] accel/tcg: Tidy includes for translator.[ch] Date: Mon, 5 Jun 2023 13:15:39 -0700 Message-Id: <20230605201548.1596865-44-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230605201548.1596865-1-richard.henderson@linaro.org> References: <20230605201548.1596865-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Reduce the header to only bswap.h and cpu_ldst.h. Move exec/translate-all.h to translator.c. Reduce tcg.h and tcg-op.h to tcg-op-common.h. Remove otherwise unused headers. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- include/exec/translator.h | 6 +----- accel/tcg/translator.c | 8 +++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/exec/translator.h b/include/exec/translator.h index 228002a623..224ae14aa7 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -18,12 +18,8 @@ * member in your target-specific DisasContext. */ - #include "qemu/bswap.h" -#include "exec/exec-all.h" -#include "exec/cpu_ldst.h" -#include "exec/translate-all.h" -#include "tcg/tcg.h" +#include "exec/cpu_ldst.h" /* for abi_ptr */ /** * gen_intermediate_code diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 60a613c99d..fda4e7f637 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -8,15 +8,13 @@ */ #include "qemu/osdep.h" +#include "qemu/log.h" #include "qemu/error-report.h" -#include "tcg/tcg.h" -#include "tcg/tcg-op.h" #include "exec/exec-all.h" -#include "exec/log.h" #include "exec/translator.h" +#include "exec/translate-all.h" #include "exec/plugin-gen.h" -#include "exec/replay-core.h" - +#include "tcg/tcg-op-common.h" static void gen_io_start(void) {