From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LtIY5-0005Vg-L0 for qemu-devel@nongnu.org; Mon, 13 Apr 2009 05:33:53 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LtIY0-0005TM-NY for qemu-devel@nongnu.org; Mon, 13 Apr 2009 05:33:53 -0400 Received: from [199.232.76.173] (port=44342 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LtIXz-0005TD-Rv for qemu-devel@nongnu.org; Mon, 13 Apr 2009 05:33:48 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:51820) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LtIXz-0002te-2Y for qemu-devel@nongnu.org; Mon, 13 Apr 2009 05:33:47 -0400 Received: from smtp06.web.de (fmsmtp06.dlan.cinetic.de [172.20.5.172]) by fmmailgate01.web.de (Postfix) with ESMTP id 71306FFD67AC for ; Mon, 13 Apr 2009 11:33:46 +0200 (CEST) Received: from [88.66.126.154] (helo=[192.168.1.123]) by smtp06.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #277) id 1LtIXy-00059F-00 for qemu-devel@nongnu.org; Mon, 13 Apr 2009 11:33:46 +0200 Message-ID: <49E306F4.6080807@web.de> Date: Mon, 13 Apr 2009 11:33:40 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig2820538663F823379C253D9B" Sender: jan.kiszka@web.de Subject: [Qemu-devel] [RESEND][PATCH v2] x86: Enhanced dump of segment registers Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig2820538663F823379C253D9B Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Parse the descriptor flags that segment registers refer to and show the result in a more human-friendly format. The output of info registers eg. then looks like this: [...] ES =3D007b 00000000 ffffffff 00cff300 DPL=3D3 DS [-WA] CS =3D0060 00000000 ffffffff 00c09b00 DPL=3D0 CS32 [-RA] SS =3D0068 00000000 ffffffff 00c09300 DPL=3D0 DS [-WA] DS =3D007b 00000000 ffffffff 00cff300 DPL=3D3 DS [-WA] FS =3D0000 00000000 00000000 00000000 GS =3D0033 b7dd66c0 ffffffff b7dff3dd DPL=3D3 DS [-WA] LDT=3D0000 00000000 00000000 00008200 DPL=3D0 LDT TR =3D0080 c06da700 0000206b 00008900 DPL=3D0 TSS32-avl [...] Changes in this version: - refactoring so that only a single helper is used for dumping the segment descriptor cache - tiny typo fixed that broke 64-bit segment type names Signed-off-by: Jan Kiszka --- target-i386/cpu.h | 3 +- target-i386/helper.c | 100 +++++++++++++++++++++++++++++++-------------= ------ 2 files changed, 64 insertions(+), 39 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 90bceab..f38f194 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -82,9 +82,10 @@ #define DESC_AVL_MASK (1 << 20) #define DESC_P_MASK (1 << 15) #define DESC_DPL_SHIFT 13 -#define DESC_DPL_MASK (1 << DESC_DPL_SHIFT) +#define DESC_DPL_MASK (3 << DESC_DPL_SHIFT) #define DESC_S_MASK (1 << 12) #define DESC_TYPE_SHIFT 8 +#define DESC_TYPE_MASK (15 << DESC_TYPE_SHIFT) #define DESC_A_MASK (1 << 8) =20 #define DESC_CS_MASK (1 << 11) /* 1=3Dcode segment 0=3Ddata segment *= / diff --git a/target-i386/helper.c b/target-i386/helper.c index 8213703..5ce8798 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -570,6 +570,61 @@ static const char *cc_op_str[] =3D { "SARQ", }; =20 +static void +cpu_x86_dump_seg_cache(CPUState *env, FILE *f, + int (*cpu_fprintf)(FILE *f, const char *fmt, ...)= , + const char *name, struct SegmentCache *sc) +{ +#ifdef TARGET_X86_64 + if (env->hflags & HF_CS64_MASK) { + cpu_fprintf(f, "%-3s=3D%04x %016" PRIx64 " %08x %08x", name, + sc->selector, sc->base, sc->limit, sc->flags); + } else +#endif + { + cpu_fprintf(f, "%-3s=3D%04x %08x %08x %08x", name, sc->selector,= + (uint32_t)sc->base, sc->limit, sc->flags); + } + + if (!(env->hflags & HF_PE_MASK) || !(sc->flags & DESC_P_MASK)) + goto done; + + cpu_fprintf(f, " DPL=3D%d ", (sc->flags & DESC_DPL_MASK) >> DESC_DPL= _SHIFT); + if (sc->flags & DESC_S_MASK) { + if (sc->flags & DESC_CS_MASK) { + cpu_fprintf(f, (sc->flags & DESC_L_MASK) ? "CS64" : + ((sc->flags & DESC_B_MASK) ? "CS32" : "CS16")= ); + cpu_fprintf(f, " [%c%c", (sc->flags & DESC_C_MASK) ? 'C' : '= -', + (sc->flags & DESC_R_MASK) ? 'R' : '-'); + } else { + cpu_fprintf(f, (sc->flags & DESC_B_MASK) ? "DS " : "DS16");= + cpu_fprintf(f, " [%c%c", (sc->flags & DESC_E_MASK) ? 'E' : '= -', + (sc->flags & DESC_W_MASK) ? 'W' : '-'); + } + cpu_fprintf(f, "%c]", (sc->flags & DESC_A_MASK) ? 'A' : '-'); + } else { + static const char *sys_type_name[2][16] =3D { + { /* 32 bit mode */ + "Reserved", "TSS16-avl", "LDT", "TSS16-busy", + "CallGate16", "TaskGate", "IntGate16", "TrapGate16", + "Reserved", "TSS32-avl", "Reserved", "TSS32-busy", + "CallGate32", "Reserved", "IntGate32", "TrapGate32" + }, + { /* 64 bit mode */ + "", "Reserved", "LDT", "Reserved", "Reserved", + "Reserved", "Reserved", "Reserved", "Reserved", + "TSS64-avl", "Reserved", "TSS64-busy", "CallGate64", + "Reserved", "IntGate64", "TrapGate64" + } + }; + cpu_fprintf(f, sys_type_name[(env->hflags & HF_LMA_MASK) ? 1 : 0= ] + [(sc->flags & DESC_TYPE_MASK) + >> DESC_TYPE_SHIFT]); + } +done: + cpu_fprintf(f, "\n"); +} + void cpu_dump_state(CPUState *env, FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...), int flags) @@ -648,27 +703,15 @@ void cpu_dump_state(CPUState *env, FILE *f, env->halted); } =20 + for(i =3D 0; i < 6; i++) { + cpu_x86_dump_seg_cache(env, f, cpu_fprintf, seg_name[i], + &env->segs[i]); + } + cpu_x86_dump_seg_cache(env, f, cpu_fprintf, "LDT", &env->ldt); + cpu_x86_dump_seg_cache(env, f, cpu_fprintf, "TR", &env->tr); + #ifdef TARGET_X86_64 if (env->hflags & HF_LMA_MASK) { - for(i =3D 0; i < 6; i++) { - SegmentCache *sc =3D &env->segs[i]; - cpu_fprintf(f, "%s =3D%04x %016" PRIx64 " %08x %08x\n", - seg_name[i], - sc->selector, - sc->base, - sc->limit, - sc->flags); - } - cpu_fprintf(f, "LDT=3D%04x %016" PRIx64 " %08x %08x\n", - env->ldt.selector, - env->ldt.base, - env->ldt.limit, - env->ldt.flags); - cpu_fprintf(f, "TR =3D%04x %016" PRIx64 " %08x %08x\n", - env->tr.selector, - env->tr.base, - env->tr.limit, - env->tr.flags); cpu_fprintf(f, "GDT=3D %016" PRIx64 " %08x\n", env->gdt.base, env->gdt.limit); cpu_fprintf(f, "IDT=3D %016" PRIx64 " %08x\n", @@ -685,25 +728,6 @@ void cpu_dump_state(CPUState *env, FILE *f, } else #endif { - for(i =3D 0; i < 6; i++) { - SegmentCache *sc =3D &env->segs[i]; - cpu_fprintf(f, "%s =3D%04x %08x %08x %08x\n", - seg_name[i], - sc->selector, - (uint32_t)sc->base, - sc->limit, - sc->flags); - } - cpu_fprintf(f, "LDT=3D%04x %08x %08x %08x\n", - env->ldt.selector, - (uint32_t)env->ldt.base, - env->ldt.limit, - env->ldt.flags); - cpu_fprintf(f, "TR =3D%04x %08x %08x %08x\n", - env->tr.selector, - (uint32_t)env->tr.base, - env->tr.limit, - env->tr.flags); cpu_fprintf(f, "GDT=3D %08x %08x\n", (uint32_t)env->gdt.base, env->gdt.limit); cpu_fprintf(f, "IDT=3D %08x %08x\n", --------------enig2820538663F823379C253D9B Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAknjBvkACgkQniDOoMHTA+kMWACeJmfUda5UAOAA94qRkZe4pSeZ wr0AniTfAe8xFBmZFe5GAHuY2BkPNoIW =vY0W -----END PGP SIGNATURE----- --------------enig2820538663F823379C253D9B--