Changeset 5695 in vbox

Timestamp:

Nov 11, 2007 5:57:57 PM (17 years ago)

Author:

vboxsync

Message:

Don't drag in CPUMAllA.asm in ring-3 because leopard doesn't like the jump table. It's not needed.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (1 diff)
• VMMAll/CPUMAllA.asm (modified) (2 diffs)
• VMMAll/CPUMAllRegs.cpp (modified) (12 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -92 +92 @@
         HWACCM.cpp \
         VMMAll/CPUMAllRegs.cpp \
-        VMMAll/CPUMAllA.asm \
         VMMAll/DBGFAll.cpp \
         VMMAll/IOMAll.cpp \

trunk/src/VBox/VMM/VMMAll/CPUMAllA.asm

@@ -6 +6 @@
 ;
 ;  Copyright (C) 2006-2007 innotek GmbH
-; 
+;
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -26 +26 @@
 %include "VBox/cpum.mac"
 
+%ifdef IN_RING3
+ %error "The jump table doesn't link on leopard."
+%endif
 
 ;

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -442 +442 @@
 
 /**
- * Set the guest CR0. 
- *  
- * When called in GC, the hyper CR0 may be updated if that is 
- * required. The caller only has to take special action if AM, 
- * WP, PG or PE changes. 
- *  
+ * Set the guest CR0.
+ *
+ * When called in GC, the hyper CR0 may be updated if that is
+ * required. The caller only has to take special action if AM,
+ * WP, PG or PE changes.
+ *
  * @returns VINF_SUCCESS (consider it void).
  * @param   pVM     Pointer to the shared VM structure.
@@ -456 +456 @@
 #ifdef IN_GC
     /*
-     * Check if we need to change hypervisor CR0 because 
+     * Check if we need to change hypervisor CR0 because
      * of math stuff.
      */
@@ -464 +464 @@
         if (!(pVM->cpum.s.fUseFlags & CPUM_USED_FPU))
         {
-            /* 
-             * We haven't saved the host FPU state yet, so TS and MT are both set 
+            /*
+             * We haven't saved the host FPU state yet, so TS and MT are both set
              * and EM should be reflecting the guest EM (it always does this).
              */
@@ -490 +490 @@
         {
             /*
-             * Already saved the state, so we're just mirroring 
+             * Already saved the state, so we're just mirroring
              * the guest flags.
              */
             uint32_t HyperCR0 = ASMGetCR0();
-            AssertMsg(     (HyperCR0               & (X86_CR0_TS | X86_CR0_EM | X86_CR0_MP)) 
-                      ==   (pVM->cpum.s.Guest.cr0  & (X86_CR0_TS | X86_CR0_EM | X86_CR0_MP)), 
+            AssertMsg(     (HyperCR0               & (X86_CR0_TS | X86_CR0_EM | X86_CR0_MP))
+                      ==   (pVM->cpum.s.Guest.cr0  & (X86_CR0_TS | X86_CR0_EM | X86_CR0_MP)),
                       ("%#x %#x\n", HyperCR0, pVM->cpum.s.Guest.cr0));
             HyperCR0 &= ~(X86_CR0_TS | X86_CR0_EM | X86_CR0_MP);
@@ -503 +503 @@
         }
     }
-#endif 
-
-    /* 
-     * Check for changes causing TLB flushes (for REM). 
-     * The caller is responsible for calling PGM when appropriate.  
+#endif
+
+    /*
+     * Check for changes causing TLB flushes (for REM).
+     * The caller is responsible for calling PGM when appropriate.
      */
     if (    (cr0                   & (X86_CR0_PG | X86_CR0_WP | X86_CR0_PE))
@@ -1500 +1500 @@
 }
 
+
+#ifndef IN_RING3
 /**
  * Lazily sync in the FPU/XMM state
@@ -1511 +1513 @@
 }
 
+
 /**
  * Restore host FPU/XMM state
@@ -1522 +1525 @@
     return CPUMRestoreHostFPUStateAsm(&pVM->cpum.s);
 }
+#endif /* !IN_RING3 */
+
 
 /**
@@ -1534 +1539 @@
 }
 
+
 /**
  * Deactivate the FPU/XMM state of the guest OS
@@ -1542 +1548 @@
     pVM->cpum.s.fUseFlags &= ~CPUM_USED_FPU;
 }
+
 
 /**
@@ -1554 +1561 @@
 }
 
+
 /**
  * Checks if the hidden selector registers are valid
@@ -1563 +1571 @@
     pVM->cpum.s.fValidHiddenSelRegs = fValid;
 }
+
 
 /**