From patchwork Tue May 23 13:53:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 684965 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1734833wrt; Tue, 23 May 2023 07:01:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4w4Bi9zUW0RsKx0gDu7juXB3p88Y+a+hIFjFwroYDX6kbuPc5L7PSjb58N+g/qMS6/xw3d X-Received: by 2002:a05:6214:19ed:b0:625:7c0b:4640 with SMTP id q13-20020a05621419ed00b006257c0b4640mr11557262qvc.22.1684850481806; Tue, 23 May 2023 07:01:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684850481; cv=none; d=google.com; s=arc-20160816; b=sr3KIDdLPMAQs4bmeJjEZ9ZaINpSZEKNGzrvNgkWSqFR23boQR0kieINj2JlZDxbjZ BXedNcWejLGkGz4xqHtRzGNRQ7VZdLgz2ryxDtoECHk1GtbtPguO/7takNiJsyUlv9cv SSuGS7ana5gvq6C2rcfRF5JszsFs2oAed26ZQp4JvWlyA5GaodtjRGGuddw1MPmNVVtb dAajNaUqzumFnPbOgFm1t0n38txTLY6rG4/xaWEe525KrAMjKvNghvOHgsd4fCJcVGb/ 0dxXILps/HGUhcrzNJRxFwvO6NTghMpzDNY+5v//nJfxqhPWNsUSS97q/lVF7z1Sv3V1 Kx9g== 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:to:from :dkim-signature; bh=OszBk/d2Y8+QVrgN8+lEyjMHe0GfWFJfnXUVK38CHQc=; b=fydf11sN7HR7DgR9dkQ2KSnvnPf6//Mzxx2lPQEbU35UO6gjzgyYZYR+hOzdawcNkv C9AqbEPvaY/Lhf/MW5Apvl8RJ4em5GKtLB9WIh9U7GAOlIxYKUuagHaaSAEKEfm7dZd4 oJevU5ZKAoxR/Ih3MqlNd8/LBIbhYffgrWhy2DU4Y3g589l7ZSrcgH56K6DNdcxMbX6a 9NPTP/ZCxc2XPdnLMWMlPhTB79gmbuiwi2giSVueMZucP30bT/58NIWIbKxPmv/r2FSf //B7KdWQXMtNXsQE83w5bZkEgQzjedmCIZ5HOSujUjV+dQXqZ7C23ZVyg6C7LpfsUW3J OYdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sm5FSgIl; 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 ESMTP id ey1-20020a0562140b6100b0056e9871bbc0si2490110qvb.23.2023.05.23.07.01.21 for ; Tue, 23 May 2023 07:01:21 -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=sm5FSgIl; 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 1q1STH-0006tY-64; Tue, 23 May 2023 09:54:40 -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 1q1SSV-00056C-EO for qemu-devel@nongnu.org; Tue, 23 May 2023 09:53:52 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1SST-00031A-OT for qemu-devel@nongnu.org; Tue, 23 May 2023 09:53:51 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-64d18d772bdso6821333b3a.3 for ; Tue, 23 May 2023 06:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684850028; x=1687442028; 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=OszBk/d2Y8+QVrgN8+lEyjMHe0GfWFJfnXUVK38CHQc=; b=sm5FSgIlg11c4ZRFqRvCW1uiVqXvvg4qvCqPvEDUbtalYk+p4NOqXdCCrtO0Mgiizy htj4RbbCYb0q73eDu4Yg1529WX309H3qt8t7RX8eNNAT0h78y26YvVDODnjSL7AP7iYu kTD70DQnJpg3V0f6zl7Bzgp/ngoVBIYgSvMO0qFqiWMQdZV1mzhkcQflWJ/4u7OHcCq6 aXsa8KkZPVQRsRTl6M5WgmFrmQRrnE7GDD4TabaiLJ0vFV+M5mzlgLNxcAmlzk5BS1/W i3kQjrqabiGCXBeYNrz3E9OY9JKaXbI6L2gXrlBj6pVqeFYt0kRAJwx+p2laJMD3E+hd Zpjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684850028; x=1687442028; 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=OszBk/d2Y8+QVrgN8+lEyjMHe0GfWFJfnXUVK38CHQc=; b=jLaqZGFaJxJ9Y/9tKnvtxlD8ruhmAHgcDluL2SQZsuSh2TjsQvRY97azLKTZYYEwan 7/GEDc98PvZOazc0MXolC0s/jxJy1WLjSiq21tVnbnU+Ou3nH+HXOUlZvH1aOp6IFKSE uQhZMGB6VKITROS4aqLFOPSVLWUk7ApzHvxexfzPScA6qohWkvLNGOR7zmvEHYITjedS mXXzKLi2ICgYnDhj1AiKCtqSsgcdT5sl4xk7YuFm1QRlm/Wq8Ygw6C5AgwKZnTENeYbG tVDdpNHN9VNg9wa+ig7bUlpCiOcMMUct7SwWvYE1k5iZ8TWjUkEByrqQv/grrY8I1vJ7 Rcfg== X-Gm-Message-State: AC+VfDxO0GBUbNvV7SRc/pKzlpa43rRoqJiShuB4ME3NCrPGTpqMD/58 OpTjwrpxHtGYF7B9QqqL1y+mhX09KtFaF87J53s= X-Received: by 2002:a05:6a00:23d5:b0:641:39cb:1716 with SMTP id g21-20020a056a0023d500b0064139cb1716mr17151386pfc.20.1684850028546; Tue, 23 May 2023 06:53:48 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:c13a:d73:4f88:3654]) by smtp.gmail.com with ESMTPSA id b8-20020aa78708000000b0064d27a28451sm5796111pfo.100.2023.05.23.06.53.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 06:53:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 30/52] tcg: Remove NO_CPU_IO_DEFS Date: Tue, 23 May 2023 06:53:00 -0700 Message-Id: <20230523135322.678948-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230523135322.678948-1-richard.henderson@linaro.org> References: <20230523135322.678948-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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 >From this remove, it's no longer clear what this is attempting to protect. The last time a use of this define was added to the source tree, as opposed to merely moved around, was 2008. There have been many cleanups since that time and this is no longer required for the build to succeed. Signed-off-by: Richard Henderson --- target/ppc/cpu.h | 2 -- target/sparc/cpu.h | 2 -- accel/tcg/translate-all.c | 1 - tcg/tcg.c | 6 ------ 4 files changed, 11 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 0f9f2e1a0c..10c4ffa148 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1394,7 +1394,6 @@ void ppc_store_msr(CPUPPCState *env, target_ulong value); void ppc_cpu_list(void); /* Time-base and decrementer management */ -#ifndef NO_CPU_IO_DEFS uint64_t cpu_ppc_load_tbl(CPUPPCState *env); uint32_t cpu_ppc_load_tbu(CPUPPCState *env); void cpu_ppc_store_tbu(CPUPPCState *env, uint32_t value); @@ -1435,7 +1434,6 @@ int ppcemb_tlb_check(CPUPPCState *env, ppcemb_tlb_t *tlb, hwaddr booke206_tlb_to_page_size(CPUPPCState *env, ppcmas_tlb_t *tlb); #endif -#endif void ppc_store_fpscr(CPUPPCState *env, target_ulong val); void helper_hfscr_facility_check(CPUPPCState *env, uint32_t bit, diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index fb98843dad..3d090e8278 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -581,7 +581,6 @@ G_NORETURN void sparc_cpu_do_unaligned_access(CPUState *cpu, vaddr addr, uintptr_t retaddr); G_NORETURN void cpu_raise_exception_ra(CPUSPARCState *, int, uintptr_t); -#ifndef NO_CPU_IO_DEFS /* cpu_init.c */ void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu); void sparc_cpu_list(void); @@ -637,7 +636,6 @@ static inline int tlb_compare_context(const SparcTLBEntry *tlb, return compare_masked(context, tlb->tag, MMU_CONTEXT_MASK); } -#endif #endif /* cpu-exec.c */ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 181f276b18..347768b979 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" -#define NO_CPU_IO_DEFS #include "trace.h" #include "disas/disas.h" #include "exec/exec-all.h" diff --git a/tcg/tcg.c b/tcg/tcg.c index 3888a22ba1..a976e851d5 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -37,12 +37,6 @@ #include "qemu/cacheflush.h" #include "qemu/cacheinfo.h" #include "qemu/timer.h" - -/* Note: the long term plan is to reduce the dependencies on the QEMU - CPU definitions. Currently they are used for qemu_ld/st - instructions */ -#define NO_CPU_IO_DEFS - #include "exec/exec-all.h" #include "exec/tlb-common.h" #include "tcg/tcg-op-common.h"