Changeset 104509 in vbox

Timestamp:

May 3, 2024 2:14:36 PM (11 months ago)

Author:

vboxsync

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

163032

Message:

VMM: Some more GCM cleanup. bugref:9735 bugref:10683

Location:

trunk

Files:

• include/VBox/vmm/gcm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/GCMAll.cpp (modified) (3 diffs)
• src/VBox/VMM/include/GCMInternal.h (modified) (2 diffs)

trunk/include/VBox/vmm/gcm.h

@@ -59 +59 @@
 #endif /* IN_RING3 */
 
-VMMDECL(bool)               GCMIsEnabled(PVM pVM);
 VMM_INT_DECL(bool)          GCMShouldTrapXcptDE(PVMCPUCC pVCpu);
 VMM_INT_DECL(VBOXSTRICTRC)  GCMXcptDE(PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISSTATE pDis, uint8_t *pcbInstr);

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

@@ -39 +39 @@
 
 
-/**
- * Checks whether GCM is enabled for this VM.
- *
- * @retval  true if GCM is on.
- * @retval  false if no GCM fixer is enabled.
- *
- * @param   pVM       The cross context VM structure.
- */
-VMMDECL(bool) GCMIsEnabled(PVM pVM)
-{
-    return pVM->gcm.s.fFixerSet != GCMFIXER_NONE;
-}
-
-
-/**
- * Gets the GCM fixers configured for this VM.
- *
- * @returns The GCM provider Id.
- * @param   pVM     The cross context VM structure.
- */
-VMMDECL(int32_t) GCMGetFixers(PVM pVM)
-{
-    return pVM->gcm.s.fFixerSet;
-}
-
 
 /**
@@ -74 +49 @@
 VMM_INT_DECL(bool) GCMShouldTrapXcptDE(PVMCPUCC pVCpu)
 {
-    LogFlowFunc(("entered\n"));
+    LogFunc(("GCM checking if #DE needs trapping\n"));
     PVM pVM = pVCpu->CTX_SUFF(pVM);
-    if (!GCMIsEnabled(pVM))
-        return false;
-
-    LogFunc(("GCM checking if #DE needs trapping\n"));
 
     /* See if the enabled fixers need to intercept #DE. */
@@ -115 +86 @@
 {
     PVMCC pVM = pVCpu->CTX_SUFF(pVM);
-    Assert(GCMIsEnabled(pVM));
+    Assert(pVM->gcm.s.fFixerSet & (GCMFIXER_DBZ_DOS | GCMFIXER_DBZ_OS2 | GCMFIXER_DBZ_WIN9X));
     Assert(pDis || pcbInstr);
     RT_NOREF(pDis);

trunk/src/VBox/VMM/include/GCMInternal.h

@@ -43 +43 @@
 
 /** The saved state version. */
-#define GCM_SAVED_STATE_VERSION         1
+#define GCM_SAVED_STATE_VERSION     1
 
 /**
  * GCM Fixer Identifiers.
  * @remarks Part of saved state!
+ * @{
  */
-typedef enum GCMFIXERID
-{
-    /** None. */
-    GCMFIXER_NONE       = 0,
-    /** DOS division by zero, the worst. Includes Windows 3.x. */
-    GCMFIXER_DBZ_DOS    = RT_BIT(0),
-    /** OS/2 (any version) division by zero. */
-    GCMFIXER_DBZ_OS2    = RT_BIT(1),
-    /** Windows 9x division by zero. */
-    GCMFIXER_DBZ_WIN9X  = RT_BIT(2),
-    /** 32-bit hack. */
-    GCMFIXER_32BIT_HACK = 0x7fffffff
-} GCMFIXERID;
-AssertCompileSize(GCMFIXERID, sizeof(uint32_t));
+/** DOS division by zero, the worst. Includes Windows 3.x. */
+#define GCMFIXER_DBZ_DOS            RT_BIT_32(0)
+/** OS/2 (any version) division by zero. */
+#define GCMFIXER_DBZ_OS2            RT_BIT_32(1)
+/** Windows 9x division by zero. */
+#define GCMFIXER_DBZ_WIN9X          RT_BIT_32(2)
+/** @} */
 
 /**
@@ -71 +65 @@
     /** The provider that is active for this VM. */
     uint32_t                        fFixerSet;
-
 } GCM;
 /** Pointer to GCM VM instance data. */