On Wed, Dec 17, 2025 at 8:42 AM Philippe Mathieu-Daudé <[email protected]>
wrote:
> Both CPUHexagonState and TOTAL_PER_THREAD_REGS are defined
> in "cpu.h" which is luckily indirectly included. However when
> refactoring unrelated files we get:
>
> In file included from target/hexagon/helper.h:18,
> from include/exec/helper-proto.h.inc:56,
> from include/exec/helper-proto.h:13,
> from target/hexagon/op_helper.c:22:
> target/hexagon/internal.h: At top level:
> target/hexagon/internal.h:29:25: error: unknown type name
> ‘CPUHexagonState’; did you mean ‘CPUPluginState’?
> 29 | void hexagon_debug_vreg(CPUHexagonState *env, int regnum);
> | ^~~~~~~~~~~~~~~
> | CPUPluginState
> target/hexagon/internal.h:30:25: error: unknown type name
> ‘CPUHexagonState’; did you mean ‘CPUPluginState’?
> 30 | void hexagon_debug_qreg(CPUHexagonState *env, int regnum);
> | ^~~~~~~~~~~~~~~
> | CPUPluginState
> target/hexagon/internal.h:31:20: error: unknown type name
> ‘CPUHexagonState’; did you mean ‘CPUPluginState’?
> 31 | void hexagon_debug(CPUHexagonState *env);
> | ^~~~~~~~~~~~~~~
> | CPUPluginState
> target/hexagon/internal.h:33:44: error: ‘TOTAL_PER_THREAD_REGS’
> undeclared here (not in a function)
> 33 | extern const char * const
> hexagon_regnames[TOTAL_PER_THREAD_REGS];
> | ^~~~~~~~~~~~~~~~~~~~~
>
> Fix that by including the missing header.
>
> We don't need the "qemu/log.h" since commit 0cb73cb5a02 ("target/hexagon:
> Remove HEX_DEBUG/HEX_DEBUG_LOG"): remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
> ---
> target/hexagon/internal.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>
Reviewed-by: Brian Cain <[email protected]>
> diff --git a/target/hexagon/internal.h b/target/hexagon/internal.h
> index 32e96f00d97..5fc837ae229 100644
> --- a/target/hexagon/internal.h
> +++ b/target/hexagon/internal.h
> @@ -18,7 +18,7 @@
> #ifndef HEXAGON_INTERNAL_H
> #define HEXAGON_INTERNAL_H
>
> -#include "qemu/log.h"
> +#include "target/hexagon/cpu.h"
>
> int hexagon_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
> int hexagon_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
> --
> 2.52.0
>
>
