Changeset 25554 in vbox

Timestamp:

Dec 22, 2009 10:09:05 AM (15 years ago)

Author:

vboxsync

Message:

trpmGCTrap0dHandler: use EMInterpretDisasOneEx
EMInterpretDisasOneEx: do not directly access RC pointers

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/EMAll.cpp (modified) (3 diffs)
• VMMGC/TRPMGCHandlers.cpp (modified) (1 diff)

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

@@ -258 +258 @@
 VMMDECL(int) EMInterpretDisasOneEx(PVM pVM, PVMCPU pVCpu, RTGCUINTPTR GCPtrInstr, PCCPUMCTXCORE pCtxCore, PDISCPUSTATE pDis, unsigned *pcbInstr)
 {
-    int rc;
-
-#ifndef IN_RC
+    int        rc;
     EMDISSTATE State;
 
@@ -266 +264 @@
     State.pVCpu = pVCpu;
 
+#ifdef IN_RC
+    State.GCPtr = GCPtrInstr;
+#else /* ring 0/3 */
     rc = PGMPhysSimpleReadGCPtr(pVCpu, &State.aOpcode, GCPtrInstr, sizeof(State.aOpcode));
     if (RT_SUCCESS(rc))
@@ -286 +287 @@
 
     rc = DISCoreOneEx(GCPtrInstr, SELMGetCpuModeFromSelector(pVM, pCtxCore->eflags, pCtxCore->cs, (PCPUMSELREGHID)&pCtxCore->csHid),
-#ifdef IN_RC
-                          NULL, NULL,
-#else
-                          EMReadBytes, &State,
-#endif
-                          pDis, pcbInstr);
+                      EMReadBytes, &State,
+                      pDis, pcbInstr);
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -862 +862 @@
     DISCPUSTATE Cpu;
     uint32_t    cbOp;
-    rc = DISCoreOneEx((RTGCUINTPTR)PC, cBits == 32 ? CPUMODE_32BIT : cBits == 16 ? CPUMODE_16BIT : CPUMODE_64BIT,
-                      NULL, NULL, &Cpu, &cbOp);
+    rc = EMInterpretDisasOneEx(pVM, pVCpu, (RTGCUINTPTR)PC, pRegFrame, &Cpu, &cbOp);
     if (RT_FAILURE(rc))
     {