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 | 14 ++++++++++++++ windbgstub.c | 4 ++++ 3 files changed, 19 insertions(+)
diff --git a/include/exec/windbgstub-utils.h b/include/exec/windbgstub-utils.h index d1a10c862e..d44ae1918b 100755 --- a/include/exec/windbgstub-utils.h +++ b/include/exec/windbgstub-utils.h @@ -121,6 +121,7 @@ void kd_api_write_msr(CPUState *cpu, PacketData *pd); void kd_api_search_memory(CPUState *cpu, PacketData *pd); void kd_api_fill_memory(CPUState *cpu, PacketData *pd); void kd_api_unsupported(CPUState *cpu, PacketData *pd); +void kd_api_query_memory(CPUState *cpu, PacketData *pd); SizedBuf kd_gen_exception_sc(CPUState *cpu); SizedBuf kd_gen_load_symbols_sc(CPUState *cpu); diff --git a/windbgstub-utils.c b/windbgstub-utils.c index 3832e0b116..3f5299c3f4 100755 --- a/windbgstub-utils.c +++ b/windbgstub-utils.c @@ -1606,6 +1606,20 @@ void kd_api_fill_memory(CPUState *cpu, PacketData *pd) pd->extra_size = 0; } +void kd_api_query_memory(CPUState *cpu, PacketData *pd) +{ + DBGKD_QUERY_MEMORY *mem = &pd->m64.u.QueryMemory; + + if (ldl_p(&mem->AddressSpace) == DBGKD_QUERY_MEMORY_VIRTUAL) { + mem->AddressSpace = DBGKD_QUERY_MEMORY_PROCESS; + mem->Flags = DBGKD_QUERY_MEMORY_READ | + DBGKD_QUERY_MEMORY_WRITE | + DBGKD_QUERY_MEMORY_EXECUTE; + mem->AddressSpace = ldl_p(&mem->AddressSpace); + mem->Flags = ldl_p(&mem->Flags); + } +} + void kd_api_unsupported(CPUState *cpu, PacketData *pd) { WINDBG_ERROR("Catched unimplemented api %s", diff --git a/windbgstub.c b/windbgstub.c index b01ddcf009..338bc00859 100755 --- a/windbgstub.c +++ b/windbgstub.c @@ -213,6 +213,10 @@ static void windbg_process_manipulate_packet(ParsingContext *ctx) kd_api_fill_memory(cpu, &ctx->data); break; + case DbgKdQueryMemoryApi: + kd_api_query_memory(cpu, &ctx->data); + break; + default: kd_api_unsupported(cpu, &ctx->data); break;