From patchwork Thu Feb 18 09:46:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 384362 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp3526041jao; Thu, 18 Feb 2021 01:48:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJzPLnIQBniGljovEnJfXJRLNuS7UwPhGwoXWc//uDhcz9D7F25J+nSOLOSDO5RRt235g9CN X-Received: by 2002:a05:6902:6af:: with SMTP id j15mr5618747ybt.229.1613641729697; Thu, 18 Feb 2021 01:48:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613641729; cv=none; d=google.com; s=arc-20160816; b=jYD75f4DhqEZ8/ZqURij3w2zFimwH7nK08jZ7ZIOpc3Wv9n/vmQe/2ZNGLPaOM3dR3 V8c6ksLEiEZwudXP5j1JoDB38a8H+wA+FPHbCPx8UdU7R3ckTkEgv6bEiigFCKRDSEzD NWzaAdnxd5Q9Nvwyccsl0KHICC0V+/57qiE05twP4Eq8fUta8FTDabgiY97F34Iv+ZgJ QzG4fWwrXHl/NA4sUHMbOyujvAhBbol6XPeW7yFnk6o8qrdb3nvhSsi3tRkBi07VcUAt DEFhgA0FUD5W/AI+4TU37gwZ23YRLqLznvm/wD8Mot4D0KtME++hZlfxwNx77xZDNr8/ 7Nrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=yOsJFfZzo2g8QQglvZg2aAHRWN3H1uP8oT2x1qASVNE=; b=l2BzDUP7GRE66GjzRI+Vb80WGnkIDWf08WEMTqlORDxEeKTNUkZmWxXRvdZO8eBhGY LgR1hayPus7gci/daydpxzXAFGbPjCYNFkSCoNoriZwzEechA+zveFcDE/JfbbFt+Iht HUh7gmFbhl16gnEhVjLO5b8hbLhom/ViM5HAbHiBE78VZelAWvcyS+rXkI40yBpTPePk c52uFNo3Ia4dE8CpUv/VIYwmHkodnPehocqq77QIJMMdC4iWpnioI75hGkBU0VxdhTnT 5uNXFv7Rf00DSBnEK/8/FMPF7giKOT+7NeD8gpdf/UW1sCskxb57PNizaOD1opPQQVnT JG1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HQMZlwm6; 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=fail (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 j4si4892445ybc.203.2021.02.18.01.48.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Feb 2021 01:48:49 -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=fail header.i=@linaro.org header.s=google header.b=HQMZlwm6; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCfvV-0006kV-3a for patch@linaro.org; Thu, 18 Feb 2021 04:48:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCfu5-0006gR-Gp for qemu-devel@nongnu.org; Thu, 18 Feb 2021 04:47:21 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:37237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCfu2-0007Ct-1c for qemu-devel@nongnu.org; Thu, 18 Feb 2021 04:47:21 -0500 Received: by mail-wm1-x331.google.com with SMTP id m1so2379405wml.2 for ; Thu, 18 Feb 2021 01:47:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yOsJFfZzo2g8QQglvZg2aAHRWN3H1uP8oT2x1qASVNE=; b=HQMZlwm6VlPmweczxQ7YB6RMh7HDoA6JEOsx/IYHO2KR15Ke/K8qptYHQEAO4OCmAe L/KHhpR7NyqlV3lzOIsFjqS00f71vdtixLxxoePbBNWG1lxnLjTVsQ8cJlC/Qyrdh3MX hCxXrW69hXTThbpU8J53vKJ7bs+LBP8nR+aANlEvIkeRtCH3wp2SwDydjRhFpLkbwOD1 03m3oyXTM9ZULyKxU6gU+6Z/0urP2lwZ8ahuan+6cJX7pbZtzUHsiI6alORbxB7+OXNZ oGoOU9mZ15ZC1FvkQVZH2D9yUca/O41WT2dd0sDjrc8RU4gKPhfov3A7YlbHJxHdeZO0 B6Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yOsJFfZzo2g8QQglvZg2aAHRWN3H1uP8oT2x1qASVNE=; b=Jb4SE8EFIWhLOaVHF47ea2WvxC20bvFtdQQX11+M3D7BsB4u4NstGcbUO7+8X6+DRS jiylk8umx7aOvpCjS5mUbzmTSLveXAfHIfTkjm6be2Es0f82pzJ41mQLXvtmjvWnYHLb ZpCiPM3orgDSW8kbe2yxrrCzq+n+MXQeqNswlLPP4bpbkO6VmRlgq+JHFr3g0dNdWNoY +feA2lJ4ZyOf07Dzu1f1Qblkm2u9vZO9vh6QBnDAzcDQ4rGR6IshO0MkdvfAcjI2w/+N DwBKobtOOvXOR3nwkXXdi6HhSCNEG6/hPBN0VkKsdbRTpUiWg5ew2X5RLvOYOEy5+T/M TQ9w== X-Gm-Message-State: AOAM5328bXJXF3h1fUI4ZEDf7eyP54ESeGFvoETkCX/TwZER455bejSA RI7G88HqfUPvPlVcdyfe5sPfsg== X-Received: by 2002:a1c:2d0b:: with SMTP id t11mr196370wmt.10.1613641636217; Thu, 18 Feb 2021 01:47:16 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 2sm8712698wre.24.2021.02.18.01.47.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 01:47:16 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DEFDE1FF99; Thu, 18 Feb 2021 09:47:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/23] exec: Move TranslationBlock typedef to qemu/typedefs.h Date: Thu, 18 Feb 2021 09:46:53 +0000 Message-Id: <20210218094706.23038-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210218094706.23038-1-alex.bennee@linaro.org> References: <20210218094706.23038-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Anthony Green , Richard Henderson , qemu-devel@nongnu.org, =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Michael Walle , "open list:ARM TCG CPUs" , "Edgar E. Iglesias" , Paolo Bonzini , Guan Xuetao , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This also means we don't need an extra declaration of the structure in hw/core/cpu.h. Signed-off-by: Richard Henderson Signed-off-by: Alex Bennée Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210208233906.479571-2-richard.henderson@linaro.org> Message-Id: <20210213130325.14781-11-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/exec/tb-context.h b/include/exec/tb-context.h index ec4c13b455..cc33979113 100644 --- a/include/exec/tb-context.h +++ b/include/exec/tb-context.h @@ -26,7 +26,6 @@ #define CODE_GEN_HTABLE_BITS 15 #define CODE_GEN_HTABLE_SIZE (1 << CODE_GEN_HTABLE_BITS) -typedef struct TranslationBlock TranslationBlock; typedef struct TBContext TBContext; struct TBContext { diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 38d813c389..c005d3dc2d 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -74,8 +74,6 @@ typedef enum MMUAccessType { typedef struct CPUWatchpoint CPUWatchpoint; -struct TranslationBlock; - /* see tcg-cpu-ops.h */ struct TCGCPUOps; @@ -375,7 +373,7 @@ struct CPUState { IcountDecr *icount_decr_ptr; /* Accessed in parallel; all accesses must be atomic */ - struct TranslationBlock *tb_jmp_cache[TB_JMP_CACHE_SIZE]; + TranslationBlock *tb_jmp_cache[TB_JMP_CACHE_SIZE]; struct GDBRegisterState *gdb_regs; int gdb_num_regs; diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h index ccc97d1894..ac3bb051f2 100644 --- a/include/hw/core/tcg-cpu-ops.h +++ b/include/hw/core/tcg-cpu-ops.h @@ -30,8 +30,7 @@ struct TCGCPUOps { * If more state needs to be restored, the target must implement a * function to restore all the state, and register it here. */ - void (*synchronize_from_tb)(CPUState *cpu, - const struct TranslationBlock *tb); + void (*synchronize_from_tb)(CPUState *cpu, const TranslationBlock *tb); /** @cpu_exec_enter: Callback for cpu_exec preparation */ void (*cpu_exec_enter)(CPUState *cpu); /** @cpu_exec_exit: Callback for cpu_exec cleanup */ diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index dc39b05c30..ee60eb3de4 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -120,6 +120,7 @@ typedef struct ReservedRegion ReservedRegion; typedef struct SavedIOTLB SavedIOTLB; typedef struct SHPCDevice SHPCDevice; typedef struct SSIBus SSIBus; +typedef struct TranslationBlock TranslationBlock; typedef struct VirtIODevice VirtIODevice; typedef struct Visitor Visitor; typedef struct VMChangeStateEntry VMChangeStateEntry; diff --git a/target/arm/internals.h b/target/arm/internals.h index c38d541017..05cebc8597 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -173,8 +173,7 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu); void arm_translate_init(void); #ifdef CONFIG_TCG -void arm_cpu_synchronize_from_tb(CPUState *cs, - const struct TranslationBlock *tb); +void arm_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb); #endif /* CONFIG_TCG */ diff --git a/target/cris/translate.c b/target/cris/translate.c index c893f877ab..65c168c0c7 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -132,7 +132,7 @@ typedef struct DisasContext { int delayed_branch; - struct TranslationBlock *tb; + TranslationBlock *tb; int singlestep_enabled; } DisasContext; diff --git a/target/lm32/translate.c b/target/lm32/translate.c index 030b232d66..20c70d03f1 100644 --- a/target/lm32/translate.c +++ b/target/lm32/translate.c @@ -93,7 +93,7 @@ typedef struct DisasContext { unsigned int tb_flags, synced_flags; /* tb dependent flags. */ int is_jmp; - struct TranslationBlock *tb; + TranslationBlock *tb; int singlestep_enabled; uint32_t features; diff --git a/target/moxie/translate.c b/target/moxie/translate.c index d5fb27dfb8..24a742b25e 100644 --- a/target/moxie/translate.c +++ b/target/moxie/translate.c @@ -36,7 +36,7 @@ /* This is the state at translation time. */ typedef struct DisasContext { - struct TranslationBlock *tb; + TranslationBlock *tb; target_ulong pc, saved_pc; uint32_t opcode; uint32_t fp_status; diff --git a/target/unicore32/translate.c b/target/unicore32/translate.c index 962f9877a0..370709c9ea 100644 --- a/target/unicore32/translate.c +++ b/target/unicore32/translate.c @@ -34,7 +34,7 @@ typedef struct DisasContext { int condjmp; /* The label that will be jumped to when the instruction is skipped. */ TCGLabel *condlabel; - struct TranslationBlock *tb; + TranslationBlock *tb; int singlestep_enabled; #ifndef CONFIG_USER_ONLY int user;