From patchwork Wed May 3 07:23:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678763 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp915268wrs; Wed, 3 May 2023 00:44:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6zBIp9hyz/myiptVrUL9jGG0t3k4LRbLquW/pXp7zvkliodPML1pT1Ub52POF7nlA7P7Xt X-Received: by 2002:a05:622a:1195:b0:3f2:664:d14a with SMTP id m21-20020a05622a119500b003f20664d14amr27416537qtk.46.1683099886808; Wed, 03 May 2023 00:44:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683099886; cv=none; d=google.com; s=arc-20160816; b=fEPvDR9mSGXcMzDgdJg0cvTyRmG/EaZqLc5Jpl/w3tQTV3rjgb9xe+RuSSxPsYue1Q T3uyQbadAapxJxXQ+kn65t7aM/VmTWaIBPs8qX/CbGRiuqsIugl4lV8BNgNY0W8VWxAI 1X6aCISnrv47zHOHwOecHVUA32ZJh745mmrC5k4gJPohFSBq/xrNWHoR1qDl2trZ3GK2 8RZYzS4uj/gqIJV9HzelsQzsW03rf3mAg8Qp21CugUQQvif4VrM/mwtgsTxHQJ6QQX9t rgGltf6NPU+fEnKojLAkSKZuKljxNEzGfgC1CB+ehtlrsXDyw+qXMllusSP/qwGK8yS0 ojGQ== 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=AOi9gtk6KXDfIe8VH2DgkX1Z9AQ37ZzD4xifhpb6EwU=; b=zv93fwE/Rp0/byipDy4mJCn94isdPTe/9CeHKRpn+08qWnSPlsu22/WL7qfeMImHGd /nFAjxucS7ZBKH6xJDx/XoXALZkEJiRSc5/rbkDF4U1oIxv3siGmx6BPXmwoONTzyfT/ i2/ISDN4XQ55od/8r5DH3qtEK6WKbxVqbgRAcwgjYOBfE7m+xtoSxj0G10tafSf0L8LF DuqqUkG50P8hGahjTsMvF3QZ6Lj5bwwB0rT/bObxJPXWKA4XMkbv7l2UPlcUZDDBjb8o UGjRImlpikRlGo6jYjv2uvzlleIZ74B6Fo2QIRCpxelzjajN7CzKez7F7S24TvyMvuMq kVig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J6HJnOOo; 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 h13-20020ac85e0d000000b003ef583c731csi16915260qtx.279.2023.05.03.00.44.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2023 00:44:46 -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=J6HJnOOo; 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 1pu6tm-0005JC-W5; Wed, 03 May 2023 03:27: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 1pu6tS-0004PW-UQ for qemu-devel@nongnu.org; Wed, 03 May 2023 03:27:19 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pu6tR-0005bn-0l for qemu-devel@nongnu.org; Wed, 03 May 2023 03:27:18 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3063b5f32aaso872635f8f.2 for ; Wed, 03 May 2023 00:27:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683098836; x=1685690836; 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=AOi9gtk6KXDfIe8VH2DgkX1Z9AQ37ZzD4xifhpb6EwU=; b=J6HJnOOo0q/QMg/M7h0v/Qe8Efq7O0WqJ6yPo5Q4tPZaQIf/kvogPtcmAU8YES8x6a 1xQuWKzkvWv04wwxbqEPfFCL1PTn6dvRT+6kTHKY5I3FcYcSKGvnGmsjvkTFyXIRj0lk ZzZNDJqx+bW7GCccPpzasTFEDJ9sFwlgAwfP7y0pQ6jzWb1tUJt4tJxibRXxJ68GDvhm wa+P+b4iCkaBSYWikPelWWUtf0njbF8D2RmdHMM7lCeDghZNo3Nw2LxEBLynBSxsVHEa VMeA9uPnEM7idHxzaTqdrzuyHvzclpdTl13REU44T9KQR9O7CxNfZNKPib0V0bLvGJsI G5qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683098836; x=1685690836; 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=AOi9gtk6KXDfIe8VH2DgkX1Z9AQ37ZzD4xifhpb6EwU=; b=awEQrIyvd4SS4vtojgcg/R2lcY7Be/6hYs8epCuAkCxWMke7oa0v7ToJZf71uyOPgf Z+p6CPlDhkSphNBCPwWWndXDvJIo/WVe+VdW1dEBmVDRAd52DF3n7iYj5zZNgUzucZq+ Lp9D2rwSXFLJ9meiXXYCMWK53tNBBtmmDLVduip9i3Q/SYK7D8ZWBbh3iUzdEsKQGfK6 lj8SxJzohu0uCxPetPAQrLsVZj0/AfP9zEIEQH0Vwd7vUWfVYIcHk6UWBiHeuTGvXQZA v4BK6DdeY7MLrqAc7kKtQ8W8LdFSIjtMw4XgPifPd7YSyJnnLW4wIeRGnR/q5vvqV+IL 77UQ== X-Gm-Message-State: AC+VfDzRxiLYr11KC3z7Gu6kQOKSYf1TWb+peqFcWeTZUthNNESt2l7A bREAmULUmFjEKPORO0M8xRKP3oYqI1mFHEVMfvEPHg== X-Received: by 2002:adf:f984:0:b0:306:2b83:2d32 with SMTP id f4-20020adff984000000b003062b832d32mr7535402wrr.43.1683098836061; Wed, 03 May 2023 00:27:16 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:c01d:9d74:b630:9087]) by smtp.gmail.com with ESMTPSA id t4-20020a7bc3c4000000b003f1745c7df3sm974315wmj.23.2023.05.03.00.27.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 00:27:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: ale@rev.ng, philmd@linaro.org, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, anjo@rev.ng Subject: [PATCH 58/84] tcg: Remove NO_CPU_IO_DEFS Date: Wed, 3 May 2023 08:23:05 +0100 Message-Id: <20230503072331.1747057-59-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503072331.1747057-1-richard.henderson@linaro.org> References: <20230503072331.1747057-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x430.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 557d736dab..395b1c1cdf 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1395,7 +1395,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); @@ -1436,7 +1435,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 53540e4237..916c143323 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"