From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZF5BZ-00085M-Nl for qemu-devel@nongnu.org; Tue, 14 Jul 2015 14:44:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZF5BW-0000Li-V0 for qemu-devel@nongnu.org; Tue, 14 Jul 2015 14:44:09 -0400 Received: from iodev.co.uk ([82.211.30.53]:44204) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZF5BW-00006F-PE for qemu-devel@nongnu.org; Tue, 14 Jul 2015 14:44:06 -0400 From: Ismael Luceno Date: Tue, 14 Jul 2015 15:43:29 -0300 Message-Id: <1436899409-27921-1-git-send-email-ismael@iodev.co.uk> Subject: [Qemu-devel] [PATCH] target-i386: gdbserver: Return CS:IP as EIP on 16-bit mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Ismael Luceno While far from ideal, that seems to be what GDB and most other debuggers expect. Signed-off-by: Ismael Luceno --- target-i386/gdbstub.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target-i386/gdbstub.c b/target-i386/gdbstub.c index ff99cfb..754ea77 100644 --- a/target-i386/gdbstub.c +++ b/target-i386/gdbstub.c @@ -70,8 +70,11 @@ int x86_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n) case IDX_IP_REG: if (TARGET_LONG_BITS == 64 && env->hflags & HF_CS64_MASK) { return gdb_get_reg64(mem_buf, env->eip); - } else { + } else if (env->hflags & HF_PE_MASK) { return gdb_get_reg32(mem_buf, env->eip); + } else { + return gdb_get_reg32(mem_buf, (env->segs[R_CS].selector << 4) + + env->eip); } case IDX_FLAGS_REG: return gdb_get_reg32(mem_buf, env->eflags); -- 2.4.5