From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1K4akr-0007Lj-Ud for qemu-devel@nongnu.org; Fri, 06 Jun 2008 08:09:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1K4akq-0007L6-HU for qemu-devel@nongnu.org; Fri, 06 Jun 2008 08:09:13 -0400 Received: from [199.232.76.173] (port=58103 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1K4akq-0007L3-Bw for qemu-devel@nongnu.org; Fri, 06 Jun 2008 08:09:12 -0400 Received: from savannah.gnu.org ([199.232.41.3]:55779 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1K4akq-0007zU-0o for qemu-devel@nongnu.org; Fri, 06 Jun 2008 08:09:12 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1K4akR-0007Hm-Eh for qemu-devel@nongnu.org; Fri, 06 Jun 2008 12:08:47 +0000 Received: from bellard by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1K4akR-0007Hi-6a for qemu-devel@nongnu.org; Fri, 06 Jun 2008 12:08:47 +0000 MIME-Version: 1.0 Errors-To: bellard Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Fabrice Bellard Message-Id: Date: Fri, 06 Jun 2008 12:08:47 +0000 Subject: [Qemu-devel] [4686] Fix i386 segment descriptor types on reset (Avi Kivity) 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@nongnu.org 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;