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

removed redundant ifdefs

Browse Source
This commit is contained in:
Stanislav Shwartsman 2008-07-13 14:01:09 +00:00
parent cedf6bd88a
commit ab71c5670b
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/cpu/flag_ctrl.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: flag_ctrl.cc,v 1.39 2008-07-13 10:44:34 sshwarts Exp $
// $Id: flag_ctrl.cc,v 1.40 2008-07-13 14:01:09 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -63,7 +63,6 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::CLI(bxInstruction_c *i)
{
Bit32u IOPL = BX_CPU_THIS_PTR get_IOPL();
#if BX_CPU_LEVEL >= 2
if (protected_mode())
{
#if BX_SUPPORT_VME
@ -83,7 +82,6 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::CLI(bxInstruction_c *i)
}
}
}
#if BX_CPU_LEVEL >= 3
else if (v8086_mode())
{
if (IOPL != 3) {
@ -97,8 +95,6 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::CLI(bxInstruction_c *i)
exception(BX_GP_EXCEPTION, 0, 0);
}
}
#endif
#endif
BX_CPU_THIS_PTR clear_IF();
}
@ -107,7 +103,6 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::STI(bxInstruction_c *i)
{
Bit32u IOPL = BX_CPU_THIS_PTR get_IOPL();
#if BX_CPU_LEVEL >= 2
if (protected_mode())
{
#if BX_SUPPORT_VME
@ -130,7 +125,6 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::STI(bxInstruction_c *i)
exception(BX_GP_EXCEPTION, 0, 0);
}
}
#if BX_CPU_LEVEL >= 3
else if (v8086_mode())
{
if (IOPL != 3) {
@ -145,8 +139,6 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::STI(bxInstruction_c *i)
exception(BX_GP_EXCEPTION, 0, 0);
}
}
#endif
#endif
if (!BX_CPU_THIS_PTR get_IF()) {
BX_CPU_THIS_PTR assert_IF();

6
bochs/cpu/tasking.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: tasking.cc,v 1.59 2008-05-11 19:36:06 sshwarts Exp $
// $Id: tasking.cc,v 1.60 2008-07-13 14:01:09 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -30,8 +30,6 @@
#include "cpu.h"
#define LOG_THIS BX_CPU_THIS_PTR
#if BX_CPU_LEVEL >= 2
// Notes:
// ======
@ -760,5 +758,3 @@ void BX_CPU_C::get_RSP_from_TSS(unsigned pl, Bit64u *rsp)
TSSstackaddr, 8, 0, BX_READ, rsp);
}
#endif // #if BX_SUPPORT_X86_64
#endif