From 189e55885d019817289236c4131f0a63cd4e1ba6 Mon Sep 17 00:00:00 2001
From: Stanislav Shwartsman <sshwarts@users.sourceforge.net>
Date: Sun, 13 Mar 2005 20:18:37 +0000
Subject: [PATCH] put VME initial code in BX_SUPPORT_VME ifdefs

---
 bochs/cpu/cpu.h        |  4 ++--
 bochs/cpu/flag_ctrl.cc | 10 +++++-----
 bochs/cpu/soft_int.cc  |  2 +-
 bochs/cpu/vm8086.cc    |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bochs/cpu/cpu.h b/bochs/cpu/cpu.h
index b2ec6b353..3104ea392 100644
--- a/bochs/cpu/cpu.h
+++ b/bochs/cpu/cpu.h
@@ -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);
diff --git a/bochs/cpu/flag_ctrl.cc b/bochs/cpu/flag_ctrl.cc
index 10a189bc8..6e71c3ae6 100644
--- a/bochs/cpu/flag_ctrl.cc
+++ b/bochs/cpu/flag_ctrl.cc
@@ -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();
diff --git a/bochs/cpu/soft_int.cc b/bochs/cpu/soft_int.cc
index 8d87d9d34..069424006 100644
--- a/bochs/cpu/soft_int.cc
+++ b/bochs/cpu/soft_int.cc
@@ -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;
diff --git a/bochs/cpu/vm8086.cc b/bochs/cpu/vm8086.cc
index 0c4e0bf18..f0fef28b3 100644
--- a/bochs/cpu/vm8086.cc
+++ b/bochs/cpu/vm8086.cc
@@ -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"));