Changeset 45786 in vbox for trunk/include/VBox/vmm

Timestamp:

Apr 26, 2013 10:35:59 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85353

Message:

Move HMRCA.asm into the switcher code so we don't need VMMRC.rc.

Location:

trunk/include/VBox/vmm

Files:

• hm.h (modified) (1 diff)
• pgm.h (modified) (1 diff)

trunk/include/VBox/vmm/hm.h

@@ -118 +118 @@
 #endif
 
+/**
+ * 64-bit raw-mode (intermediate memory context) operations.
+ *
+ * These are special hypervisor eip values used when running 64-bit guests on
+ * 32-bit hosts. Each operation corresponds to a routine.
+ *
+ * @note Duplicated in the assembly code!
+ */
+typedef enum HM64ON32OP
+{
+    HM64ON32OP_INVALID = 0,
+    HM64ON32OP_VMXRCStartVM64,
+    HM64ON32OP_SVMRCVMRun64,
+    HM64ON32OP_HMRCSaveGuestFPU64,
+    HM64ON32OP_HMRCSaveGuestDebug64,
+    HM64ON32OP_HMRCTestSwitcher64,
+    HM64ON32OP_END,
+    HM64ON32OP_32BIT_HACK = 0x7fffffff
+} HM64ON32OP;
 
 VMMDECL(bool)                   HMIsEnabledNotMacro(PVM pVM);

trunk/include/VBox/vmm/pgm.h

@@ -513 +513 @@
 VMMR3DECL(int)      PGMR3MappingsUnfix(PVM pVM);
 VMMR3DECL(bool)     PGMR3MappingsNeedReFixing(PVM pVM);
-#ifdef VBOX_WITH_RAW_MODE
+#if defined(VBOX_WITH_RAW_MODE) || (HC_ARCH_BITS != 64 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL))
 VMMR3DECL(int)      PGMR3MapIntermediate(PVM pVM, RTUINTPTR Addr, RTHCPHYS HCPhys, unsigned cbPages);
 #endif