On Tue, Nov 21, 2017 at 3:11 PM, Mihail Abakumov
<mikhail.abakumov@ispras.ru> wrote:
> Signed-off-by: Mihail Abakumov <mikhail.abakumov@ispras.ru>
> Signed-off-by: Pavel Dovgalyuk <dovgaluk@ispras.ru>
> Signed-off-by: Dmitriy Koltunov <koltunov@ispras.ru>
> ---
> include/exec/windbgstub-utils.h | 1 +
> windbgstub-utils.c | 12 ++++++++++++
> windbgstub.c | 4 ++++
> 3 files changed, 17 insertions(+)
>
> diff --git a/include/exec/windbgstub-utils.h b/include/exec/windbgstub-utils.h
> index e144294b51..fa1ebbb6d2 100755
> --- a/include/exec/windbgstub-utils.h
> +++ b/include/exec/windbgstub-utils.h
> @@ -105,6 +105,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 fb2c378460..edd23c1971 100755
> --- a/windbgstub-utils.c
> +++ b/windbgstub-utils.c
> @@ -333,6 +333,18 @@ void kd_api_fill_memory(CPUState *cpu, PacketData *pd)
> }
> }
>
> +void kd_api_query_memory(CPUState *cpu, PacketData *pd)
> +{
> + DBGKD_QUERY_MEMORY *mem = &pd->m64.u.QueryMemory;
> +
> + 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);
This should be:
void kd_api_query_memory(CPUState *cpu, PacketData *pd)
{
DBGKD_QUERY_MEMORY *mem = &pd->m64.u.QueryMemory;
stl_p(&mem->AddressSpace, DBGKD_QUERY_MEMORY_PROCESS);
stl_p(&mem->Flags, DBGKD_QUERY_MEMORY_READ |
DBGKD_QUERY_MEMORY_WRITE |
DBGKD_QUERY_MEMORY_EXECUTE);
> +}
> +
> void kd_api_unsupported(CPUState *cpu, PacketData *pd)
> {
> WINDBG_ERROR("Caught unimplemented api %s",
> diff --git a/windbgstub.c b/windbgstub.c
> index b348028dfd..36372c0ea5 100755
> --- a/windbgstub.c
> +++ b/windbgstub.c
> @@ -220,6 +220,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;
>