From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Hg0rJ-00072r-7r for qemu-devel@nongnu.org; Mon, 23 Apr 2007 11:53:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Hg0rI-00070z-84 for qemu-devel@nongnu.org; Mon, 23 Apr 2007 11:53:44 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Hg0rI-00070b-30 for qemu-devel@nongnu.org; Mon, 23 Apr 2007 11:53:44 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Hg0lr-00021g-Mx for qemu-devel@nongnu.org; Mon, 23 Apr 2007 11:48:08 -0400 Message-ID: <462CD4FC.4080102@web.de> Date: Mon, 23 Apr 2007 17:47:08 +0200 From: Jan Kiszka MIME-Version: 1.0 Subject: Re: [Qemu-devel] Re: [PATCH] x86_64 debug registers for gdb References: <45105864.9090902@windriver.com> <200704201355.14379.paul@codesourcery.com> <46293B99.8000909@web.de> <200704210013.40931.paul@codesourcery.com> <462A4DCB.5050909@web.de> <462C78B1.2070201@web.de> In-Reply-To: <462C78B1.2070201@web.de> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig7FA4C897A9640E6C7171F5D1" Sender: jan.kiszka@web.de Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Brook Cc: qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig7FA4C897A9640E6C7171F5D1 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Hi again, here is now a version that I tested a bit longer than 5 minutes (it actually helped to nail down a Xenomai kernel bug). The general purpose register mapping for x86_64 was still wrong. I'm now directing the indices through a mapping table because I didn't dare to redefine R_EBX&friends on x86_64. The latter would be the simplest way if nothing else depends on the current values - which I can't tell. My other questions are still valid as well. Jan --- gdbstub.c | 116 +++++++++++++++++++++++++++++++++++++------------------= ------- 1 file changed, 71 insertions(+), 45 deletions(-) Index: qemu-0.9.0/gdbstub.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qemu-0.9.0.orig/gdbstub.c +++ qemu-0.9.0/gdbstub.c @@ -222,64 +222,90 @@ static int put_packet(GDBState *s, char=20 } =20 #if defined(TARGET_I386) +struct x86_gdb_regs { + target_ulong gp[CPU_NB_REGS]; + target_ulong ip; + uint32_t flags; + uint32_t segm[6]; + uint8_t fpreg[8][10]; + uint32_t fpctrl[8]; + uint64_t xmm[CPU_NB_REGS][2]; + uint32_t mxcsr; +} __attribute__((packed)); + +#if defined(TARGET_X86_64) +static int gpreg_map[] =3D { + R_EAX, R_EBX, R_ECX, R_EDX, R_ESI, R_EDI, R_EBP, R_ESP, + 8, 9, 10, 11, 12, 13, 14, 15 +}; +#define MAP_GPREG(n) gpreg_map[n] +#else +#define MAP_GPREG(n) (n) +#endif =20 static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf) { - uint32_t *registers =3D (uint32_t *)mem_buf; + struct x86_gdb_regs *regs =3D (struct x86_gdb_regs *)mem_buf; int i, fpus; =20 - for(i =3D 0; i < 8; i++) { - registers[i] =3D env->regs[i]; - } - registers[8] =3D env->eip; - registers[9] =3D env->eflags; - registers[10] =3D env->segs[R_CS].selector; - registers[11] =3D env->segs[R_SS].selector; - registers[12] =3D env->segs[R_DS].selector; - registers[13] =3D env->segs[R_ES].selector; - registers[14] =3D env->segs[R_FS].selector; - registers[15] =3D env->segs[R_GS].selector; - /* XXX: convert floats */ - for(i =3D 0; i < 8; i++) { - memcpy(mem_buf + 16 * 4 + i * 10, &env->fpregs[i], 10); - } - registers[36] =3D env->fpuc; + for (i =3D 0; i < CPU_NB_REGS; i++) + regs->gp[i] =3D tswapl(env->regs[MAP_GPREG(i)]); + + regs->ip =3D tswapl(env->eip); + regs->flags =3D tswap32(env->eflags); + + regs->segm[0] =3D tswap32(env->segs[R_CS].selector); + regs->segm[1] =3D tswap32(env->segs[R_SS].selector); + regs->segm[2] =3D tswap32(env->segs[R_DS].selector); + regs->segm[3] =3D tswap32(env->segs[R_ES].selector); + regs->segm[4] =3D tswap32(env->segs[R_FS].selector); + regs->segm[5] =3D tswap32(env->segs[R_GS].selector); + + for (i =3D 0; i < 8; i++) + memcpy(regs->fpreg[i], &env->fpregs[i], 10); + + regs->fpctrl[0] =3D tswap32(env->fpuc); fpus =3D (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11; - registers[37] =3D fpus; - registers[38] =3D 0; /* XXX: convert tags */ - registers[39] =3D 0; /* fiseg */ - registers[40] =3D 0; /* fioff */ - registers[41] =3D 0; /* foseg */ - registers[42] =3D 0; /* fooff */ - registers[43] =3D 0; /* fop */ - =20 - for(i =3D 0; i < 16; i++) - tswapls(®isters[i]); - for(i =3D 36; i < 44; i++) - tswapls(®isters[i]); - return 44 * 4; + regs->fpctrl[1] =3D tswap32(fpus); + regs->fpctrl[2] =3D 0; /* XXX: convert tags */ + regs->fpctrl[3] =3D 0; /* fiseg */ + regs->fpctrl[4] =3D 0; /* fioff */ + regs->fpctrl[5] =3D 0; /* foseg */ + regs->fpctrl[6] =3D 0; /* fooff */ + regs->fpctrl[7] =3D 0; /* fop */ + + for (i =3D 0; i < CPU_NB_REGS; i++) { + regs->xmm[i][0] =3D tswap64(env->xmm_regs[i].XMM_Q(0)); + regs->xmm[i][1] =3D tswap64(env->xmm_regs[i].XMM_Q(1)); + } + + regs->mxcsr =3D tswap32(env->mxcsr); + + return sizeof(struct x86_gdb_regs); } =20 static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int= size) { - uint32_t *registers =3D (uint32_t *)mem_buf; + struct x86_gdb_regs *regs =3D (struct x86_gdb_regs *)mem_buf; int i; =20 - for(i =3D 0; i < 8; i++) { - env->regs[i] =3D tswapl(registers[i]); - } - env->eip =3D tswapl(registers[8]); - env->eflags =3D tswapl(registers[9]); + for (i =3D 0; i < CPU_NB_REGS; i++) + env->regs[MAP_GPREG(i)] =3D tswapl(regs->gp[i]); + + env->eip =3D tswapl(regs->ip); + env->eflags =3D tswap32(regs->flags); + #if defined(CONFIG_USER_ONLY) -#define LOAD_SEG(index, sreg)\ - if (tswapl(registers[index]) !=3D env->segs[sreg].selector)\= - cpu_x86_load_seg(env, sreg, tswapl(registers[index])); - LOAD_SEG(10, R_CS); - LOAD_SEG(11, R_SS); - LOAD_SEG(12, R_DS); - LOAD_SEG(13, R_ES); - LOAD_SEG(14, R_FS); - LOAD_SEG(15, R_GS); +#define LOAD_SEG(index, sreg) \ + if (tswap32(regs->segm[index]) !=3D env->segs[sreg].selector) \ + cpu_x86_load_seg(env, sreg, tswap32(regs->segm[index])); + + LOAD_SEG(0, R_CS); + LOAD_SEG(1, R_SS); + LOAD_SEG(2, R_DS); + LOAD_SEG(3, R_ES); + LOAD_SEG(4, R_FS); + LOAD_SEG(5, R_GS); #endif } =20 --------------enig7FA4C897A9640E6C7171F5D1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGLNT8niDOoMHTA+kRAjM/AJwIDj3JNokNOap1P0ZxFEzm98Jz0gCdE2X4 rUznO3BZMZ7gpT1QTOiXeUA= =mb1Y -----END PGP SIGNATURE----- --------------enig7FA4C897A9640E6C7171F5D1--