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

do #GP in x86-64 mode if NT flag is set

Browse Source
This commit is contained in:
Stanislav Shwartsman 2005-08-14 18:01:04 +00:00
parent 681db0fd86
commit 84ce5ec720
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bochs/cpu/iret.cc
View File

@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// $Id: iret.cc,v 1.5 2005-08-14 17:23:03 sshwarts Exp $ // $Id: iret.cc,v 1.6 2005-08-14 18:01:04 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -263,7 +263,7 @@ BX_CPU_C::iret_protected(bxInstruction_c *i)
/* selector RPL must = RPL of return CS selector, /* selector RPL must = RPL of return CS selector,
* else #GP(SS selector) */ * else #GP(SS selector) */
if ( ss_selector.rpl != cs_selector.rpl) { if (ss_selector.rpl != cs_selector.rpl) {
BX_ERROR(("iret: SS.rpl != CS.rpl")); BX_ERROR(("iret: SS.rpl != CS.rpl"));
exception(BX_GP_EXCEPTION, raw_ss_selector & 0xfffc, 0); exception(BX_GP_EXCEPTION, raw_ss_selector & 0xfffc, 0);
} }
@ -278,7 +278,7 @@ BX_CPU_C::iret_protected(bxInstruction_c *i)
* else #GP(SS selector) */ * else #GP(SS selector) */
if ( ss_descriptor.valid==0 || if ( ss_descriptor.valid==0 ||
ss_descriptor.segment==0 || ss_descriptor.segment==0 ||
ss_descriptor.u.segment.executable || ss_descriptor.u.segment.executable ||
ss_descriptor.u.segment.r_w==0 ) ss_descriptor.u.segment.r_w==0 )
{ {
BX_ERROR(("iret: SS AR byte not writable code segment")); BX_ERROR(("iret: SS AR byte not writable code segment"));
@ -287,7 +287,7 @@ BX_CPU_C::iret_protected(bxInstruction_c *i)
/* stack segment DPL must equal the RPL of the return CS selector, /* stack segment DPL must equal the RPL of the return CS selector,
* else #GP(SS selector) */ * else #GP(SS selector) */
if ( ss_descriptor.dpl != cs_selector.rpl ) { if (ss_descriptor.dpl != cs_selector.rpl) {
BX_ERROR(("iret: SS.dpl != CS selector RPL")); BX_ERROR(("iret: SS.dpl != CS selector RPL"));
exception(BX_GP_EXCEPTION, raw_ss_selector & 0xfffc, 0); exception(BX_GP_EXCEPTION, raw_ss_selector & 0xfffc, 0);
} }
@ -330,9 +330,9 @@ BX_CPU_C::iret_protected(bxInstruction_c *i)
// perhaps I should always write_eflags(), thus zeroing // perhaps I should always write_eflags(), thus zeroing
// out the upper 16bits of eflags for CS.D_B==0 ??? // out the upper 16bits of eflags for CS.D_B==0 ???
if (cs_descriptor.u.segment.d_b) if (cs_descriptor.u.segment.d_b)
write_eflags(new_eflags, prev_cpl==0, prev_cpl<=BX_CPU_THIS_PTR get_IOPL (), 0, 1); write_eflags(new_eflags, prev_cpl==0, prev_cpl<=BX_CPU_THIS_PTR get_IOPL(), 0, 1);
else else
write_flags((Bit16u) new_eflags, prev_cpl==0, prev_cpl<=BX_CPU_THIS_PTR get_IOPL ()); write_flags((Bit16u) new_eflags, prev_cpl==0, prev_cpl<=BX_CPU_THIS_PTR get_IOPL());
// load SS:eSP from stack // load SS:eSP from stack
// load the SS-cache with SS descriptor // load the SS-cache with SS descriptor
@ -360,6 +360,11 @@ BX_CPU_C::long_iret(bxInstruction_c *i)
BX_DEBUG (("LONG MODE IRET")); BX_DEBUG (("LONG MODE IRET"));
if ( BX_CPU_THIS_PTR get_NT () ) {
BX_ERROR(("iret64: return from nested task not supported in x86-64 mode !"));
exception(BX_GP_EXCEPTION, 0, 0);
}
/* 64bit opsize /* 64bit opsize
* ============ * ============
* SS eSP+32 * SS eSP+32