From 8b42704441865611a5ee241ac9fc5cabc47a079b Mon Sep 17 00:00:00 2001 From: Pavel Dovgalyuk Date: Thu, 17 Sep 2015 19:24:05 +0300 Subject: cpu: replay instructions sequence This patch adds calls to replay functions into the icount setup block. In record mode number of executed instructions is written to the log. In replay mode number of istructions to execute is taken from the replay log. When replayed instructions counter is expired qemu_notify_event() function is called to wake up the iothread. Reviewed-by: Paolo Bonzini Signed-off-by: Pavel Dovgalyuk Message-Id: <20150917162405.8676.31890.stgit@PASHA-ISP.def.inno> Signed-off-by: Paolo Bonzini --- replay/replay.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'replay') diff --git a/replay/replay.c b/replay/replay.c index 62e8abaadf..b2c67501a5 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -13,6 +13,7 @@ #include "sysemu/replay.h" #include "replay-internal.h" #include "qemu/timer.h" +#include "qemu/main-loop.h" ReplayMode replay_mode = REPLAY_MODE_NONE; @@ -45,3 +46,36 @@ uint64_t replay_get_current_step(void) { return cpu_get_icount_raw(); } + +int replay_get_instructions(void) +{ + int res = 0; + replay_mutex_lock(); + if (replay_next_event_is(EVENT_INSTRUCTION)) { + res = replay_state.instructions_count; + } + replay_mutex_unlock(); + return res; +} + +void replay_account_executed_instructions(void) +{ + if (replay_mode == REPLAY_MODE_PLAY) { + replay_mutex_lock(); + if (replay_state.instructions_count > 0) { + int count = (int)(replay_get_current_step() + - replay_state.current_step); + replay_state.instructions_count -= count; + replay_state.current_step += count; + if (replay_state.instructions_count == 0) { + assert(replay_data_kind == EVENT_INSTRUCTION); + replay_finish_event(); + /* Wake up iothread. This is required because + timers will not expire until clock counters + will be read from the log. */ + qemu_notify_event(); + } + } + replay_mutex_unlock(); + } +} -- cgit v1.2.1