Changeset 1325 in vbox

Timestamp:

Mar 8, 2007 12:02:11 PM (18 years ago)

Author:

vboxsync

Message:

Cleaned up

File:

• trunk/src/VBox/VMM/TRPM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/TRPM.cpp

@@ -423 +423 @@
 static DECLCALLBACK(int) trpmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t u32Version);
 static DECLCALLBACK(int) trpmGuestIDTWriteHandler(PVM pVM, RTGCPTR GCPtr, void *pvPtr, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
+static int               trpmR3ClearGuestTrapHandler(PVM pVM, unsigned iTrap);
 
 
@@ -868 +869 @@
     {
         /* Clear all handlers */
+        Log(("TRPMR3SyncIDT: Clear all trap handlers.\n"));
         /** @todo inefficient, but simple */
         for (unsigned iGate=0;iGate<256;iGate++)
-            TRPMR3SetGuestTrapHandler(pVM, iGate, TRPM_INVALID_HANDLER);
+            trpmR3ClearGuestTrapHandler(pVM, iGate);
 
         /* Scan them all (only the first time) */
@@ -1103 +1105 @@
 
 /**
+ * Clear guest trap/interrupt gate handler
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   iTrap       Interrupt/trap number.
+ */
+static int trpmR3ClearGuestTrapHandler(PVM pVM, unsigned iTrap)
+{
+    /*
+     * Validate.
+     */
+    if (iTrap >= ELEMENTS(pVM->trpm.s.aIdt))
+    {
+        AssertMsg(iTrap < TRPM_HANDLER_INT_BASE, ("Illegal gate number %d!\n", iTrap));
+        return VERR_INVALID_PARAMETER;
+    }
+
+    if (ASMBitTest(&pVM->trpm.s.au32IdtPatched[0], iTrap))
+        trpmR3ClearPassThroughHandler(pVM, iTrap);
+
+    pVM->trpm.s.aGuestTrapHandler[iTrap] = TRPM_INVALID_HANDLER;
+    return VINF_SUCCESS;
+}
+
+/**
  * Set guest trap/interrupt gate handler
  * Used for setting up trap gates used for kernel calls.
@@ -1133 +1160 @@
         /* clear trap handler */
         Log(("TRPMR3SetGuestTrapHandler: clear handler %x\n", iTrap));
-
-        if (ASMBitTest(&pVM->trpm.s.au32IdtPatched[0], iTrap))
-            trpmR3ClearPassThroughHandler(pVM, iTrap);
-
-        pVM->trpm.s.aGuestTrapHandler[iTrap] = TRPM_INVALID_HANDLER;
-        return VINF_SUCCESS;
+        return trpmR3ClearGuestTrapHandler(pVM, iTrap);
     }