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 + target/i386/windbgstub.c | 89 +++++++++++++++++++++++++++++++++++++++ windbgstub.c | 8 ++++ 3 files changed, 99 insertions(+)
diff --git a/include/exec/windbgstub-utils.h b/include/exec/windbgstub-utils.h index 39fbfc8d3a..468a874ab7 100755 --- a/include/exec/windbgstub-utils.h +++ b/include/exec/windbgstub-utils.h @@ -97,6 +97,8 @@ void kd_api_read_virtual_memory(CPUState *cpu, PacketData *pd); void kd_api_write_virtual_memory(CPUState *cpu, PacketData *pd); void kd_api_get_context(CPUState *cpu, PacketData *pd); void kd_api_set_context(CPUState *cpu, PacketData *pd); +void kd_api_read_control_space(CPUState *cpu, PacketData *pd); +void kd_api_write_control_space(CPUState *cpu, PacketData *pd); void kd_api_unsupported(CPUState *cpu, PacketData *pd); SizedBuf kd_gen_exception_sc(CPUState *cpu); diff --git a/target/i386/windbgstub.c b/target/i386/windbgstub.c index 175fa09f24..3e238525da 100755 --- a/target/i386/windbgstub.c +++ b/target/i386/windbgstub.c @@ -283,6 +283,18 @@ static int windbg_write_context(CPUState *cpu, uint8_t *buf, int buf_size, return 0; } +static int windbg_read_ks_regs(CPUState *cpu, uint8_t *buf, int buf_size, + int offset, int len) +{ + return 0; +} + +static int windbg_write_ks_regs(CPUState *cpu, uint8_t *buf, int buf_size, + int offset, int len) +{ + return 0; +} + void kd_api_get_context(CPUState *cpu, PacketData *pd) { int err; @@ -310,6 +322,83 @@ void kd_api_set_context(CPUState *cpu, PacketData *pd) } } +void kd_api_read_control_space(CPUState *cpu, PacketData *pd) +{ + DBGKD_READ_MEMORY64 *mem = &pd->m64.u.ReadMemory; + uint32_t len; + uint32_t context_len; + uint32_t ks_regs_len; + target_ulong addr; + int err = -1; + + len = MIN(ldl_p(&mem->TransferCount), + PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64)); + addr = ldtul_p(&mem->TargetBaseAddress); + + if (addr < sizeof(CPU_KPROCESSOR_STATE)) { + len = MIN(len, sizeof(CPU_KPROCESSOR_STATE) - addr); + + context_len = MAX(0, (int) (sizeof(CPU_CONTEXT) - addr)); + ks_regs_len = len - context_len; + + if (context_len > 0) { + err = windbg_read_context(cpu, pd->extra, context_len, addr, + context_len); + } + if (ks_regs_len > 0) { + addr = addr - sizeof(CPU_CONTEXT) + context_len; + err = windbg_read_ks_regs(cpu, pd->extra + context_len, + ks_regs_len, addr, ks_regs_len); + } + } + + 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 *cpu, PacketData *pd) +{ + DBGKD_WRITE_MEMORY64 *mem = &pd->m64.u.WriteMemory; + uint32_t len; + uint32_t context_len; + uint32_t ks_regs_len; + target_ulong addr; + int err = -1; + + len = MIN(ldl_p(&mem->TransferCount), pd->extra_size); + addr = ldtul_p(&mem->TargetBaseAddress); + + if (addr < sizeof(CPU_KPROCESSOR_STATE)) { + len = MIN(len, sizeof(CPU_KPROCESSOR_STATE) - addr); + + context_len = MAX(0, (int) (sizeof(CPU_CONTEXT) - addr)); + ks_regs_len = len - context_len; + + if (context_len > 0) { + err = windbg_write_context(cpu, pd->extra, context_len, addr, + context_len); + } + if (ks_regs_len > 0) { + addr = addr - sizeof(CPU_CONTEXT) + context_len; + err = windbg_write_ks_regs(cpu, pd->extra + context_len, + ks_regs_len, addr, ks_regs_len); + } + } + + if (err) { + mem->ActualBytesWritten = 0; + pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL; + } + + pd->extra_size = 0; + stl_p(&mem->ActualBytesWritten, len); +} + bool windbg_on_load(void) { CPUState *cpu = qemu_get_cpu(0); diff --git a/windbgstub.c b/windbgstub.c index ad8638b793..5b0a15ea4e 100755 --- a/windbgstub.c +++ b/windbgstub.c @@ -156,6 +156,14 @@ static void windbg_process_manipulate_packet(ParsingContext *ctx) kd_api_set_context(cpu, &ctx->data); break; + case DbgKdReadControlSpaceApi: + kd_api_read_control_space(cpu, &ctx->data); + break; + + case DbgKdWriteControlSpaceApi: + kd_api_write_control_space(cpu, &ctx->data); + break; + default: kd_api_unsupported(cpu, &ctx->data); break;