mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix validate_seg_regs check

Browse Source
This commit is contained in:
Stanislav Shwartsman 2006-01-09 19:34:52 +00:00
parent 22187086d7
commit 89e3472178
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.250 2005-12-19 17:58:08 sshwarts Exp $ // $Id: cpu.h,v 1.251 2006-01-09 19:34:52 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -2754,6 +2754,7 @@ public: // for now...
#if BX_SUPPORT_X86_64 #if BX_SUPPORT_X86_64
BX_SMF void long_iret(bxInstruction_c *) BX_CPP_AttrRegparmN(1); BX_SMF void long_iret(bxInstruction_c *) BX_CPP_AttrRegparmN(1);
#endif #endif
BX_SMF void validate_seg_reg(unsigned seg);
BX_SMF void validate_seg_regs(void); BX_SMF void validate_seg_regs(void);
BX_SMF void stack_return_to_v86(Bit32u new_eip, Bit32u raw_cs_selector, Bit32u flags32); BX_SMF void stack_return_to_v86(Bit32u new_eip, Bit32u raw_cs_selector, Bit32u flags32);
BX_SMF void iret16_stack_return_from_v86(bxInstruction_c *); BX_SMF void iret16_stack_return_from_v86(bxInstruction_c *);

42
bochs/cpu/segment_ctrl_pro.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: segment_ctrl_pro.cc,v 1.50 2005-12-12 19:44:06 sshwarts Exp $ // $Id: segment_ctrl_pro.cc,v 1.51 2006-01-09 19:34:52 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -268,10 +268,8 @@ void BX_CPU_C::loadSRegLMNominal(unsigned segI, unsigned selector, bx_address ba
} }
#endif #endif
void BX_CPU_C::validate_seg_regs(void) void BX_CPU_C::validate_seg_reg(unsigned seg)
{ {
Bit8u cs_dpl = BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].cache.dpl;
/* /*
FOR (seg = ES, DS, FS, GS) FOR (seg = ES, DS, FS, GS)
DO DO
@ -283,28 +281,28 @@ void BX_CPU_C::validate_seg_regs(void)
END END
*/ */
if (BX_CPU_THIS_PTR sregs[BX_SEG_REG_ES].cache.dpl < cs_dpl) bx_segment_reg_t *segment = &BX_CPU_THIS_PTR sregs[seg];
if (segment->cache.dpl < CPL)
{ {
BX_CPU_THIS_PTR sregs[BX_SEG_REG_ES].cache.valid = 0; // invalidate if data or non-conforming code segment
BX_CPU_THIS_PTR sregs[BX_SEG_REG_ES].selector.value = 0; if ((segment->cache.valid==0) || (segment->cache.segment==0) ||
} (segment->cache.u.segment.executable==0) || (segment->cache.u.segment.c_ed==0))
if (BX_CPU_THIS_PTR sregs[BX_SEG_REG_DS].cache.dpl< cs_dpl) {
{ segment->selector.value = 0;
BX_CPU_THIS_PTR sregs[BX_SEG_REG_DS].cache.valid = 0; segment->cache.valid = 0;
BX_CPU_THIS_PTR sregs[BX_SEG_REG_DS].selector.value = 0; }
}
if (BX_CPU_THIS_PTR sregs[BX_SEG_REG_FS].cache.dpl < cs_dpl)
{
BX_CPU_THIS_PTR sregs[BX_SEG_REG_FS].cache.valid = 0;
BX_CPU_THIS_PTR sregs[BX_SEG_REG_FS].selector.value = 0;
}
if (BX_CPU_THIS_PTR sregs[BX_SEG_REG_GS].cache.dpl < cs_dpl)
{
BX_CPU_THIS_PTR sregs[BX_SEG_REG_GS].cache.valid = 0;
BX_CPU_THIS_PTR sregs[BX_SEG_REG_GS].selector.value = 0;
} }
} }
void BX_CPU_C::validate_seg_regs(void)
{
validate_seg_reg(BX_SEG_REG_ES);
validate_seg_reg(BX_SEG_REG_DS);
validate_seg_reg(BX_SEG_REG_FS);
validate_seg_reg(BX_SEG_REG_GS);
}
#if BX_CPU_LEVEL >= 2 #if BX_CPU_LEVEL >= 2
void BX_CPP_AttrRegparmN(2) void BX_CPP_AttrRegparmN(2)
BX_CPU_C::parse_selector(Bit16u raw_selector, bx_selector_t *selector) BX_CPU_C::parse_selector(Bit16u raw_selector, bx_selector_t *selector)