Changeset 46150 in vbox for trunk/src

Timestamp:

May 17, 2013 5:21:45 PM (12 years ago)

Author:

vboxsync

Message:

PATM: Patch symbols.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PATM.cpp (modified) (7 diffs)
• VMMR3/PATMPatch.cpp (modified) (2 diffs)
• VMMR3/PATMR3Dbg.cpp (modified) (6 diffs)
• include/PATMInternal.h (modified) (1 diff)

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

@@ -182 +182 @@
     pVM->patm.s.pGCStackGC  = MMHyperR3ToRC(pVM, pVM->patm.s.pGCStackHC);
 
+    patmR3DbgInit(pVM);
+
     /*
      * Hypervisor memory for GC status data (read/write)
@@ -3000 +3002 @@
     }
 
+    patmR3DbgAddPatch(pVM, pPatchRec);
+
     PATM_LOG_RAW_PATCH_INSTR(pVM, pPatch, patmGetInstructionString(pPatch->opcode, pPatch->flags));
 
@@ -3150 +3154 @@
             fInserted = RTAvloU32Insert(&pVM->patm.s.PatchLookupTreeHC->PatchTreeByPatchAddr, &pPatchRec->CoreOffset);
             AssertMsg(fInserted, ("RTAvlULInsert failed for %x\n", pPatchRec->CoreOffset.Key));
+            patmR3DbgAddPatch(pVM, pPatchRec);
 
             pPatch->uState = PATCH_ENABLED;
@@ -3224 +3229 @@
     fInserted = RTAvloU32Insert(&pVM->patm.s.PatchLookupTreeHC->PatchTreeByPatchAddr, &pPatchRec->CoreOffset);
     AssertMsg(fInserted, ("RTAvlULInsert failed for %x\n", pPatchRec->CoreOffset.Key));
+    patmR3DbgAddPatch(pVM, pPatchRec);
 
     pPatch->uState = PATCH_ENABLED;
@@ -3352 +3358 @@
         goto failure;
     }
+
+    patmR3DbgAddPatch(pVM, pPatchRec);
 
 #ifdef LOG_ENABLED
@@ -3503 +3511 @@
         goto failure;
     }
+    patmR3DbgAddPatch(pVM, pPatchRec);
 
     /* size of patch block */
@@ -4586 +4595 @@
         }
 #endif
+
+        /* Add debug symbol. */
+        patmR3DbgAddPatch(pVM, pPatchRec);
     }
     /* Free leftover lock if any. */

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

@@ -23 +23 @@
 #define LOG_GROUP LOG_GROUP_PATM
 #include <VBox/vmm/patm.h>
-#include <VBox/vmm/stam.h>
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/cpum.h>
@@ -29 +28 @@
 #include <VBox/vmm/em.h>
 #include <VBox/vmm/trpm.h>
-#include <VBox/param.h>
-#include <iprt/avl.h>
+#include <VBox/vmm/csam.h>
 #include "PATMInternal.h"
 #include <VBox/vmm/vm.h>
-#include <VBox/vmm/csam.h>
-
-#include <VBox/dbg.h>
+#include <VBox/param.h>
+
 #include <VBox/err.h>
 #include <VBox/log.h>
+#include <VBox/dis.h>
+#include <VBox/disopcode.h>
+
 #include <iprt/assert.h>
 #include <iprt/asm.h>
 #include <iprt/string.h>
-#include <VBox/dis.h>
-#include <VBox/disopcode.h>
-
-#include <stdlib.h>
-#include <stdio.h>
+
 #include "PATMA.h"
 #include "PATMPatch.h"

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

@@ -21 +21 @@
 #define LOG_GROUP LOG_GROUP_PATM
 #include <VBox/vmm/patm.h>
+#include <VBox/vmm/dbgf.h>
 #include <VBox/vmm/hm.h>
 #include "PATMInternal.h"
+#include "PATMA.h"
 #include <VBox/vmm/vm.h>
 #include <VBox/err.h>
@@ -43 +45 @@
         } while (0)
 
-
-
+/** Adds a structure member to a debug (pseudo) module as a symbol. */
+#define ADD_FUNC(a_hDbgMod, a_BaseRCPtr, a_FuncRCPtr, a_cbFunc, a_pszName) \
+        do { \
+            int rcAddFunc = RTDbgModSymbolAdd(hDbgMod, a_pszName, 0 /*iSeg*/, \
+                                              (RTRCUINTPTR)a_FuncRCPtr - (RTRCUINTPTR)(a_BaseRCPtr),  \
+                                              a_cbFunc, 0 /*fFlags*/, NULL /*piOrdinal*/); \
+            AssertRC(rcAddFunc); \
+        } while (0)
+
+
+
+/**
+ * Called by PATMR3Init.
+ *
+ * @param   pVM                 The cross context VM structure.
+ */
 void patmR3DbgInit(PVM pVM)
 {
@@ -51 +67 @@
 
 
+/**
+ * Called by PATMR3Term.
+ *
+ * @param   pVM                 The cross context VM structure.
+ */
 void patmR3DbgTerm(PVM pVM)
 {
@@ -61 +82 @@
 
 
+/**
+ * Called by when the patch memory is reinitialized.
+ *
+ * @param   pVM                 The cross context VM structure.
+ */
 void patmR3DbgReset(PVM pVM)
 {
@@ -69 +95 @@
 }
 
+
+/**
+ * Called when a new patch is added or when first populating the address space.
+ *
+ * @param   pVM                 The cross context VM structure.
+ * @param   pPatchRec           The patch record.
+ */
+void patmR3DbgAddPatch(PVM pVM, PPATMPATCHREC pPatchRec)
+{
+    if (   pVM->patm.s.hDbgModPatchMem != NIL_RTDBGMOD
+        && pPatchRec->patch.pPatchBlockOffset > 0
+        && !(pPatchRec->patch.flags & PATMFL_GLOBAL_FUNCTIONS))
+    {
+        /** @todo find a cheap way of checking whether we've already added the patch.
+         *        Using a flag would be nice, except I don't want to consider saved
+         *        state considerations right now (I don't recall if we're still
+         *        depending on structure layout there or not). */
+        int  rc;
+        char szName[256];
+
+#define ADD_SZ(a_sz)   \
+        do { \
+            if (cbLeft >= sizeof(a_sz)) \
+            { \
+                memcpy(pszName, a_sz, sizeof(a_sz)); \
+                pszName += sizeof(a_sz); \
+                cbLeft -= sizeof(a_sz);\
+            }\
+        } while (0)
+
+        /* Start the name off with the address of the guest code. */
+        size_t cch = RTStrPrintf(szName, sizeof(szName), "Patch_%#08x", pPatchRec->patch.pPrivInstrGC);
+        char   *pszName = &szName[cch];
+        size_t  cbLeft  = sizeof(szName) - cch;
+
+        /* Append flags. */
+        uint64_t fFlags  = pPatchRec->patch.flags;
+        if (fFlags & PATMFL_INTHANDLER)
+            ADD_SZ("_IntHandler");
+        if (fFlags & PATMFL_SYSENTER)
+            ADD_SZ("_SysEnter");
+        if (fFlags & PATMFL_GUEST_SPECIFIC)
+            ADD_SZ("_GuestSpecific");
+        if (fFlags & PATMFL_USER_MODE)
+            ADD_SZ("_UserMode");
+        if (fFlags & PATMFL_IDTHANDLER)
+            ADD_SZ("_IdtHandler");
+        if (fFlags & PATMFL_TRAPHANDLER)
+            ADD_SZ("_TrapHandler");
+        if (fFlags & PATMFL_DUPLICATE_FUNCTION)
+            ADD_SZ("_DupFunc");
+        if (fFlags & PATMFL_REPLACE_FUNCTION_CALL)
+            ADD_SZ("_ReplFunc");
+        if (fFlags & PATMFL_TRAPHANDLER_WITH_ERRORCODE)
+            ADD_SZ("_TrapHandlerErrCd");
+        if (fFlags & PATMFL_MMIO_ACCESS)
+            ADD_SZ("_MmioAccess");
+        if (fFlags & PATMFL_SYSENTER_XP)
+            ADD_SZ("_SysEnterXP");
+        if (fFlags & PATMFL_INT3_REPLACEMENT)
+            ADD_SZ("_Int3Replacement");
+        if (fFlags & PATMFL_SUPPORT_CALLS)
+            ADD_SZ("_SupportCalls");
+        if (fFlags & PATMFL_SUPPORT_INDIRECT_CALLS)
+            ADD_SZ("_SupportIndirectCalls");
+        if (fFlags & PATMFL_IDTHANDLER_WITHOUT_ENTRYPOINT)
+            ADD_SZ("_IdtHandlerWE");
+        if (fFlags & PATMFL_INHIBIT_IRQS)
+            ADD_SZ("_InhibitIrqs");
+        if (fFlags & PATMFL_RECOMPILE_NEXT)
+            ADD_SZ("_RecompileNext");
+        if (fFlags & PATMFL_CALLABLE_AS_FUNCTION)
+            ADD_SZ("_Callable");
+        if (fFlags & PATMFL_TRAMPOLINE)
+            ADD_SZ("_Trampoline");
+        if (fFlags & PATMFL_PATCHED_GUEST_CODE)
+            ADD_SZ("_PatchedGuestCode");
+        if (fFlags & PATMFL_MUST_INSTALL_PATCHJMP)
+            ADD_SZ("_MustInstallPatchJmp");
+        if (fFlags & PATMFL_INT3_REPLACEMENT_BLOCK)
+            ADD_SZ("_Int3ReplacementBlock");
+        if (fFlags & PATMFL_EXTERNAL_JUMP_INSIDE)
+            ADD_SZ("_ExtJmp");
+        if (fFlags & PATMFL_CODE_REFERENCED)
+            ADD_SZ("_CodeRefed");
+
+        /* If we have a symbol near the guest address, append that. */
+        if (cbLeft > 8)
+        {
+            DBGFSYMBOL Symbol;
+            RTGCINTPTR offDisp;
+
+            rc = DBGFR3SymbolByAddr(pVM, pPatchRec->patch.pPrivInstrGC, &offDisp, &Symbol);
+            if (RT_SUCCESS(rc))
+            {
+                ADD_SZ("__");
+                RTStrCopy(pszName, cbLeft, Symbol.szName);
+            }
+        }
+
+        /* Add it (may fail due to enable/disable patches). */
+        RTDbgModSymbolAdd(pVM->patm.s.hDbgModPatchMem, szName, 0 /*iSeg*/,
+                          pPatchRec->patch.pPatchBlockOffset,
+                          pPatchRec->patch.cbPatchBlockSize,
+                          0 /*fFlags*/, NULL /*piOrdinal*/);
+
+    }
+}
+
+
+/**
+ * Enumeration callback used by patmR3DbgAddPatches
+ *
+ * @returns 0 (continue enum)
+ * @param   pNode               The patch record node.
+ * @param   pvUser              The cross context VM structure.
+ */
+static DECLCALLBACK(int) patmR3DbgAddPatchCallback(PAVLOU32NODECORE pNode, void *pvUser)
+{
+    patmR3DbgAddPatch((PVM)pvUser, (PPATMPATCHREC)pNode);
+    return 0;
+}
+
+
+/**
+ * Populates an empty "patches" (hDbgModPatchMem) module with patch symbols.
+ *
+ * @param   pVM                 The cross context VM structure.
+ * @param   hDbgMod             The debug module handle.
+ */
+static void patmR3DbgAddPatches(PVM pVM, RTDBGMOD hDbgMod)
+{
+    /*
+     * Global functions.
+     */
+    ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperCallGC, PATMLookupAndCallRecord.size, "PATMLookupAndCall");
+    ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperRetGC,  PATMRetFunctionRecord.size,   "PATMRetFunction");
+    ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperJumpGC, PATMLookupAndJumpRecord.size, "PATMLookupAndJump");
+    ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperIretGC, PATMIretFunctionRecord.size,  "PATMIretFunction");
+
+    /*
+     * The patches.
+     */
+    RTAvloU32DoWithAll(&pVM->patm.s.PatchLookupTreeHC->PatchTree, true /*fFromLeft*/, patmR3DbgAddPatchCallback, pVM);
+}
 
 
@@ -120 +291 @@
     if (RT_SUCCESS(rc))
     {
-        /** @todo add global functions  and  all existing patches. */
-
-        rc = RTDbgAsModuleLink(hDbgAs, hDbgMod, pVM->patm.s.pGCStateGC, 0 /*fFlags/*/);
+        pVM->patm.s.hDbgModPatchMem = hDbgMod;
+        patmR3DbgAddPatches(pVM, hDbgMod);
+
+        rc = RTDbgAsModuleLink(hDbgAs, hDbgMod, pVM->patm.s.pPatchMemGC, 0 /*fFlags/*/);
         AssertLogRelRC(rc);
-        pVM->patm.s.hDbgModPatchMem = hDbgMod;
-    }
-}
-
-
+    }
+}
+
+

trunk/src/VBox/VMM/include/PATMInternal.h

@@ -657 +657 @@
 void patmR3DbgTerm(PVM pVM);
 void patmR3DbgReset(PVM pVM);
-//void patmR3DbgNewPatch(PVM pVM, );
-
-#endif
+void patmR3DbgAddPatch(PVM pVM, PPATMPATCHREC pPatchRec);
+
+#endif