diff options
| author | Tobias Markus | 2013-08-25 12:20:06 +0200 |
|---|---|---|
| committer | Michael Tokarev | 2013-09-20 18:09:24 +0200 |
| commit | 469936ae0a9891b2de7e46743f683535b0819bee (patch) | |
| tree | 250ddc0929bf423ae9d277776cae327e7824d863 /target-i386/helper.c | |
| parent | iov: avoid "orig_len may be used unitialized" warning (diff) | |
| download | qemu-469936ae0a9891b2de7e46743f683535b0819bee.tar.gz qemu-469936ae0a9891b2de7e46743f683535b0819bee.tar.xz qemu-469936ae0a9891b2de7e46743f683535b0819bee.zip | |
target-i386: Fix segment cache dump
When in Long Mode, cpu_x86_seg_cache() logs "DS16" because the Default
operation size bit (D/B bit) is not set for Long Mode Data Segments since
there are only Data Segments in Long Mode and no explicit 16/32/64-bit
Descriptors.
This patch fixes this by checking the Long Mode Active bit of the hidden
flags variable and logging "DS" if it is set. (I.e. in Long Mode all Data
Segments are logged as "DS")
Signed-off-by: Tobias Markus <tobias@markus-regensburg.de>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'target-i386/helper.c')
| -rw-r--r-- | target-i386/helper.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 8bf85ec5f0..35f09d2769 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -147,7 +147,9 @@ cpu_x86_dump_seg_cache(CPUX86State *env, FILE *f, fprintf_function cpu_fprintf, 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, + (sc->flags & DESC_B_MASK || env->hflags & HF_LMA_MASK) + ? "DS " : "DS16"); cpu_fprintf(f, " [%c%c", (sc->flags & DESC_E_MASK) ? 'E' : '-', (sc->flags & DESC_W_MASK) ? 'W' : '-'); } |