Signed-off-by: Mikhail Abakumov <mikhail.abaku...@ispras.ru> Signed-off-by: Pavel Dovgalyuk <dovga...@ispras.ru> --- include/exec/windbgstub-utils.h | 2 + target/i386/windbgstub.c | 81 +++++++++++++++++++++++++++++++++++++++ windbgstub.c | 8 ++++ 3 files changed, 91 insertions(+)
diff --git a/include/exec/windbgstub-utils.h b/include/exec/windbgstub-utils.h index 6936fd0ffb..2781a54044 100644 --- a/include/exec/windbgstub-utils.h +++ b/include/exec/windbgstub-utils.h @@ -71,6 +71,8 @@ void kd_api_read_virtual_memory(CPUState *cs, PacketData *pd); void kd_api_write_virtual_memory(CPUState *cs, PacketData *pd); void kd_api_get_context(CPUState *cs, PacketData *pd); void kd_api_set_context(CPUState *cs, PacketData *pd); +void kd_api_read_control_space(CPUState *cs, PacketData *pd); +void kd_api_write_control_space(CPUState *cs, PacketData *pd); void kd_api_get_context_ex(CPUState *cs, PacketData *pd); void kd_api_set_context_ex(CPUState *cs, PacketData *pd); void kd_api_unsupported(CPUState *cs, PacketData *pd); diff --git a/target/i386/windbgstub.c b/target/i386/windbgstub.c index 946f5cdb6a..c982eff590 100644 --- a/target/i386/windbgstub.c +++ b/target/i386/windbgstub.c @@ -962,6 +962,87 @@ void kd_api_set_context(CPUState *cs, PacketData *pd) } } +void kd_api_read_control_space(CPUState *cs, PacketData *pd) +{ + DBGKD_READ_MEMORY64 *mem = &pd->m64.u.ReadMemory; + target_ulong addr = ldtul_p(&mem->TargetBaseAddress); + uint32_t len = MIN(ldl_p(&mem->TransferCount), + PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64)); + int err = 0; + +#ifdef TARGET_X86_64 + + switch (addr) { + case AMD64_DEBUG_CONTROL_SPACE_KPCR: + addr = KPCR.addr; + len = sizeof(target_ulong); + err = cpu_memory_rw_debug(cs, addr, pd->extra, len, 0); + break; + + case AMD64_DEBUG_CONTROL_SPACE_KPRCB: + addr = VMEM_ADDR(cs, KPCR.addr + OFFSET_KPRCB); + len = sizeof(target_ulong); + err = cpu_memory_rw_debug(cs, addr, pd->extra, len, 0); + break; + + case AMD64_DEBUG_CONTROL_SPACE_KSPECIAL: + len = MIN(len, sizeof(CPU_KSPECIAL_REGISTERS)); + err = windbg_read_ks_regs(cs, pd->extra, len, 0, len); + break; + + case AMD64_DEBUG_CONTROL_SPACE_KTHREAD: + addr = VMEM_ADDR(cs, addr + OFFSET_KPRCB_CURRTHREAD); + len = sizeof(target_ulong); + err = cpu_memory_rw_debug(cs, addr, pd->extra, len, 0); + break; + } + +#else /* TARGET_I386 */ + + err = windbg_rw_context_ex(cs, pd->extra, len, addr, len, true); + +#endif /* TARGET_I386 */ + + if (err) { + len = 0; + pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL; + } + + pd->extra_size = len; + stl_p(&mem->ActualBytesRead, len); +} + +void kd_api_write_control_space(CPUState *cs, PacketData *pd) +{ + DBGKD_WRITE_MEMORY64 *mem = &pd->m64.u.WriteMemory; + target_ulong addr = ldtul_p(&mem->TargetBaseAddress); + uint32_t len = MIN(ldl_p(&mem->TransferCount), pd->extra_size); + int err = 0; + +#ifdef TARGET_X86_64 + + if (addr == AMD64_DEBUG_CONTROL_SPACE_KSPECIAL) { + len = MIN(len, sizeof(CPU_KSPECIAL_REGISTERS)); + err = windbg_write_ks_regs(cs, pd->extra, len, 0, len); + } else { + err = 1; + } + +#else /* TARGET_I386 */ + + err = windbg_rw_context_ex(cs, pd->extra, len, addr, len, false); + +#endif /* TARGET_I386 */ + + if (err) { + len = 0; + pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL; + } + + pd->extra_size = 0; + stl_p(&mem->ActualBytesWritten, len); +} + void kd_api_get_context_ex(CPUState *cs, PacketData *pd) { DBGKD_CONTEXT_EX *ctx = &pd->m64.u.ContextEx; diff --git a/windbgstub.c b/windbgstub.c index e9d759cddf..328a04735f 100644 --- a/windbgstub.c +++ b/windbgstub.c @@ -165,6 +165,14 @@ static void windbg_process_manipulate_packet(WindbgState *state) kd_api_set_context(cs, data); break; + case DbgKdReadControlSpaceApi: + kd_api_read_control_space(cs, data); + break; + + case DbgKdWriteControlSpaceApi: + kd_api_write_control_space(cs, data); + break; + case DbgKdGetContextExApi: kd_api_get_context_ex(cs, data); break;