TARGET_INSN_START_WORDS is now only used within translate-all.c, move its declaration there. "tcg/insn-start-words.h" header being now empty, remove it.
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> --- include/tcg/insn-start-words.h | 13 ------------- accel/tcg/translate-all.c | 3 ++- target/i386/helper.c | 1 - target/openrisc/sys_helper.c | 1 - 4 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 include/tcg/insn-start-words.h diff --git a/include/tcg/insn-start-words.h b/include/tcg/insn-start-words.h deleted file mode 100644 index 394c191da8d..00000000000 --- a/include/tcg/insn-start-words.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* - * Define TARGET_INSN_START_WORDS - * Copyright (c) 2008 Fabrice Bellard - */ - -#ifndef TARGET_INSN_START_WORDS - -#include "cpu.h" - -# define TARGET_INSN_START_WORDS (1 + TARGET_INSN_START_EXTRA_WORDS) - -#endif /* TARGET_INSN_START_WORDS */ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 2f8cf6db144..fc55a75a3cf 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -65,11 +65,12 @@ #include "internal-common.h" #include "internal-target.h" #include "tcg/perf.h" -#include "tcg/insn-start-words.h" #include "tcg/tcg-op.h" TBContext tb_ctx; +#define TARGET_INSN_START_WORDS (1 + TARGET_INSN_START_EXTRA_WORDS) + /* * Encode VAL as a signed leb128 sequence at P. * Return P incremented past the encoded value. diff --git a/target/i386/helper.c b/target/i386/helper.c index 90e113c8b5a..1f819fbff65 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -30,7 +30,6 @@ #endif #include "qemu/log.h" #ifdef CONFIG_TCG -#include "tcg/insn-start-words.h" #include "tcg/tcg.h" #endif diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index cf521461954..9da2bebbd5b 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -27,7 +27,6 @@ #ifndef CONFIG_USER_ONLY #include "hw/boards.h" #endif -#include "tcg/insn-start-words.h" #include "tcg/tcg.h" #define TO_SPR(group, number) (((group) << 11) + (number)) -- 2.47.1
