Changeset 18927 in vbox for trunk/src/VBox/VMM/DBGFBp.cpp

Timestamp:

Apr 16, 2009 11:41:38 AM (16 years ago)

Author:

vboxsync

Message:

Big step to separate VMM data structures for guest SMP. (pgm, em)

File:

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

trunk/src/VBox/VMM/DBGFBp.cpp

@@ -379 +379 @@
 {
     /** @todo should actually use physical address here! */
+
+    /* @todo SMP support! */
+    PVMCPU pVCpu = &pVM->aCpus[0];
+
     /*
      * Save current byte and write int3 instruction.
      */
-    int rc = MMR3ReadGCVirt(pVM, &pBp->u.Int3.bOrg, pBp->GCPtr, 1);
+    int rc = DBGFR3ReadGCVirt(pVM, pVCpu, &pBp->u.Int3.bOrg, pBp->GCPtr, 1);
     if (RT_SUCCESS(rc))
     {
         static const uint8_t s_bInt3 = 0xcc;
-        rc = MMR3WriteGCVirt(pVM, pBp->GCPtr, &s_bInt3, 1);
+        rc = DBGFR3WriteGCVirt(pVM, pVCpu,  pBp->GCPtr, &s_bInt3, 1);
     }
     return rc;
@@ -402 +406 @@
 static int dbgfR3BpInt3Disarm(PVM pVM, PDBGFBP pBp)
 {
+    /* @todo SMP support! */
+    PVMCPU pVCpu = &pVM->aCpus[0];
+
     /*
      * Check that the current byte is the int3 instruction, and restore the original one.
@@ -407 +414 @@
      */
     uint8_t bCurrent;
-    int rc = MMR3ReadGCVirt(pVM, &bCurrent, pBp->GCPtr, 1);
+    int rc = DBGFR3ReadGCVirt(pVM, pVCpu, &bCurrent, pBp->GCPtr, 1);
     if (bCurrent == 0xcc)
-        rc = MMR3WriteGCVirt(pVM, pBp->GCPtr, &pBp->u.Int3.bOrg, 1);
+        rc = DBGFR3WriteGCVirt(pVM, pVCpu,  pBp->GCPtr, &pBp->u.Int3.bOrg, 1);
     return rc;
 }
@@ -563 +570 @@
 static int dbgfR3BpRegArm(PVM pVM, PDBGFBP pBp)
 {
+    /* @todo SMP support! */
+    PVMCPU pVCpu = &pVM->aCpus[0];
+
     Assert(pBp->fEnabled);
-    return CPUMRecalcHyperDRx(pVM);
+    return CPUMRecalcHyperDRx(pVCpu);
 }
 
@@ -578 +588 @@
 static int dbgfR3BpRegDisarm(PVM pVM, PDBGFBP pBp)
 {
+    /* @todo SMP support! */
+    PVMCPU pVCpu = &pVM->aCpus[0];
+
     Assert(!pBp->fEnabled);
-    return CPUMRecalcHyperDRx(pVM);
+    return CPUMRecalcHyperDRx(pVCpu);
 }