Changeset 19293 in vbox for trunk/src/VBox/VMM/VMMAll/VMMAll.cpp

Timestamp:

May 1, 2009 4:11:18 PM (16 years ago)

Author:

vboxsync

Message:

DBGF,VMM: SMP refactoring of the DBGF disassembler code. Changed VMMGetCpu and VMMGetCpuId to return NULL and NIL if the caller isn't an EMT. Renamed VMMGetCpuEx to VMMGetCpuById.

File:

• trunk/src/VBox/VMM/VMMAll/VMMAll.cpp (modified) (5 diffs)

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

@@ -48 +48 @@
 
 /**
- * Gets the current virtual CPU ID.
+ * Gets the ID virtual of the virtual CPU assoicated with the calling thread.
  *
- * @returns The CPU ID.
+ * @returns The CPU ID. NIL_VMCPUID if the thread isn't an EMT.
+ *
  * @param   pVM         Pointer to the shared VM handle.
- * @thread  EMT
  */
 VMMDECL(VMCPUID) VMMGetCpuId(PVM pVM)
 {
-#ifdef IN_RING3
-    /* Only emulation thread(s) allowed to ask for CPU id */
-    if (!VM_IS_EMT(pVM))
-        return 0;
-#endif
+#if defined(IN_RING3)
+    return VMR3GetVMCPUId(pVM);
 
-    /* Only emulation thread(s) allowed to ask for CPU id */
+#elif defined(IN_RING0)
+    /* ASSUME that only EMTs calls this function in R0. */
     VM_ASSERT_EMT(pVM);
-
-    /* Shortcut for one CPU */
     if (pVM->cCPUs == 1)
         return 0;
+    return HWACCMR0GetVMCPUId(pVM);
 
-#if defined(IN_RING3)
-    return VMR3GetVMCPUId(pVM);
-#elif defined(IN_RING0)
-    return HWACCMR0GetVMCPUId(pVM);
-#endif /* IN_RING0 */
-
-    AssertFailed();
+#else /* RC: Always EMT(0) */
     return 0;
+#endif
 }
 
+
 /**
- * Returns the VMCPU of the current EMT thread.
+ * Returns the VMCPU of the calling EMT.
  *
- * @returns The VMCPU pointer.
+ * @returns The VMCPU pointer. NULL if not an EMT.
+ *
  * @param   pVM         The VM to operate on.
  */
@@ -88 +82 @@
 {
 #ifdef IN_RING3
-    /* Only emulation thread(s) allowed to ask for CPU id */
-    if (!VM_IS_EMT(pVM))
-        return &pVM->aCpus[0];
-#endif
-    /* Only emulation thread(s) allowed to ask for CPU id */
+    VMCPUID idCpu = VMR3GetVMCPUId(pVM);
+    if (idCpu == NIL_VMCPUID)
+        return NULL;
+    Assert(idCpu < pVM->cCPUs);
+    return &pVM->aCpus[VMR3GetVMCPUId(pVM)];
+
+#elif defined(IN_RING0)
+    /* ASSUME that only EMTs calls this function in R0. */
     VM_ASSERT_EMT(pVM);
-
-    /* Shortcut for one CPU */
     if (pVM->cCPUs == 1)
         return &pVM->aCpus[0];
+    return HWACCMR0GetVMCPU(pVM);
 
-#ifdef IN_RING3
-    return &pVM->aCpus[VMR3GetVMCPUId(pVM)];
-#elif defined(IN_RING0)
-    return HWACCMR0GetVMCPU(pVM);
+#else /* RC: Always EMT(0) */
+    return &pVM->aCpus[0];
 #endif /* IN_RING0 */
+}
 
-    AssertFailed();
-    return &pVM->aCpus[0];
-}
 
 /**
@@ -121 +113 @@
 }
 
+
 /**
  * Returns the VMCPU of the specified virtual CPU.
  *
- * @returns The VMCPU pointer.
+ * @returns The VMCPU pointer. NULL if idCpu is invalid.
+ *
  * @param   pVM         The VM to operate on.
+ * @param   idCpu       The ID of the virtual CPU.
  */
-VMMDECL(PVMCPU) VMMGetCpuEx(PVM pVM, RTCPUID idCpu)
+VMMDECL(PVMCPU) VMMGetCpuById(PVM pVM, RTCPUID idCpu)
 {
     AssertReturn(idCpu < pVM->cCPUs, NULL);
     return &pVM->aCpus[idCpu];
 }
+
 
 /**
@@ -146 +142 @@
 }
 
+
 /**
  * Queries the current switcher
@@ -156 +153 @@
     return pVM->vmm.s.enmSwitcher;
 }
+