From patchwork Wed Feb 10 22:10:42 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: 380255 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp1568137jah; Wed, 10 Feb 2021 14:36:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDPGNp4ZE5y/juVImUspdc2e8N4+zexqlxz8rTuQshZA0tP/aoD7XIE44nNNa+d1dFhdOd X-Received: by 2002:a25:6110:: with SMTP id v16mr7552355ybb.435.1612996591695; Wed, 10 Feb 2021 14:36:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612996591; cv=none; d=google.com; s=arc-20160816; b=eGravqfFjSBxlq69xA3FGWH+corLadXYh5eG7bxHx8ZyGUWyo+SvVaxZhbubtupsia ZulBkWgmcM03+2zchBmfpLJc9nViEDVU13diByXzlnY9O0ZQ1mA5yuG8JTJLvolv/ctG P5xsFIXWTwwwkZOT4r0fpo4TTqLkqX4t8CYs03ybSZ81X/NePEvu8TJ+rWxRBBwGMS+I XvfsUOdY1aBPF8rFUviFNOEbgWkRRuVMrtVYXRdhAGNdg8QLuIKoboTEQxKrdfo76cyQ ff3f25b0ki0+sRFhT3OlZoulJGG8tQHZkpaglJKnLFv4Wrjq/tqDuGIUEQ+KtbgqVURA Pmkw== 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=Edh2u0iWFLyAxZ4TZrNGtVngWGS/6wsGB/21/wljo0k=; b=v7MxJ3+OJUCjpvFVh0y1dwizGyijifnZTiVDCWlEkIQyNacYZey7Jy4pLqTKg0wQNV cLE6bGyrMvUdVGm5Dj4KOE4FWpt/98b2rCHPh2mGGl2vp6a5UkHctHNUbI8Xbs7nxOj5 Hs2BA5jXDkyd5zGYsacF+FAdARDVd0BjOrV4vn/r57SWHlCLrkZ80nHkXSL51iu8n0Fo U3Pupa+bjxi7Nkwc13X+sgTh14e9CD1kKEnCXJd0oHS8NowMUX4jOiEVwpnIwTodoN4Q yItHdrRMFVp/x8iImPBx0lwZBs2TpM9akTmTRrXgY/WJ+2DEhQiQ/bB2hGrYf6bWjdSo i6hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=df0Bh5pw; 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 w4si2873452ybg.438.2021.02.10.14.36.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Feb 2021 14:36:31 -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=df0Bh5pw; 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]:43792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9y62-0004HO-JS for patch@linaro.org; Wed, 10 Feb 2021 17:36:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9xhq-0006MY-Tg for qemu-devel@nongnu.org; Wed, 10 Feb 2021 17:11:30 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:55161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l9xhk-0003Lk-FR for qemu-devel@nongnu.org; Wed, 10 Feb 2021 17:11:29 -0500 Received: by mail-wm1-x332.google.com with SMTP id w4so3190221wmi.4 for ; Wed, 10 Feb 2021 14:11:23 -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=Edh2u0iWFLyAxZ4TZrNGtVngWGS/6wsGB/21/wljo0k=; b=df0Bh5pw9Vyy2xiLzgESsHspyCtuPFM2d3HHlu4sBF51fvrG5JMT0ki91+tuf0VaCF Z2kUWipMxrJI2xNrQiAxqxvVgAb3HW79cwcS7WwsnKUYOhYbYUoSO9ydIksv5dIJ4T+o e+iEZj+7/EzPHn3Ka4JEJyjtJ/yp8Il61LV8JwYKX48dRKyr/9/yB7aLZOhYfNQlSDpy ckMTEaY05UOylci54NU8G6j38wG7bpNIdQhITmVMCDoLwTJ8dDZSf5+JJw8cc7F8JnE0 3vap1HvwZ+xeFzWyOc5esv3jeeGuhqvSan+SwuR7kDXRWORQI8OuWpRAq9E1UCyyCRoL gnsQ== 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=Edh2u0iWFLyAxZ4TZrNGtVngWGS/6wsGB/21/wljo0k=; b=UQiTukGL8bd9/ODQOb1ZdH2vbRMnwN2r6J2w4hFjt4DXoVqbNOSzVZAqGdBHgaZcYa iR47f4nW5vLgoE8UfKTzujrQ0TEex5HQN1ZoArVTazELdr97sfxJ/sjc2bbr/3gcTx83 5ErFWD5Z0jGEM6T1cYP8Ln8OvCp29GAOIulsdVNrKmAOvFNa4kZK++Yag2CGxqaY9wsw 4VIqDYDkRVfjnmOtZ2P6ES0moc258cPSPa9P96/5aIsWKAwcUm2B9i4BrT+lrJXRFE5/ TkT/TUnstGhDDOw/TZ48xS1NtaMz188SK8VXdhPoInssNDSdo3f1R9mk9ksIFermf5r8 ohuA== X-Gm-Message-State: AOAM532YUtADjKSzaMPK6yUz/zSvQzhvrAdlIrlbSlF9pnZ6UWMW6Yx7 nnpFLZxCyDopZ1hUPXRZDNQQtQ== X-Received: by 2002:a1c:730f:: with SMTP id d15mr1145992wmb.135.1612995081262; Wed, 10 Feb 2021 14:11:21 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u206sm4998554wme.12.2021.02.10.14.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Feb 2021 14:11:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 87F3B1FF99; Wed, 10 Feb 2021 22:10:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/21] exec: Move TranslationBlock typedef to qemu/typedefs.h Date: Wed, 10 Feb 2021 22:10:42 +0000 Message-Id: <20210210221053.18050-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210210221053.18050-1-alex.bennee@linaro.org> References: <20210210221053.18050-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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: Peter Maydell , Eduardo Habkost , Anthony Green , Richard Henderson , Michael Walle , robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Paolo Bonzini , kuhn.chenqun@huawei.com, Guan Xuetao , =?utf-8?q?Alex_Benn=C3=A9e?= , "Edgar E. Iglesias" , "open list:ARM TCG CPUs" 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 Message-Id: <20210208233906.479571-2-richard.henderson@linaro.org> Message-Id: <20210209182749.31323-2-alex.bennee@linaro.org> --- include/exec/tb-context.h | 1 - include/hw/core/cpu.h | 4 +--- include/hw/core/tcg-cpu-ops.h | 3 +-- include/qemu/typedefs.h | 1 + target/arm/internals.h | 3 +-- target/cris/translate.c | 2 +- target/lm32/translate.c | 2 +- target/moxie/translate.c | 2 +- target/unicore32/translate.c | 2 +- 9 files changed, 8 insertions(+), 12 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé 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 448982dd2f..7d26ce0c9d 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -172,8 +172,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;