diff options
| author | Anton Johansson <anjo@rev.ng> | 2024-01-19 15:39:56 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-01-29 07:06:03 +1000 |
| commit | c4b3f46c15153308054703c7b0053f2bad26242d (patch) | |
| tree | 755cf303a89c4cd39f8f3831b492afa889115bbf /include/exec/cpu-common.h | |
| parent | d157e540edc2dbc30b66c26d8378c724ffcac8d0 (diff) | |
| download | qemu-c4b3f46c15153308054703c7b0053f2bad26242d.zip qemu-c4b3f46c15153308054703c7b0053f2bad26242d.tar.gz qemu-c4b3f46c15153308054703c7b0053f2bad26242d.tar.bz2 | |
include/exec: Move vaddr defines to separate file
Needed to work around circular includes. vaddr is currently defined in
cpu-common.h and needed by hw/core/cpu.h, but cpu-common.h also need
cpu.h to know the size of the CPUState.
[Maybe we can instead move parts of cpu-common.h w. hw/core/cpu.h to
sort out the circular inclusion.]
Signed-off-by: Anton Johansson <anjo@rev.ng>
Message-Id: <20240119144024.14289-7-anjo@rev.ng>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
[rth: Add include of vaddr.h into cpu-common.h]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'include/exec/cpu-common.h')
| -rw-r--r-- | include/exec/cpu-common.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index fef3138..3109c6b 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -3,6 +3,7 @@ /* CPU interfaces that are target independent. */ +#include "exec/vaddr.h" #ifndef CONFIG_USER_ONLY #include "exec/hwaddr.h" #endif @@ -14,18 +15,6 @@ #define EXCP_YIELD 0x10004 /* cpu wants to yield timeslice to another */ #define EXCP_ATOMIC 0x10005 /* stop-the-world and emulate atomic */ -/** - * vaddr: - * Type wide enough to contain any #target_ulong virtual address. - */ -typedef uint64_t vaddr; -#define VADDR_PRId PRId64 -#define VADDR_PRIu PRIu64 -#define VADDR_PRIo PRIo64 -#define VADDR_PRIx PRIx64 -#define VADDR_PRIX PRIX64 -#define VADDR_MAX UINT64_MAX - void cpu_exec_init_all(void); void cpu_exec_step_atomic(CPUState *cpu); |