helper_lookup_tb_ptr is implemented in cpu-exec.c. Move its DEF_HELPER line to cpu-exec.h and emit helper_info_lookup_tb_ptr from that file.
Signed-off-by: Yonggang Luo <[email protected]> --- accel/tcg/cpu-exec.c | 5 +++++ accel/tcg/cpu-exec.h | 1 + accel/tcg/tcg-runtime.h | 2 -- include/exec/helper-gen-common.h | 4 ++++ include/exec/helper-proto-common.h | 4 ++++ 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 accel/tcg/cpu-exec.h diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 5b4bca5084f..021912dc022 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -40,6 +40,11 @@ #include "exec/replay-core.h" #include "system/tcg.h" #include "exec/helper-proto-common.h" + +#define HELPER_H "accel/tcg/cpu-exec.h" +#include "exec/helper-info.c.inc" +#undef HELPER_H + #include "tcg-accel-ops.h" #include "tb-jmp-cache.h" #include "tb-hash.h" diff --git a/accel/tcg/cpu-exec.h b/accel/tcg/cpu-exec.h new file mode 100644 index 00000000000..e4803ebc1a6 --- /dev/null +++ b/accel/tcg/cpu-exec.h @@ -0,0 +1 @@ +DEF_HELPER_FLAGS_1(lookup_tb_ptr, TCG_CALL_NO_WG_SE, cptr, env) diff --git a/accel/tcg/tcg-runtime.h b/accel/tcg/tcg-runtime.h index c0626fa0e02..26e0baeca51 100644 --- a/accel/tcg/tcg-runtime.h +++ b/accel/tcg/tcg-runtime.h @@ -20,8 +20,6 @@ DEF_HELPER_FLAGS_1(clrsb_i64, TCG_CALL_NO_RWG_SE, i64, i64) DEF_HELPER_FLAGS_1(ctpop_i32, TCG_CALL_NO_RWG_SE, i32, i32) DEF_HELPER_FLAGS_1(ctpop_i64, TCG_CALL_NO_RWG_SE, i64, i64) -DEF_HELPER_FLAGS_1(lookup_tb_ptr, TCG_CALL_NO_WG_SE, cptr, env) - #ifndef IN_HELPER_PROTO /* * Pass calls to memset directly to libc, without a thunk in qemu. diff --git a/include/exec/helper-gen-common.h b/include/exec/helper-gen-common.h index fa571d88147..73e979a35f3 100644 --- a/include/exec/helper-gen-common.h +++ b/include/exec/helper-gen-common.h @@ -11,6 +11,10 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H +#define HELPER_H "accel/tcg/cpu-exec.h" +#include "exec/helper-gen.h.inc" +#undef HELPER_H + #define HELPER_H "accel/tcg/tcg-runtime.h" #include "exec/helper-gen.h.inc" #undef HELPER_H diff --git a/include/exec/helper-proto-common.h b/include/exec/helper-proto-common.h index 1b098777e8d..3c32f95f4c1 100644 --- a/include/exec/helper-proto-common.h +++ b/include/exec/helper-proto-common.h @@ -13,6 +13,10 @@ #include "exec/helper-proto.h.inc" #undef HELPER_H +#define HELPER_H "accel/tcg/cpu-exec.h" +#include "exec/helper-proto.h.inc" +#undef HELPER_H + #define HELPER_H "accel/tcg/tcg-runtime.h" #include "exec/helper-proto.h.inc" #undef HELPER_H -- 2.52.0.windows.1
