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

put VME initial code in BX_SUPPORT_VME ifdefs

Browse Source
This commit is contained in:
Stanislav Shwartsman 2005-03-13 20:18:37 +00:00
parent 32e8d0760a
commit 189e55885d
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.204 2005-03-12 19:34:18 sshwarts Exp $
// $Id: cpu.h,v 1.205 2005-03-13 20:18:36 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -2666,7 +2666,7 @@ public: // for now...
BX_SMF void stack_return_to_v86(Bit32u new_eip, Bit32u raw_cs_selector,
Bit32u flags32);
BX_SMF void stack_return_from_v86(bxInstruction_c *);
#if BX_CPU_LEVEL >= 4
#if BX_SUPPORT_VME
BX_SMF void v86_redirect_interrupt(Bit32u vector);
#endif
BX_SMF void init_v8086_mode(void);

10
bochs/cpu/flag_ctrl.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: flag_ctrl.cc,v 1.19 2005-02-03 22:24:45 sshwarts Exp $
// $Id: flag_ctrl.cc,v 1.20 2005-03-13 20:18:36 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -68,7 +68,7 @@ void BX_CPU_C::CLI(bxInstruction_c *i)
#if BX_CPU_LEVEL >= 2
if (protected_mode())
{
#if BX_CPU_LEVEL >= 4
#if BX_SUPPORT_VME
if (BX_CPU_THIS_PTR cr4.get_PVI() && (cpl == 3))
{
if (IOPL < 3) {
@ -89,7 +89,7 @@ void BX_CPU_C::CLI(bxInstruction_c *i)
else if (v8086_mode())
{
if (IOPL != 3) {
#if BX_CPU_LEVEL >= 4
#if BX_SUPPORT_VME
if (BX_CPU_THIS_PTR cr4.get_VME())
{
BX_CPU_THIS_PTR clear_VIF();
@ -114,7 +114,7 @@ void BX_CPU_C::STI(bxInstruction_c *i)
#if BX_CPU_LEVEL >= 2
if (protected_mode())
{
#if BX_CPU_LEVEL >= 4
#if BX_SUPPORT_VME
if (BX_CPU_THIS_PTR cr4.get_PVI())
{
if (cpl == 3) {
@ -141,7 +141,7 @@ void BX_CPU_C::STI(bxInstruction_c *i)
else if (v8086_mode())
{
if (IOPL != 3) {
#if BX_CPU_LEVEL >= 4
#if BX_SUPPORT_VME
if (! BX_CPU_THIS_PTR get_VIP () && BX_CPU_THIS_PTR cr4.get_VME())
{
BX_CPU_THIS_PTR assert_VIF();

2
bochs/cpu/soft_int.cc
View File

@ -109,7 +109,7 @@ void BX_CPU_C::INT_Ib(bxInstruction_c *i)
if (v8086_mode())
{
#if BX_CPU_LEVEL >= 4
#if BX_SUPPORT_VME
if (BX_CPU_THIS_PTR cr4.get_VME())
{
Bit16u io_base;

4
bochs/cpu/vm8086.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: vm8086.cc,v 1.18 2005-03-12 19:34:18 sshwarts Exp $
// $Id: vm8086.cc,v 1.19 2005-03-13 20:18:37 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -272,7 +272,7 @@ void BX_CPU_C::init_v8086_mode(void)
BX_CPU_THIS_PTR sregs[BX_SEG_REG_GS].selector.rpl = 3;
}
#if BX_CPU_LEVEL >= 4
#if BX_SUPPORT_VME
void BX_CPU_C::v86_redirect_interrupt(Bit32u vector)
{
BX_PANIC(("Redirection of interrupts through virtual-mode idt still not implemented"));