From patchwork Tue Oct 17 13:12:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Abakumov X-Patchwork-Id: 826996 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yGbby69HVz9s8J for ; Wed, 18 Oct 2017 00:28:14 +1100 (AEDT) Received: from localhost ([::1]:39255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Rum-0001UN-TB for incoming@patchwork.ozlabs.org; Tue, 17 Oct 2017 09:28:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4RfZ-0005VG-Rl for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:12:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4RfU-0007C6-Vy for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:12:29 -0400 Received: from mail.ispras.ru ([83.149.199.45]:57352) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4RfU-0007BN-Ig for qemu-devel@nongnu.org; Tue, 17 Oct 2017 09:12:24 -0400 Received: from Misha-PC.lan02.inno (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id D328754006C; Tue, 17 Oct 2017 16:12:22 +0300 (MSK) From: Mihail Abakumov To: qemu-devel@nongnu.org Date: Tue, 17 Oct 2017 16:12:20 +0300 Message-ID: <150824594030.6816.9993391145420015010.stgit@Misha-PC.lan02.inno> In-Reply-To: <150824572545.6816.5099701189660002212.stgit@Misha-PC.lan02.inno> References: <150824572545.6816.5099701189660002212.stgit@Misha-PC.lan02.inno> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [PATCH v2 37/43] windbg: implemented kd_api_read_io_space and kd_api_write_io_space X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sw@weilnetz.de, lprosek@redhat.com, dovgaluk@ispras.ru, rkagan@virtuozzo.com, pbonzini@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Mihail Abakumov Signed-off-by: Pavel Dovgalyuk Signed-off-by: Dmitriy Koltunov --- include/exec/windbgstub-utils.h | 2 + windbgstub-utils.c | 62 +++++++++++++++++++++++++++++++++++++++ windbgstub.c | 8 +++++ 3 files changed, 72 insertions(+) diff --git a/include/exec/windbgstub-utils.h b/include/exec/windbgstub-utils.h index 49b05226b3..dde88f24c9 100755 --- a/include/exec/windbgstub-utils.h +++ b/include/exec/windbgstub-utils.h @@ -102,6 +102,8 @@ void kd_api_restore_breakpoint(CPUState *cpu, PacketData *pd); void kd_api_continue(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_read_io_space(CPUState *cpu, PacketData *pd); +void kd_api_write_io_space(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 dce2b4ccde..b32b4ea570 100755 --- a/windbgstub-utils.c +++ b/windbgstub-utils.c @@ -11,6 +11,7 @@ #include "exec/windbgstub-utils.h" #include "sysemu/sysemu.h" +#include "exec/address-spaces.h" static InitedAddr KPCR; static InitedAddr version; @@ -148,6 +149,67 @@ void kd_api_continue(CPUState *cpu, PacketData *pd) } } +void kd_api_read_io_space(CPUState *cpu, PacketData *pd) +{ + DBGKD_READ_WRITE_IO64 *io = &pd->m64.u.ReadWriteIo; + CPUArchState *env = cpu->env_ptr; + + target_ulong addr = ldtul_p(&io->IoAddress); + uint32_t value = 0; + + switch (io->DataSize) { + case 1: + value = address_space_ldub(&address_space_io, addr, + cpu_get_mem_attrs(env), NULL); + stl_p(&io->DataValue, value); + break; + case 2: + value = address_space_lduw(&address_space_io, addr, + cpu_get_mem_attrs(env), NULL); + stl_p(&io->DataValue, value); + break; + case 4: + value = address_space_ldl(&address_space_io, addr, + cpu_get_mem_attrs(env), NULL); + stl_p(&io->DataValue, value); + break; + default: + pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL; + return; + } + + pd->m64.ReturnStatus = STATUS_SUCCESS; +} + +void kd_api_write_io_space(CPUState *cpu, PacketData *pd) +{ + DBGKD_READ_WRITE_IO64 *io = &pd->m64.u.ReadWriteIo; + CPUArchState *env = cpu->env_ptr; + + target_ulong addr = ldtul_p(&io->IoAddress); + uint32_t value = ldl_p(&io->DataValue); + + switch (io->DataSize) { + case 1: + address_space_stb(&address_space_io, addr, value, + cpu_get_mem_attrs(env), NULL); + break; + case 2: + address_space_stw(&address_space_io, addr, value, + cpu_get_mem_attrs(env), NULL); + break; + case 4: + address_space_stl(&address_space_io, addr, value, + cpu_get_mem_attrs(env), NULL); + break; + default: + pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL; + return; + } + + pd->m64.ReturnStatus = STATUS_SUCCESS; +} + void kd_api_unsupported(CPUState *cpu, PacketData *pd) { WINDBG_ERROR("Caught unimplemented api %s", diff --git a/windbgstub.c b/windbgstub.c index a04698b003..397dedd9d1 100755 --- a/windbgstub.c +++ b/windbgstub.c @@ -168,6 +168,14 @@ static void windbg_process_manipulate_packet(ParsingContext *ctx) kd_api_restore_breakpoint(cpu, &ctx->data); break; + case DbgKdReadIoSpaceApi: + kd_api_read_io_space(cpu, &ctx->data); + break; + + case DbgKdWriteIoSpaceApi: + kd_api_write_io_space(cpu, &ctx->data); + break; + case DbgKdContinueApi: case DbgKdContinueApi2: kd_api_continue(cpu, &ctx->data);