From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HeeI6-0001Qa-Gp for qemu-devel@nongnu.org; Thu, 19 Apr 2007 17:35:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HeeI3-0001QC-R5 for qemu-devel@nongnu.org; Thu, 19 Apr 2007 17:35:46 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HeeI3-0001Q9-HD for qemu-devel@nongnu.org; Thu, 19 Apr 2007 17:35:43 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HeeD3-0007uH-D4 for qemu-devel@nongnu.org; Thu, 19 Apr 2007 17:30:33 -0400 Message-ID: <4627DF73.3030902@web.de> Date: Thu, 19 Apr 2007 23:30:27 +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> <4626853D.1070708@web.de> <200704191612.00346.paul@codesourcery.com> In-Reply-To: <200704191612.00346.paul@codesourcery.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig8C78CBC08AE1A819E6D4FCDE" 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) --------------enig8C78CBC08AE1A819E6D4FCDE Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Paul Brook wrote: > On Wednesday 18 April 2007 21:53, Jan Kiszka wrote: >> Jason Wessel wrote: >>> This patch fixes the registers for the 'g' and 'G' packets for the >>> qemu-system-x86_64 target. It allows gdb 6.5 to debug a linux kernel= >>> and get a stack back trace. >> Here comes a corrected (RBX and RDX were mixed) and slightly enhanced >> (segment register reading, don't know how writing should look like) >> version of this patch. Tested successfully with qemu-0.9.0 and gdb-6.6= =2E >> Would be nice to see this support in the next qemu release. >=20 > Can't you recycle the i386 code, like other 64-bit targets do? >=20 For sure I can :). Is this version better? According to a quick check, it= gives identical binaries on i386 and appears to work fine on x86_64. Jan --- gdbstub.c | 99 ++++++++++++++++++++++++++++++++++++++-----------------= ------- 1 file changed, 62 insertions(+), 37 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 @@ -223,63 +223,88 @@ static int put_packet(GDBState *s, char=20 =20 #if defined(TARGET_I386) =20 +#if defined(TARGET_X86_64) +#define _GP_REGS 16 +#define _FPCTL_OFS 34 +#define _NREGS 42 +#else /* i386 */ +#define _GP_REGS 8 +#define _FPCTL_OFS 36 +#define _NREGS 44 +#endif + static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf) { - uint32_t *registers =3D (uint32_t *)mem_buf; + target_ulong *registers =3D (target_ulong *)mem_buf; int i, fpus; =20 - for(i =3D 0; i < 8; i++) { + for(i =3D 0; i < _GP_REGS; 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; +#if defined(TARGET_X86_64) + /* Fix-up register mapping */ + registers[1] =3D env->regs[R_EBX]; + registers[2] =3D env->regs[R_ECX]; + registers[3] =3D env->regs[R_EDX]; +#endif + + registers[_GP_REGS] =3D env->eip; + registers[_GP_REGS+1] =3D env->eflags; + + registers[_GP_REGS+2] =3D env->segs[R_CS].selector; + registers[_GP_REGS+3] =3D env->segs[R_SS].selector; + registers[_GP_REGS+4] =3D env->segs[R_DS].selector; + registers[_GP_REGS+5] =3D env->segs[R_ES].selector; + registers[_GP_REGS+6] =3D env->segs[R_FS].selector; + registers[_GP_REGS+7] =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 < 8; i++) + memcpy(mem_buf + (_GP_REGS+8) * sizeof(target_ulong) + i * 10, + &env->fpregs[i], 10); + + registers[_FPCTL_OFS] =3D 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++) + registers[_FPCTL_OFS+1] =3D fpus; + registers[_FPCTL_OFS+2] =3D 0; /* XXX: convert tags */ + registers[_FPCTL_OFS+3] =3D 0; /* fiseg */ + registers[_FPCTL_OFS+4] =3D 0; /* fioff */ + registers[_FPCTL_OFS+5] =3D 0; /* foseg */ + registers[_FPCTL_OFS+6] =3D 0; /* fooff */ + registers[_FPCTL_OFS+7] =3D 0; /* fop */ + + for (i =3D 0; i < _GP_REGS+8; i++) tswapls(®isters[i]); - for(i =3D 36; i < 44; i++) + for (i =3D _FPCTL_OFS; i < _FPCTL_OFS+8; i++) tswapls(®isters[i]); - return 44 * 4; + return _NREGS * sizeof(target_ulong); } =20 static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int= size) { - uint32_t *registers =3D (uint32_t *)mem_buf; + target_ulong *registers =3D (target_ulong *)mem_buf; int i; =20 - for(i =3D 0; i < 8; i++) { + for(i =3D 0; i < _GP_REGS; i++) env->regs[i] =3D tswapl(registers[i]); - } - env->eip =3D tswapl(registers[8]); - env->eflags =3D tswapl(registers[9]); +#if defined(TARGET_X86_64) + /* Fix-up register mapping */ + env->regs[R_EBX] =3D tswapl(registers[1]); + env->regs[R_ECX] =3D tswapl(registers[2]); + env->regs[R_EDX] =3D tswapl(registers[3]); +#endif + + env->eip =3D tswapl(registers[_GP_REGS]); + env->eflags =3D tswapl(registers[_GP_REGS+1]); #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); + LOAD_SEG(_GP_REGS+2, R_CS); + LOAD_SEG(_GP_REGS+3, R_SS); + LOAD_SEG(_GP_REGS+4, R_DS); + LOAD_SEG(_GP_REGS+5, R_ES); + LOAD_SEG(_GP_REGS+6, R_FS); + LOAD_SEG(_GP_REGS+7, R_GS); #endif } =20 --------------enig8C78CBC08AE1A819E6D4FCDE 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.6 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGJ993niDOoMHTA+kRAtj+AJ93rFwfReFeObsi4h7xdjfn1gbNbACcC0ij JrpY214/pYJ1j31MYiOkx4o= =PW6E -----END PGP SIGNATURE----- --------------enig8C78CBC08AE1A819E6D4FCDE--