Skip to content

Commit

Permalink
accel/tcg: Keep TranslationBlock headers local to TCG
Browse files Browse the repository at this point in the history
Only the TCG accelerator uses the TranslationBlock API.
Move the tb-context.h / tb-hash.h / tb-lookup.h from the
global namespace to the TCG one (in accel/tcg).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210524170453.3791436-3-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
philmd authored and rth7680 committed May 26, 2021
1 parent 824f4ba commit e5ceadf
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 9 deletions.
1 change: 0 additions & 1 deletion MAINTAINERS
Expand Up @@ -128,7 +128,6 @@ F: docs/devel/decodetree.rst
F: include/exec/cpu*.h
F: include/exec/exec-all.h
F: include/exec/helper*.h
F: include/exec/tb-hash.h
F: include/sysemu/cpus.h
F: include/sysemu/tcg.h
F: include/hw/core/tcg-cpu-ops.h
Expand Down
6 changes: 3 additions & 3 deletions accel/tcg/cpu-exec.c
Expand Up @@ -29,9 +29,6 @@
#include "qemu/compiler.h"
#include "qemu/timer.h"
#include "qemu/rcu.h"
#include "exec/tb-hash.h"
#include "exec/tb-lookup.h"
#include "exec/tb-context.h"
#include "exec/log.h"
#include "qemu/main-loop.h"
#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY)
Expand All @@ -41,6 +38,9 @@
#include "exec/cpu-all.h"
#include "sysemu/cpu-timers.h"
#include "sysemu/replay.h"
#include "tb-hash.h"
#include "tb-lookup.h"
#include "tb-context.h"
#include "internal.h"

/* -icount align implementation. */
Expand Down
2 changes: 1 addition & 1 deletion accel/tcg/cputlb.c
Expand Up @@ -24,7 +24,6 @@
#include "exec/memory.h"
#include "exec/cpu_ldst.h"
#include "exec/cputlb.h"
#include "exec/tb-hash.h"
#include "exec/memory-internal.h"
#include "exec/ram_addr.h"
#include "tcg/tcg.h"
Expand All @@ -36,6 +35,7 @@
#include "exec/translate-all.h"
#include "trace/trace-root.h"
#include "trace/mem.h"
#include "tb-hash.h"
#include "internal.h"
#ifdef CONFIG_PLUGIN
#include "qemu/plugin-memory.h"
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion include/exec/tb-lookup.h → accel/tcg/tb-lookup.h
Expand Up @@ -14,7 +14,7 @@
#endif

#include "exec/exec-all.h"
#include "exec/tb-hash.h"
#include "tb-hash.h"

/* Might cause an exception, so have a longjmp destination ready */
static inline TranslationBlock *tb_lookup(CPUState *cpu, target_ulong pc,
Expand Down
2 changes: 1 addition & 1 deletion accel/tcg/tcg-runtime.c
Expand Up @@ -30,7 +30,7 @@
#include "disas/disas.h"
#include "exec/log.h"
#include "tcg/tcg.h"
#include "exec/tb-lookup.h"
#include "tb-lookup.h"

/* 32-bit helpers */

Expand Down
4 changes: 2 additions & 2 deletions accel/tcg/translate-all.c
Expand Up @@ -47,8 +47,6 @@
#endif

#include "exec/cputlb.h"
#include "exec/tb-hash.h"
#include "exec/tb-context.h"
#include "exec/translate-all.h"
#include "qemu/bitmap.h"
#include "qemu/error-report.h"
Expand All @@ -61,6 +59,8 @@
#include "sysemu/tcg.h"
#include "qapi/error.h"
#include "hw/core/tcg-cpu-ops.h"
#include "tb-hash.h"
#include "tb-context.h"
#include "internal.h"

/* #define DEBUG_TB_INVALIDATE */
Expand Down

0 comments on commit e5ceadf

Please sign in to comment.