SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

accel/tcg: Compile watchpoint.c once

Browse Source 
Move tb_check_watchpoint declaration from tb-internal.h, which is
still target-specific, to internal-common.h, which isn't.
Otherwise, all that is required to build watchpoint.c once is
to include the new exec/cpu-interrupt.h instead of exec/exec-all.h.

Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2025-03-06 18:58:53 -08:00
parent b9e3bf884a
commit 5469933810
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accel/tcg/internal-common.h
View File

@ -72,4 +72,6 @@ void tcg_exec_unrealizefn(CPUState *cpu);
/* current cflags for hashing/comparison */ /* current cflags for hashing/comparison */
uint32_t curr_cflags(CPUState *cpu); uint32_t curr_cflags(CPUState *cpu);
void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr);
#endif #endif

2
accel/tcg/meson.build
View File

@ -20,7 +20,6 @@ specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss)
specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
'cputlb.c', 'cputlb.c',
'watchpoint.c',
'tcg-accel-ops.c', 'tcg-accel-ops.c',
'tcg-accel-ops-mttcg.c', 'tcg-accel-ops-mttcg.c',
'tcg-accel-ops-icount.c', 'tcg-accel-ops-icount.c',
@ -30,4 +29,5 @@ specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
system_ss.add(when: ['CONFIG_TCG'], if_true: files( system_ss.add(when: ['CONFIG_TCG'], if_true: files(
'icount-common.c', 'icount-common.c',
'monitor.c', 'monitor.c',
'watchpoint.c',
)) ))

2
accel/tcg/tb-internal.h
View File

@ -75,6 +75,4 @@ void tb_invalidate_phys_range_fast(ram_addr_t ram_addr,
bool tb_invalidate_phys_page_unwind(tb_page_addr_t addr, uintptr_t pc); bool tb_invalidate_phys_page_unwind(tb_page_addr_t addr, uintptr_t pc);
void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr);
#endif #endif

5
accel/tcg/watchpoint.c
View File

@ -19,11 +19,10 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "qemu/error-report.h" #include "exec/breakpoint.h"
#include "exec/exec-all.h" #include "exec/cpu-interrupt.h"
#include "exec/page-protection.h" #include "exec/page-protection.h"
#include "exec/translation-block.h" #include "exec/translation-block.h"
#include "tb-internal.h"
#include "system/tcg.h" #include "system/tcg.h"
#include "system/replay.h" #include "system/replay.h"
#include "accel/tcg/cpu-ops.h" #include "accel/tcg/cpu-ops.h"