vbox的更動 9675 路徑 trunk/src/VBox/VMM/VMMAll/EMAll.cpp

時間撮記:

2008-6-13 上午09:49:54 (16 年 以前)

作者:

vboxsync

訊息:

General cleanup of SELMToFlat.

檔案:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (修改) (3 筆差異)

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

@@ -344 +344 @@
 static RTGCPTR emConvertToFlatAddr(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu, POP_PARAMETER pParam, RTGCPTR pvAddr)
 {
-    int   prefix_seg, rc;
-    RTSEL sel;
-    CPUMSELREGHID *pSelHidReg;
-
-    prefix_seg = DISDetectSegReg(pCpu, pParam);
-    rc = DISFetchRegSegEx(pRegFrame, prefix_seg, &sel, &pSelHidReg);
-    if (VBOX_FAILURE(rc))
-        return pvAddr;
-
-    return SELMToFlat(pVM, pRegFrame->eflags, sel, pSelHidReg, pvAddr);
+    DIS_SELREG enmPrefixSeg = DISDetectSegReg(pCpu, pParam);
+    return SELMToFlat(pVM, enmPrefixSeg, pRegFrame, pvAddr);
 }
 
@@ -639 +631 @@
 
             /* Convert address; don't bother checking limits etc, as we only read here */
-            pStackVal = SELMToFlat(pVM, pRegFrame->eflags, pRegFrame->ss, &pRegFrame->ssHid, (RTGCPTR)pRegFrame->esp);
+            pStackVal = SELMToFlat(pVM, DIS_SELREG_SS, pRegFrame, (RTGCPTR)pRegFrame->esp);
             if (pStackVal == 0)
                 return VERR_EM_INTERPRETER;
@@ -2037 +2029 @@
 
     Assert(pRegFrame->eflags.u32 & X86_EFL_IF);
-    Assert(pvFault == SELMToFlat(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid, (RTGCPTR)pRegFrame->eip));
+    Assert(pvFault == SELMToFlat(pVM, DIS_SELREG_CS, pRegFrame, (RTGCPTR)pRegFrame->eip));
 
     pVM->em.s.GCPtrInhibitInterrupts = pRegFrame->eip + pCpu->opsize;