Changeset 4207

Timestamp:

08/17/07 22:11:37 (1 year ago)

Author:

vboxsync

Message:

CPUMGetGuestMode

Files:

• trunk/include/VBox/cpum.h (modified) (2 diffs)
• trunk/include/VBox/pgm.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)

trunk/include/VBox/cpum.h

@@ -684 +684 @@
-CPUMDECL(uint32_t) CPUMGetGuestCPL(PVM pVM, PCPUMCTXCORE pCtxCore);
-
+/**
+ * CPU modes.
+ */
+typedef enum CPUMMODE
+{
+    /** The usual invalid zero entry. */
+    CPUMMODE_INVALID = 0,
+    /** Real mode. */
+    CPUMMODE_REAL,
+    /** Protected mode (32-bit). */
+    CPUMMODE_PROTECTED,
+    /** Long mode (64-bit). */
+    CPUMMODE_LONG
+} CPUMMODE;
+
+/**
+ * Gets the current guest CPU mode.
+ *
+ * If paging mode is what you need, check out PGMGetGuestMode().
+ *
+ * @returns The CPU mode.
+ * @param   pVM         The VM handle.
+ */
+CPUMDECL(uint32_t) CPUMGetGuestMode(PVM pVM);
+
-
-#ifdef IN_RING3
@@ -749 +774 @@
-/**
- * API for controlling a few of the CPU features found in CR4.
- 
+
- * Currently only X86_CR4_TSD is accepted as input.
- 
+
- * @returns VBox status code.
- 
+
- * @param   pVM     The VM handle.
- * @param   fOr     The CR4 OR mask.

trunk/include/VBox/pgm.h

@@ -576 +576 @@
- * Gets the current guest paging mode.
- *
+ * If you just need the CPU mode (real/protected/long), use CPUMGetGuestMode().
+ *
- * @returns The current paging mode.
- * @param   pVM             The VM handle.

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

@@ -1505 +1505 @@
-    return cpl;
-}
+
+
+/**
+ * Gets the current guest CPU mode.
+ *
+ * If paging mode is what you need, check out PGMGetGuestMode().
+ *
+ * @returns The CPU mode.
+ * @param   pVM         The VM handle.
+ */
+CPUMDECL(uint32_t) CPUMGetGuestMode(PVM pVM)
+{
+    CPUMMODE enmMode;
+    if (!(pVM->cpum.s.Guest.cr0 & X86_CR0_PE))
+        enmMode = CPUMMODE_REAL;
+    else //GUEST64 if (!(pVM->cpum.s.Guest.efer & MSR_K6_EFER_LMA)
+        enmMode = CPUMMODE_PROTECTED;
+//GUEST64     else
+//GUEST64         enmMode = CPUMMODE_LONG;
+
+    return enmMode;
+}
+

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

@@ -1315 +1315 @@
-/**
- * Gets the current guest paging mode.
+ *
+ * If you just need the CPU mode (real/protected/long), use CPUMGetGuestMode().
- *
- * @returns The current paging mode.