Changeset 47819 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Aug 16, 2013 7:45:01 PM (11 years ago)

Author:

vboxsync

Message:

IEM: Read unpatched bytes. Useless (disabled for ages) CSAM hooks.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (3 diffs)
• IEMAllCImpl.cpp.h (modified) (1 diff)

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

@@ -94 +94 @@
 #ifdef VBOX_WITH_RAW_MODE_NOT_R0
 # include <VBox/vmm/patm.h>
+# if defined(VBOX_WITH_CALL_RECORD) || defined(REM_MONITOR_CODE_PAGES)
+#  include <VBox/vmm/csam.h>
+# endif
 #endif
 #include "IEMInternal.h"
@@ -1019 +1022 @@
      * Read the bytes at this address.
      */
-    uint32_t cbLeftOnPage = PAGE_SIZE - (GCPtrPC & PAGE_OFFSET_MASK);
-    if (cbToTryRead > cbLeftOnPage)
-        cbToTryRead = cbLeftOnPage;
-    if (cbToTryRead > sizeof(pIemCpu->abOpcode))
-        cbToTryRead = sizeof(pIemCpu->abOpcode);
-    /** @todo PATM: Read original, unpatched bytes? EMAll.cpp doesn't seem to be
-     *        doing that. */
-    if (!pIemCpu->fBypassHandlers)
-        rc = PGMPhysRead(IEMCPU_TO_VM(pIemCpu), GCPhys, pIemCpu->abOpcode, cbToTryRead);
+    PVM pVM = IEMCPU_TO_VM(pIemCpu);
+#if defined(IN_RING3) && defined(VBOX_WITH_RAW_MODE_NOT_R0)
+    size_t cbActual;
+    if (   PATMIsEnabled(pVM)
+        && RT_SUCCESS(PATMR3ReadOrgInstr(pVM, GCPtrPC, pIemCpu->abOpcode, sizeof(pIemCpu->abOpcode), &cbActual)))
+    {
+        Log4(("decode - Read %u unpatched bytes at %RGv\n", cbActual, GCPtrPC));
+        Assert(cbActual > 0);
+        pIemCpu->cbOpcode = (uint8_t)cbActual;
+    }
     else
-        rc = PGMPhysSimpleReadGCPhys(IEMCPU_TO_VM(pIemCpu), pIemCpu->abOpcode, GCPhys, cbToTryRead);
-    if (rc != VINF_SUCCESS)
-    {
-        /** @todo status code handling */
-        Log(("iemInitDecoderAndPrefetchOpcodes: %RGv/%RGp LB %#x - read error - rc=%Rrc (!!)\n",
-             GCPtrPC, GCPhys, rc, cbToTryRead));
-        return rc;
-    }
-    pIemCpu->cbOpcode = cbToTryRead;
+#endif
+    {
+        uint32_t cbLeftOnPage = PAGE_SIZE - (GCPtrPC & PAGE_OFFSET_MASK);
+        if (cbToTryRead > cbLeftOnPage)
+            cbToTryRead = cbLeftOnPage;
+        if (cbToTryRead > sizeof(pIemCpu->abOpcode))
+            cbToTryRead = sizeof(pIemCpu->abOpcode);
+
+        if (!pIemCpu->fBypassHandlers)
+            rc = PGMPhysRead(pVM, GCPhys, pIemCpu->abOpcode, cbToTryRead);
+        else
+            rc = PGMPhysSimpleReadGCPhys(pVM, pIemCpu->abOpcode, GCPhys, cbToTryRead);
+        if (rc != VINF_SUCCESS)
+        {
+            /** @todo status code handling */
+            Log(("iemInitDecoderAndPrefetchOpcodes: %RGv/%RGp LB %#x - read error - rc=%Rrc (!!)\n",
+                 GCPtrPC, GCPhys, rc, cbToTryRead));
+            return rc;
+        }
+        pIemCpu->cbOpcode = cbToTryRead;
+    }
 
     return VINF_SUCCESS;
@@ -1137 +1153 @@
     /*
      * Read the bytes at this address.
+     *
+     * We read all unpatched bytes in iemInitDecoderAndPrefetchOpcodes already,
+     * and since PATM should only patch the start of an instruction there
+     * should be no need to check again here.
      */
     if (!pIemCpu->fBypassHandlers)

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -814 +814 @@
     if (rcStrict != VINF_SUCCESS)
         return rcStrict;
+
+#if defined(IN_RING3) && defined(VBOX_WITH_RAW_MODE) && defined(VBOX_WITH_CALL_RECORD)
+    /*
+     * CASM hook for recording interesting indirect calls.
+     */
+    if (   !pCtx->eflags.Bits.u1IF
+        && (pCtx->cr0 & X86_CR0_PG)
+        && !CSAMIsEnabled(IEMCPU_TO_VM(pIemCpu))
+        && pIemCpu->uCpl == 0)
+    {
+        EMSTATE enmState = EMGetState(IEMCPU_TO_VMCPU(pIemCpu));
+        if (   enmState == EMSTATE_IEM_THEN_REM
+            || enmState == EMSTATE_IEM
+            || enmState == EMSTATE_REM)
+            CSAMR3RecordCallAddress(IEMCPU_TO_VM(pIemCpu), pCtx->eip);
+    }
+#endif
 
     pCtx->rip = uNewPC;