Changeset 13532 in vbox for trunk/src/VBox/VMM/PATM

Timestamp:

Oct 23, 2008 12:39:48 PM (16 years ago)

Author:

vboxsync

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

38381

Message:

CPUMQueryGuestCtxPtr doesn't need to return a status. It can never fail.

Location:

trunk/src/VBox/VMM/PATM

Files:

• CSAM.cpp (modified) (1 diff)
• PATM.cpp (modified) (4 diffs)
• VMMAll/PATMAll.cpp (modified) (3 diffs)

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

@@ -2405 +2405 @@
                                                        0x2F};      /* OpenBSD 4.0 after install */
 
-                rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
-                AssertRC(rc);   /* can't fail */
+                pCtx = CPUMQueryGuestCtxPtr(pVM);
 
                 for (unsigned i=0;i<RT_ELEMENTS(aOpenBsdPushCSOffset);i++)

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

@@ -419 +419 @@
     {
         PCPUMCTX pCtx;
-        int      rc;
 
         /* Update CPUMCTX guest context pointer. */
@@ -428 +427 @@
         RTAvloU32DoWithAll(&pVM->patm.s.PatchLookupTreeHC->PatchTree, true, RelocatePatches, (void *)pVM);
 
-        rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
-        AssertRC(rc);
+        pCtx = CPUMQueryGuestCtxPtr(pVM);
 
         /* If we are running patch code right now, then also adjust EIP. */
@@ -3993 +3991 @@
 
     /* Make sure the code selector is wide open; otherwise refuse. */
-    CPUMQueryGuestCtxPtr(pVM, &pCtx);
+    pCtx = CPUMQueryGuestCtxPtr(pVM);
     if (CPUMGetGuestCPL(pVM, CPUMCTX2CORE(pCtx)) == 0)
     {
@@ -6183 +6181 @@
             RTRCPTR retaddr;
             PCPUMCTX pCtx;
-            int      rc;
-
-            rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
-            AssertRC(rc);
+
+            pCtx = CPUMQueryGuestCtxPtr(pVM);
 
             rc = PGMPhysSimpleReadGCPtr(pVM, &retaddr, pCtx->esp, sizeof(retaddr));

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

@@ -71 +71 @@
 #ifdef PATM_EMULATE_SYSENTER
     PCPUMCTX pCtx;
-    int      rc;
 
     /* Check if the sysenter handler has changed. */
-    rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
-    AssertRC(rc);
-    if (   rc == VINF_SUCCESS
-        && pCtx->SysEnter.cs  != 0
+    pCtx = CPUMQueryGuestCtxPtr(pVM);
+    if (   pCtx->SysEnter.cs  != 0
         && pCtx->SysEnter.eip != 0
        )
@@ -301 +298 @@
 VMMDECL(bool) PATMAreInterruptsEnabled(PVM pVM)
 {
-    PCPUMCTX pCtx = 0;
-    int      rc;
-
-    rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
-    AssertRC(rc);
+    PCPUMCTX pCtx = CPUMQueryGuestCtxPtr(pVM);
 
     return PATMAreInterruptsEnabledByCtxCore(pVM, CPUMCTX2CORE(pCtx));
@@ -389 +382 @@
 VMMDECL(int) PATMSysCall(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
-    PCPUMCTX pCtx;
-    int      rc;
-
-    rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
-    AssertRCReturn(rc, VINF_EM_RAW_RING_SWITCH);
+    PCPUMCTX pCtx = CPUMQueryGuestCtxPtr(pVM);
 
     if (pCpu->pCurInstr->opcode == OP_SYSENTER)