Signed-off-by: Mikhail Abakumov <mikhail.abaku...@ispras.ru> Signed-off-by: Pavel Dovgalyuk <dovga...@ispras.ru> --- include/exec/windbgstub-utils.h | 1 + windbgstub-utils.c | 17 +++++++++++++++++ windbgstub.c | 4 ++++ 3 files changed, 22 insertions(+)
diff --git a/include/exec/windbgstub-utils.h b/include/exec/windbgstub-utils.h index 74e3b9a0da..4eb976260b 100644 --- a/include/exec/windbgstub-utils.h +++ b/include/exec/windbgstub-utils.h @@ -83,6 +83,7 @@ void kd_api_write_physical_memory(CPUState *cs, PacketData *pd); void kd_api_get_version(CPUState *cs, PacketData *pd); void kd_api_read_msr(CPUState *cs, PacketData *pd); void kd_api_write_msr(CPUState *cs, PacketData *pd); +void kd_api_search_memory(CPUState *cs, PacketData *pd); void kd_api_clear_all_internal_breakpoints(CPUState *cs, PacketData *pd); void kd_api_get_context_ex(CPUState *cs, PacketData *pd); void kd_api_set_context_ex(CPUState *cs, PacketData *pd); diff --git a/windbgstub-utils.c b/windbgstub-utils.c index fdb106ff12..d77908fb45 100644 --- a/windbgstub-utils.c +++ b/windbgstub-utils.c @@ -414,6 +414,23 @@ void kd_api_write_physical_memory(CPUState *cs, PacketData *pd) stl_p(&mem->ActualBytesWritten, len); } +void kd_api_search_memory(CPUState *cs, PacketData *pd) +{ + DBGKD_SEARCH_MEMORY *m64c = &pd->m64.u.SearchMemory; + int s_len = MAX(ldq_p(&m64c->SearchLength), 1); + int p_len = MIN(ldl_p(&m64c->PatternLength), pd->extra_size); + target_ulong addr = ldq_p(&m64c->SearchAddress); + InitedAddr find = + windbg_search_vmaddr(cs, addr, addr + s_len, pd->extra, p_len); + pd->extra_size = 0; + if (find.is_init) { + stl_p(&m64c->FoundAddress, find.addr); + pd->m64.ReturnStatus = STATUS_SUCCESS; + } else { + pd->m64.ReturnStatus = STATUS_NO_MORE_ENTRIES; + } +} + void kd_api_clear_all_internal_breakpoints(CPUState *cs, PacketData *pd) { } diff --git a/windbgstub.c b/windbgstub.c index 109a52b663..a50de68db5 100644 --- a/windbgstub.c +++ b/windbgstub.c @@ -224,6 +224,10 @@ static void windbg_process_manipulate_packet(WindbgState *state) kd_api_write_msr(cs, data); break; + case DbgKdSearchMemoryApi: + kd_api_search_memory(cs, data); + break; + case DbgKdClearAllInternalBreakpointsApi: kd_api_clear_all_internal_breakpoints(cs, data); return;