diff options
| author | Claudio Fontana <cfontana@suse.de> | 2020-08-19 13:17:19 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-05 16:41:22 +0200 |
| commit | 740b175973427bcfa32ad894bb1f83b96d184c28 (patch) | |
| tree | 3613e83be5fd8620b369479b98e6ede5d5746a9a /target/alpha | |
| parent | 0ac0b47c44b4be6cbce26777a1a5968cc8f025a5 (diff) | |
| download | qemu-740b175973427bcfa32ad894bb1f83b96d184c28.zip qemu-740b175973427bcfa32ad894bb1f83b96d184c28.tar.gz qemu-740b175973427bcfa32ad894bb1f83b96d184c28.tar.bz2 | |
cpu-timers, icount: new modules
refactoring of cpus.c continues with cpu timer state extraction.
cpu-timers: responsible for the softmmu cpu timers state,
including cpu clocks and ticks.
icount: counts the TCG instructions executed. As such it is specific to
the TCG accelerator. Therefore, it is built only under CONFIG_TCG.
One complication is due to qtest, which uses an icount field to warp time
as part of qtest (qtest_clock_warp).
In order to solve this problem, provide a separate counter for qtest.
This requires fixing assumptions scattered in the code that
qtest_enabled() implies icount_enabled(), checking each specific case.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
[remove redundant initialization with qemu_spice_init]
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
[fix lingering calls to icount_get]
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target/alpha')
| -rw-r--r-- | target/alpha/translate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 8870284..36be602 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "sysemu/cpus.h" +#include "sysemu/cpu-timers.h" #include "disas/disas.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" @@ -1329,7 +1330,7 @@ static DisasJumpType gen_mfpr(DisasContext *ctx, TCGv va, int regno) case 249: /* VMTIME */ helper = gen_helper_get_vmtime; do_helper: - if (use_icount) { + if (icount_enabled()) { gen_io_start(); helper(va); return DISAS_PC_STALE; |