Changeset 41658 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Jun 11, 2012 10:21:44 PM (13 years ago)

Author:

vboxsync

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

78464

Message:

DIS,VMM,REM,IPRT: Disassembler API adjustments.

File:

• trunk/src/VBox/VMM/include/PATMInternal.h (modified) (4 diffs)

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

@@ -273 +273 @@
     /** Size of the patch jump in the guest code. */
     uint32_t                    cbPatchJump;
-    /* Only valid for PATMFL_JUMP_CONFLICT patches */
+    /** Only valid for PATMFL_JUMP_CONFLICT patches */
     RTRCPTR                     pPatchJumpDestGC;
     /** Offset of the patch code from the beginning of the patch memory area. */
@@ -675 +675 @@
 
 
-/**
- * Read callback for disassembly function; supports reading bytes that cross a page boundary
- *
- * @returns VBox status code.
- * @param   pSrc        GC source pointer
- * @param   pDest       HC destination pointer
- * @param   size        Number of bytes to read
- * @param   pvUserdata  Callback specific user data (pCpu)
- *
- */
-int patmReadBytes(RTUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata);
+FNDISREADBYTES patmReadBytes;
 
 
@@ -706 +696 @@
 } PATMDISASM, *PPATMDISASM;
 
-inline bool PATMR3DISInstr(PVM pVM, PPATCHINFO pPatch, DISCPUSTATE *pCpu, RTRCPTR InstrGC,
-                           uint8_t *InstrHC, uint32_t *pOpsize, char *pszOutput,
-                           uint32_t fReadFlags = PATMREAD_ORGCODE)
+DECLINLINE(bool) PATMR3DISInstr(PVM pVM, PPATCHINFO pPatch, PDISCPUSTATE pCpu, RTRCPTR InstrGC,
+                                uint8_t *InstrHC, uint32_t *pOpsize, char *pszOutput,
+                                uint32_t fReadFlags = PATMREAD_ORGCODE)
 {
     PATMDISASM disinfo;
@@ -718 +708 @@
     (pCpu)->pfnReadBytes = patmReadBytes;
     (pCpu)->apvUserData[0] = &disinfo;
-    return RT_SUCCESS(DISInstr(pCpu, InstrGC, 0, pOpsize, pszOutput));
+    return RT_SUCCESS(DISInstrWithReader(InstrGC, pCpu->mode, patmReadBytes, &disinfo, pCpu, pOpsize, pszOutput));
 }
 #endif /* !IN_RC */