* [Qemu-devel] [4686] Fix i386 segment descriptor types on reset (Avi Kivity)
@ 2008-06-06 12:08 Fabrice Bellard
0 siblings, 0 replies; only message in thread
From: Fabrice Bellard @ 2008-06-06 12:08 UTC (permalink / raw)
To: qemu-devel
Revision: 4686
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4686
Author: bellard
Date: 2008-06-06 12:08:46 +0000 (Fri, 06 Jun 2008)
Log Message:
-----------
Fix i386 segment descriptor types on reset (Avi Kivity)
Modified Paths:
--------------
trunk/target-i386/helper.c
Modified: trunk/target-i386/helper.c
===================================================================
--- trunk/target-i386/helper.c 2008-06-06 11:24:33 UTC (rev 4685)
+++ trunk/target-i386/helper.c 2008-06-06 12:08:46 UTC (rev 4686)
@@ -383,16 +383,22 @@
env->idt.limit = 0xffff;
env->gdt.limit = 0xffff;
env->ldt.limit = 0xffff;
- env->ldt.flags = DESC_P_MASK;
+ env->ldt.flags = DESC_P_MASK | (2 << DESC_TYPE_SHIFT);
env->tr.limit = 0xffff;
- env->tr.flags = DESC_P_MASK;
+ env->tr.flags = DESC_P_MASK | (11 < DESC_TYPE_SHIFT);
- cpu_x86_load_seg_cache(env, R_CS, 0xf000, 0xffff0000, 0xffff, 0);
- cpu_x86_load_seg_cache(env, R_DS, 0, 0, 0xffff, 0);
- cpu_x86_load_seg_cache(env, R_ES, 0, 0, 0xffff, 0);
- cpu_x86_load_seg_cache(env, R_SS, 0, 0, 0xffff, 0);
- cpu_x86_load_seg_cache(env, R_FS, 0, 0, 0xffff, 0);
- cpu_x86_load_seg_cache(env, R_GS, 0, 0, 0xffff, 0);
+ cpu_x86_load_seg_cache(env, R_CS, 0xf000, 0xffff0000, 0xffff,
+ DESC_P_MASK | DESC_S_MASK | DESC_CS_MASK | DESC_R_MASK);
+ cpu_x86_load_seg_cache(env, R_DS, 0, 0, 0xffff,
+ DESC_P_MASK | DESC_S_MASK | DESC_W_MASK);
+ cpu_x86_load_seg_cache(env, R_ES, 0, 0, 0xffff,
+ DESC_P_MASK | DESC_S_MASK | DESC_W_MASK);
+ cpu_x86_load_seg_cache(env, R_SS, 0, 0, 0xffff,
+ DESC_P_MASK | DESC_S_MASK | DESC_W_MASK);
+ cpu_x86_load_seg_cache(env, R_FS, 0, 0, 0xffff,
+ DESC_P_MASK | DESC_S_MASK | DESC_W_MASK);
+ cpu_x86_load_seg_cache(env, R_GS, 0, 0, 0xffff,
+ DESC_P_MASK | DESC_S_MASK | DESC_W_MASK);
env->eip = 0xfff0;
env->regs[R_EDX] = env->cpuid_version;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-06-06 12:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-06 12:08 [Qemu-devel] [4686] Fix i386 segment descriptor types on reset (Avi Kivity) Fabrice Bellard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).