Changeset 41674 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 12, 2012 8:16:31 PM (13 years ago)

Author:

vboxsync

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

78481

Message:

DISCoreOne* -> DISCore*.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/EMAll.cpp (modified) (3 diffs)
• VMMR3/CPUM.cpp (modified) (1 diff)
• VMMR3/CSAM.cpp (modified) (2 diffs)
• VMMR3/DBGFDisas.cpp (modified) (1 diff)
• VMMR3/PATM.cpp (modified) (3 diffs)
• VMMR3/VMMSwitcher.cpp (modified) (1 diff)
• VMMRC/PATMRC.cpp (modified) (1 diff)

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

@@ -364 +364 @@
         State.GCPtr = NIL_RTGCPTR;
     }
-    return DISCoreOneWithReader(InstrGC, pDis->mode, emReadBytes, &State, pDis, pOpsize);
+    return DISInstrWithReader(InstrGC, pDis->mode, emReadBytes, &State, pDis, pOpsize);
 }
 
@@ -377 +377 @@
     State.GCPtr = InstrGC;
 
-    return DISCoreOneWithReader(InstrGC, pDis->mode, emReadBytes, &State, pDis, pOpsize);
+    return DISInstrWithReader(InstrGC, pDis->mode, emReadBytes, &State, pDis, pOpsize);
 }
 
@@ -460 +460 @@
 
     DISCPUMODE enmCpuMode = SELMGetCpuModeFromSelector(pVCpu, pCtxCore->eflags, pCtxCore->cs, (PCPUMSELREGHID)&pCtxCore->csHid);
-    rc = DISCoreOneWithReader(GCPtrInstr, enmCpuMode, emReadBytes, &State, pDis, pcbInstr);
+    rc = DISInstrWithReader(GCPtrInstr, enmCpuMode, emReadBytes, &State, pDis, pcbInstr);
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -3676 +3676 @@
     uint32_t cbInstr;
 #ifndef LOG_ENABLED
-    rc = DISCoreOneWithReader(GCPtrPC, enmDisCpuMode, cpumR3DisasInstrRead, &State, pCpu, &cbInstr);
+    rc = DISInstrWithReader(GCPtrPC, enmDisCpuMode, cpumR3DisasInstrRead, &State, pCpu, &cbInstr);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/VMMR3/CSAM.cpp

@@ -765 +765 @@
 {
     (pCpu)->apvUserData[1] = InstrHC;
-    (pCpu)->apvUserData[2] = (void *)(uintptr_t)InstrGC; Assert(sizeof(InstrGC) <= sizeof(pCpu->apvUserData[0]));
 #ifdef DEBUG
     return DISInstrToStrEx(InstrGC, enmCpuMode, CSAMR3ReadBytes, pVM, OPTYPE_ALL,
@@ -774 +773 @@
         return DISInstrToStrEx(InstrGC, enmCpuMode, CSAMR3ReadBytes, pVM, ~(OPTYPE_INVALID | OPTYPE_HARMLESS | OPTYPE_RRM_MASK),
                                pCpu, pcbInstr, pszOutput, cbOutput);
-    return DISCoreOneExEx(InstrGC, enmCpuMode, ~(OPTYPE_INVALID | OPTYPE_HARMLESS | OPTYPE_RRM_MASK), CSAMR3ReadBytes, pVM,
-                          pCpu, pcbInstr);
+    return DISInstEx(InstrGC, enmCpuMode, ~(OPTYPE_INVALID | OPTYPE_HARMLESS | OPTYPE_RRM_MASK), CSAMR3ReadBytes, pVM,
+                     pCpu, pcbInstr);
 #endif
 }

trunk/src/VBox/VMM/VMMR3/DBGFDisas.cpp

@@ -140 +140 @@
 
     uint32_t cbInstr;
-    int rc = DISCoreOneWithReader(GCPtr,
-                                  enmCpuMode,
-                                  dbgfR3DisasInstrRead,
-                                  &pState->Cpu,
-                                  &pState->Cpu,
-                                  &cbInstr);
+    int rc = DISInstrWithReader(GCPtr,
+                                enmCpuMode,
+                                dbgfR3DisasInstrRead,
+                                &pState->Cpu,
+                                &pState->Cpu,
+                                &cbInstr);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/VMMR3/PATM.cpp

@@ -603 +603 @@
     disinfo.pInstrGC    = InstrGCPtr32;
     disinfo.fReadFlags  = fReadFlags;
-    (pCpu)->pfnReadBytes = patmReadBytes;
-    (pCpu)->apvUserData[0] = &disinfo;
     return RT_SUCCESS(DISInstrToStrWithReader(InstrGCPtr32,
                                               (pPatch->flags & PATMFL_CODE32) ? CPUMODE_32BIT : CPUMODE_16BIT,
@@ -621 +619 @@
     disinfo.pInstrGC    = InstrGCPtr32;
     disinfo.fReadFlags  = fReadFlags;
-    (pCpu)->pfnReadBytes = patmReadBytes;
-    (pCpu)->apvUserData[0] = &disinfo;
-    return RT_SUCCESS(DISCoreOneWithReader(InstrGCPtr32,
-                                           (pPatch->flags & PATMFL_CODE32) ? CPUMODE_32BIT : CPUMODE_16BIT,
-                                           patmReadBytes, &disinfo,
-                                           pCpu, pcbInstr));
+    return RT_SUCCESS(DISInstrWithReader(InstrGCPtr32,
+                                         (pPatch->flags & PATMFL_CODE32) ? CPUMODE_32BIT : CPUMODE_16BIT,
+                                         patmReadBytes, &disinfo,
+                                         pCpu, pcbInstr));
 }
 
@@ -640 +636 @@
     disinfo.pInstrGC    = InstrGCPtr32;
     disinfo.fReadFlags  = fReadFlags;
-    (pCpu)->pfnReadBytes = patmReadBytes;
-    (pCpu)->apvUserData[0] = &disinfo;
-    return RT_SUCCESS(DISCoreOneWithReader(InstrGCPtr32, pPatch->uOpMode, patmReadBytes, &disinfo,
-                                           pCpu, pcbInstr));
+    return RT_SUCCESS(DISInstrWithReader(InstrGCPtr32, pPatch->uOpMode, patmReadBytes, &disinfo,
+                                         pCpu, pcbInstr));
 }
 

trunk/src/VBox/VMM/VMMR3/VMMSwitcher.cpp

@@ -835 +835 @@
                 DISCPUSTATE Cpu;
                 char        szDisas[256];
-                int rc = DISCoreOne((uintptr_t)pu8CodeR3 + offCode, CPUMODE_32BIT, &Cpu, &cbInstr);
+                int rc = DISInstr(pu8CodeR3 + offCode, CPUMODE_32BIT, &Cpu, &cbInstr);
                 if (RT_SUCCESS(rc))
                 {

trunk/src/VBox/VMM/VMMRC/PATMRC.cpp

@@ -523 +523 @@
             rc = VBOXSTRICTRC_TODO(rcStrict);
 #else
-            rc = DISCoreOne((uintptr_t)&pRec->patch.aPrivInstr[0], cpu.mode, &cpu, &cbOp);
+            rc = DISInstr(&pRec->patch.aPrivInstr[0], cpu.mode, &cpu, &cbOp);
             if (RT_FAILURE(rc))
             {