Signed-off-by: Mihail Abakumov <mikhail.abaku...@ispras.ru> Signed-off-by: Pavel Dovgalyuk <dovga...@ispras.ru> Signed-off-by: Dmitriy Koltunov <koltu...@ispras.ru> --- include/exec/windbgstub-utils.h | 1 + windbgstub-utils.c | 15 +++++++++++++++ windbgstub.c | 5 +++++ 3 files changed, 21 insertions(+)
diff --git a/include/exec/windbgstub-utils.h b/include/exec/windbgstub-utils.h index 3d062ab9bb..f6a60292a2 100755 --- a/include/exec/windbgstub-utils.h +++ b/include/exec/windbgstub-utils.h @@ -108,6 +108,7 @@ void kd_api_get_context(CPUState *cpu, PacketData *pd); void kd_api_set_context(CPUState *cpu, PacketData *pd); void kd_api_write_breakpoint(CPUState *cpu, PacketData *pd); void kd_api_restore_breakpoint(CPUState *cpu, PacketData *pd); +void kd_api_continue(CPUState *cpu, PacketData *pd); void kd_api_read_control_space(CPUState *cpu, PacketData *pd); void kd_api_write_control_space(CPUState *cpu, PacketData *pd); void kd_api_unsupported(CPUState *cpu, PacketData *pd); diff --git a/windbgstub-utils.c b/windbgstub-utils.c index c5d24c5d8e..8d5136f310 100755 --- a/windbgstub-utils.c +++ b/windbgstub-utils.c @@ -10,6 +10,7 @@ */ #include "exec/windbgstub-utils.h" +#include "sysemu/sysemu.h" #define IS_LOCAL_BP_ENABLED(dr7, index) (((dr7) >> ((index) * 2)) & 1) @@ -1029,6 +1030,20 @@ void kd_api_restore_breakpoint(CPUState *cpu, PacketData *pd) } } +void kd_api_continue(CPUState *cpu, PacketData *pd) +{ + uint32_t status = ldl_p(&pd->m64.u.Continue2.ContinueStatus); + uint32_t trace = ldl_p(&pd->m64.u.Continue2.ControlSet.TraceFlag); + int ssFlag = trace ? SSTEP_ENABLE | SSTEP_NOIRQ | SSTEP_NOTIMER : 0; + + if (NT_SUCCESS(status)) { + cpu_single_step(cpu, ssFlag); + if (!runstate_needs_reset()) { + vm_start(); + } + } +} + void kd_api_read_control_space(CPUState *cpu, PacketData *pd) { DBGKD_READ_MEMORY64 *mem = &pd->m64.u.ReadMemory; diff --git a/windbgstub.c b/windbgstub.c index 54564962a5..19a4f0184b 100755 --- a/windbgstub.c +++ b/windbgstub.c @@ -161,6 +161,11 @@ static void windbg_process_manipulate_packet(ParsingContext *ctx) kd_api_restore_breakpoint(cpu, &ctx->data); break; + case DbgKdContinueApi: + case DbgKdContinueApi2: + kd_api_continue(cpu, &ctx->data); + return; + case DbgKdReadControlSpaceApi: kd_api_read_control_space(cpu, &ctx->data); break;