Signed-off-by: Mikhail Abakumov <mikhail.abaku...@ispras.ru> Signed-off-by: Pavel Dovgalyuk <dovga...@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 1c577ddd49..638b2b9a6f 100644 --- a/include/exec/windbgstub-utils.h +++ b/include/exec/windbgstub-utils.h @@ -67,6 +67,8 @@ typedef struct PacketData { const char *kd_api_name(int id); const char *kd_pkt_type_name(int id); +void kd_api_read_virtual_memory(CPUState *cs, PacketData *pd); +void kd_api_write_virtual_memory(CPUState *cs, PacketData *pd); void kd_api_unsupported(CPUState *cs, PacketData *pd); DBGKD_ANY_WAIT_STATE_CHANGE *kd_state_change_exc(CPUState *cs); diff --git a/windbgstub-utils.c b/windbgstub-utils.c index bbd95498f4..006101d8a1 100644 --- a/windbgstub-utils.c +++ b/windbgstub-utils.c @@ -197,6 +197,53 @@ InitedAddr windbg_search_vmaddr(CPUState *cs, target_ulong start, return ret; } +void kd_api_read_virtual_memory(CPUState *cs, 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(cs, addr, pd->extra, len, 0); + + if (err) { + len = 0; + pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL; + + DPRINTF("read_virtual_memory: No physical page mapped: " FMT_ADDR "\n", + addr); + } + + pd->extra_size = len; + stl_p(&mem->ActualBytesRead, len); +} + +void kd_api_write_virtual_memory(CPUState *cs, 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(cs, addr, pd->extra, len, 1); + + if (err) { + len = 0; + pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL; + + DPRINTF("read_write_memory: No physical page mapped: " FMT_ADDR "\n", + addr); + } + + pd->extra_size = 0; + stl_p(&mem->ActualBytesWritten, len); +} + void kd_api_unsupported(CPUState *cs, PacketData *pd) { WINDBG_ERROR("Caught unimplemented api %s", kd_api_name(pd->m64.ApiNumber)); diff --git a/windbgstub.c b/windbgstub.c index 6ed93b8ce9..46400d9bad 100644 --- a/windbgstub.c +++ b/windbgstub.c @@ -149,6 +149,14 @@ static void windbg_process_manipulate_packet(WindbgState *state) } switch (data->m64.ApiNumber) { + case DbgKdReadVirtualMemoryApi: + kd_api_read_virtual_memory(cs, data); + break; + + case DbgKdWriteVirtualMemoryApi: + kd_api_write_virtual_memory(cs, data); + break; + default: kd_api_unsupported(cs, data); break;