Signed-off-by: Mihail Abakumov <mikhail.abakumov@ispras.ru>
Signed-off-by: Pavel Dovgalyuk <dovgaluk@ispras.ru>
Signed-off-by: Dmitriy Koltunov <koltunov@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 8cea2afdf1..49b05226b3 100755
--- a/include/exec/windbgstub-utils.h
+++ b/include/exec/windbgstub-utils.h
@@ -99,6 +99,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 0f23f3c865..dce2b4ccde 100755
--- a/windbgstub-utils.c
+++ b/windbgstub-utils.c
@@ -10,6 +10,7 @@
*/
#include "exec/windbgstub-utils.h"
+#include "sysemu/sysemu.h"
static InitedAddr KPCR;
static InitedAddr version;
@@ -133,6 +134,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_unsupported(CPUState *cpu, PacketData *pd)
{
WINDBG_ERROR("Caught unimplemented api %s",
diff --git a/windbgstub.c b/windbgstub.c
index b33f412659..a04698b003 100755
--- a/windbgstub.c
+++ b/windbgstub.c
@@ -168,6 +168,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;