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 | 2 ++ windbgstub-utils.c | 47 +++++++++++++++++++++++++++++++++++++++ windbgstub.c | 8 +++++++ 3 files changed, 57 insertions(+)
diff --git a/include/exec/windbgstub-utils.h b/include/exec/windbgstub-utils.h index 01f115f091..552318ad05 100755 --- a/include/exec/windbgstub-utils.h +++ b/include/exec/windbgstub-utils.h @@ -93,6 +93,8 @@ typedef struct SizedBuf { InitedAddr *windbg_get_KPCR(void); InitedAddr *windbg_get_version(void); +void kd_api_read_virtual_memory(CPUState *cpu, PacketData *pd); +void kd_api_write_virtual_memory(CPUState *cpu, PacketData *pd); void kd_api_unsupported(CPUState *cpu, PacketData *pd); SizedBuf kd_gen_exception_sc(CPUState *cpu); diff --git a/windbgstub-utils.c b/windbgstub-utils.c index 501a7435df..c363d905af 100755 --- a/windbgstub-utils.c +++ b/windbgstub-utils.c @@ -24,6 +24,53 @@ InitedAddr *windbg_get_version(void) return &version; } +void kd_api_read_virtual_memory(CPUState *cpu, PacketData *pd) +{ + DBGKD_READ_MEMORY64 *mem = &pd->m64.u.ReadMemory; + uint32_t len; + target_ulong addr; + int err; + + len = MIN(ldl_p(&mem->TransferCount), + PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64)); + addr = ldtul_p(&mem->TargetBaseAddress); + err = cpu_memory_rw_debug(cpu, addr, pd->extra, len, 0); + + if (err) { + len = 0; + pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL; + + WINDBG_DEBUG("read_virtual_memory: No physical page mapped: " FMT_ADDR, + (target_ulong) mem->TargetBaseAddress); + } + + pd->extra_size = len; + stl_p(&mem->ActualBytesRead, len); +} + +void kd_api_write_virtual_memory(CPUState *cpu, PacketData *pd) +{ + DBGKD_WRITE_MEMORY64 *mem = &pd->m64.u.WriteMemory; + uint32_t len; + target_ulong addr; + int err; + + len = MIN(ldl_p(&mem->TransferCount), pd->extra_size); + addr = ldtul_p(&mem->TargetBaseAddress); + err = cpu_memory_rw_debug(cpu, addr, pd->extra, len, 1); + + if (err) { + len = 0; + pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL; + + WINDBG_DEBUG("read_write_memory: No physical page mapped: " FMT_ADDR, + (target_ulong) mem->TargetBaseAddress); + } + + pd->extra_size = 0; + stl_p(&mem->ActualBytesWritten, len); +} + void kd_api_unsupported(CPUState *cpu, PacketData *pd) { WINDBG_ERROR("Caught unimplemented api %s", diff --git a/windbgstub.c b/windbgstub.c index 2467d2d247..1725107722 100755 --- a/windbgstub.c +++ b/windbgstub.c @@ -140,6 +140,14 @@ static void windbg_process_manipulate_packet(ParsingContext *ctx) switch (ctx->data.m64.ApiNumber) { + case DbgKdReadVirtualMemoryApi: + kd_api_read_virtual_memory(cpu, &ctx->data); + break; + + case DbgKdWriteVirtualMemoryApi: + kd_api_write_virtual_memory(cpu, &ctx->data); + break; + default: kd_api_unsupported(cpu, &ctx->data); break;