[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [4686] Fix i386 segment descriptor types on reset (Avi Kivi
From: |
Fabrice Bellard |
Subject: |
[Qemu-devel] [4686] Fix i386 segment descriptor types on reset (Avi Kivity) |
Date: |
Fri, 06 Jun 2008 12:08:47 +0000 |
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [4686] Fix i386 segment descriptor types on reset (Avi Kivity),
Fabrice Bellard <=