From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Eduardo Habkost" <ehabkost@redhat.com>,
"Anthony Green" <green@moxielogic.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
qemu-devel@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Michael Walle" <michael@walle.cc>,
"open list:ARM TCG CPUs" <qemu-arm@nongnu.org>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Guan Xuetao" <gxt@mprc.pku.edu.cn>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 10/23] exec: Move TranslationBlock typedef to qemu/typedefs.h
Date: Thu, 18 Feb 2021 09:46:53 +0000 [thread overview]
Message-ID: <20210218094706.23038-11-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210218094706.23038-1-alex.bennee@linaro.org>
From: Richard Henderson <richard.henderson@linaro.org>
This also means we don't need an extra declaration of
the structure in hw/core/cpu.h.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210208233906.479571-2-richard.henderson@linaro.org>
Message-Id: <20210213130325.14781-11-alex.bennee@linaro.org>
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;
--
2.20.1
next prev parent reply other threads:[~2021-02-18 9:49 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 9:46 [PULL 00/23] plugin updates (hwprofile, CF_NOCACHE, io_recompile) Alex Bennée
2021-02-18 9:46 ` [PULL 01/23] hw/virtio/pci: include vdev name in registered PCI sections Alex Bennée
2021-02-18 9:46 ` [PULL 02/23] plugins: add API to return a name for a IO device Alex Bennée
2021-02-18 9:46 ` [PULL 03/23] plugins: new hwprofile plugin Alex Bennée
2021-02-18 9:46 ` [PULL 04/23] contrib: Don't use '#' flag of printf format Alex Bennée
2021-02-18 9:46 ` [PULL 05/23] contrib: Fix some code style problems, ERROR: "foo * bar" should be "foo *bar" Alex Bennée
2021-02-18 9:46 ` [PULL 06/23] contrib: Add spaces around operator Alex Bennée
2021-02-18 9:46 ` [PULL 07/23] contrib: space required after that ',' Alex Bennée
2021-02-18 9:46 ` [PULL 08/23] contrib: Open brace '{' following struct go on the same line Alex Bennée
2021-02-18 9:46 ` [PULL 09/23] accel/tcg/plugin-gen: fix the call signature for inline callbacks Alex Bennée
2021-02-18 9:46 ` Alex Bennée [this message]
2021-02-18 9:46 ` [PULL 11/23] accel/tcg: Create io_recompile_replay_branch hook Alex Bennée
2021-02-18 9:46 ` [PULL 12/23] target/mips: Create mips_io_recompile_replay_branch Alex Bennée
2021-02-18 9:46 ` [PULL 13/23] target/sh4: Create superh_io_recompile_replay_branch Alex Bennée
2021-02-18 9:46 ` [PULL 14/23] tests/plugin: expand insn test to detect duplicate instructions Alex Bennée
2021-02-18 9:46 ` [PULL 15/23] tests/acceptance: add a new set of tests to exercise plugins Alex Bennée
2021-02-18 9:46 ` [PULL 16/23] accel/tcg: actually cache our partial icount TB Alex Bennée
2021-02-18 9:47 ` [PULL 17/23] accel/tcg: cache single instruction TB on pending replay exception Alex Bennée
2021-02-18 9:47 ` [PULL 18/23] accel/tcg: re-factor non-RAM execution code Alex Bennée
2021-04-15 13:18 ` Peter Maydell
2021-04-15 13:37 ` Peter Maydell
2021-04-15 14:31 ` Alex Bennée
2021-04-15 14:54 ` Peter Maydell
2021-04-15 15:55 ` Philippe Mathieu-Daudé
2021-04-15 17:18 ` [EXTERNAL] " Cédric Le Goater
2021-04-15 17:34 ` Peter Maydell
2021-04-16 7:55 ` Cédric Le Goater
2021-04-16 9:14 ` Alex Bennée
2021-04-16 10:14 ` Cédric Le Goater
2021-02-18 9:47 ` [PULL 19/23] accel/tcg: remove CF_NOCACHE and special cases Alex Bennée
2021-02-18 9:47 ` [PULL 20/23] accel/tcg: allow plugin instrumentation to be disable via cflags Alex Bennée
2021-02-18 9:47 ` [PULL 21/23] tests/acceptance: add a new tests to detect counting errors Alex Bennée
2021-02-18 9:47 ` [PULL 22/23] tests/plugin: allow memory plugin to do both inline and callbacks Alex Bennée
2021-02-18 9:47 ` [PULL 23/23] tests/acceptance: add a memory callback check Alex Bennée
2021-02-18 15:13 ` [PULL 00/23] plugin updates (hwprofile, CF_NOCACHE, io_recompile) Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210218094706.23038-11-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=edgar.iglesias@gmail.com \
--cc=ehabkost@redhat.com \
--cc=f4bug@amsat.org \
--cc=green@moxielogic.com \
--cc=gxt@mprc.pku.edu.cn \
--cc=michael@walle.cc \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).