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

Timestamp:

Sep 21, 2007 2:08:19 PM (17 years ago)

Author:

vboxsync

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

24710

Message:

Cleaned up disassembler

Location:

trunk/src/VBox/VMM/PATM

Files:

• CSAM.cpp (modified) (8 diffs)
• PATM.cpp (modified) (1 diff)
• PATMInternal.h (modified) (2 diffs)

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

@@ -593 +593 @@
  *
  */
-int32_t CSAMR3ReadBytes(RTHCUINTPTR pSrc, uint8_t *pDest, uint32_t size, RTHCUINTPTR dwUserdata)
-{
-    DISCPUSTATE  *pCpu     = (DISCPUSTATE *)dwUserdata;
-    PVM           pVM      = (PVM)pCpu->dwUserData[0];
-    RTHCUINTPTR   pInstrHC = pCpu->dwUserData[1];
-    RTGCUINTPTR   pInstrGC = pCpu->dwUserData[2];
+static DECLCALLBACK(int) CSAMR3ReadBytes(RTHCUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata)
+{
+    DISCPUSTATE  *pCpu     = (DISCPUSTATE *)pvUserdata;
+    PVM           pVM      = (PVM)pCpu->apvUserData[0];
+    RTHCUINTPTR   pInstrHC = (RTHCUINTPTR)pCpu->apvUserData[1];
+    RTGCUINTPTR   pInstrGC = (RTGCUINTPTR)pCpu->apvUserData[2];
     int           orgsize  = size;
-
-    Assert(sizeof(RTHCUINTPTR) <= sizeof(pCpu->dwUserData[0]));
-    Assert(sizeof(RTGCUINTPTR) <= sizeof(pCpu->dwUserData[0]));
 
     /* We are not interested in patched instructions, so read the original opcode bytes. */
@@ -638 +635 @@
 }
 
-inline bool CSAMR3DISInstr(PVM pVM, DISCPUSTATE *pCpu, RTGCPTR InstrGC, uint8_t *InstrHC, uint32_t *pOpsize, char *pszOutput)
+inline int CSAMR3DISInstr(PVM pVM, DISCPUSTATE *pCpu, RTGCPTR InstrGC, uint8_t *InstrHC, uint32_t *pOpsize, char *pszOutput)
 {
     (pCpu)->pfnReadBytes  = CSAMR3ReadBytes;
-    (pCpu)->dwUserData[0] = (RTHCUINTPTR)pVM;
-    (pCpu)->dwUserData[1] = (RTHCUINTPTR)InstrHC;
-    (pCpu)->dwUserData[2] = (RTHCUINTPTR)InstrGC;
+    (pCpu)->apvUserData[0] = pVM;
+    (pCpu)->apvUserData[1] = InstrHC;
+    (pCpu)->apvUserData[2] = (void *)InstrGC; Assert(sizeof(InstrGC) <= sizeof(pCpu->apvUserData[0]));
 #ifdef DEBUG
     return DISInstrEx(pCpu, InstrGC, 0, pOpsize, pszOutput, OPTYPE_ALL);
@@ -718 +715 @@
             DISCPUSTATE  cpu;
             uint8_t     *pCurInstrHC = 0;
-            bool         disret;
 
             if (cbInstr + opsize >= SIZEOF_NEARJUMP32)
@@ -741 +737 @@
 
             cpu.mode = (pPage->fCode32) ? CPUMODE_32BIT : CPUMODE_16BIT;
-            disret = CSAMR3DISInstr(pVM, &cpu, pCurInstrGC, pCurInstrHC, &opsize, NULL);
-            Assert(disret == true);
-            if (disret == false)
+            rc = CSAMR3DISInstr(pVM, &cpu, pCurInstrGC, pCurInstrHC, &opsize, NULL);
+            Assert(VBOX_SUCCESS(rc));
+            if (VBOX_FAILURE(rc))
                 break;
         }
@@ -889 +885 @@
             uint32_t     opsize;
             uint8_t     *pCurInstrHC = 0;
-            bool         disret;
+            int          rc2;
 #ifdef DEBUG
             char szOutput[256];
@@ -924 +920 @@
                 STAM_PROFILE_START(&pVM->csam.s.StatTimeDisasm, a);
 #ifdef DEBUG
-                disret = CSAMR3DISInstr(pVM, &cpu, pCurInstrGC, pCurInstrHC, &opsize, szOutput);
-                if (disret == true) Log(("CSAM Call Analysis: %s", szOutput));
+                rc2 = CSAMR3DISInstr(pVM, &cpu, pCurInstrGC, pCurInstrHC, &opsize, szOutput);
+                if (VBOX_SUCCESS(rc2)) Log(("CSAM Call Analysis: %s", szOutput));
 #else
-                disret = CSAMR3DISInstr(pVM, &cpu, pCurInstrGC, pCurInstrHC, &opsize, NULL);
+                rc2 = CSAMR3DISInstr(pVM, &cpu, pCurInstrGC, pCurInstrHC, &opsize, NULL);
 #endif
                 STAM_PROFILE_STOP(&pVM->csam.s.StatTimeDisasm, a);
-                if (disret == false)
+                if (VBOX_FAILURE(rc2))
                 {
-                    Log(("Disassembly failed at %VGv (probably page not present) -> return to caller\n", pCurInstrGC));
+                    Log(("Disassembly failed at %VGv with %Vrc (probably page not present) -> return to caller\n", pCurInstrGC, rc2));
                     goto done;
                 }
@@ -1073 +1069 @@
     uint32_t opsize;
     R3PTRTYPE(uint8_t *) pCurInstrHC = 0;
-    bool disret;
+    int rc2;
 
 #ifdef DEBUG
@@ -1134 +1130 @@
         STAM_PROFILE_START(&pVM->csam.s.StatTimeDisasm, a);
 #ifdef DEBUG
-        disret = CSAMR3DISInstr(pVM, &cpu, pCurInstrGC, pCurInstrHC, &opsize, szOutput);
-        if (disret == true) Log(("CSAM Analysis: %s", szOutput));
+        rc2 = CSAMR3DISInstr(pVM, &cpu, pCurInstrGC, pCurInstrHC, &opsize, szOutput);
+        if (VBOX_SUCCESS(rc2)) Log(("CSAM Analysis: %s", szOutput));
 #else
         disret = CSAMR3DISInstr(pVM, &cpu, pCurInstrGC, pCurInstrHC, &opsize, NULL);
 #endif
         STAM_PROFILE_STOP(&pVM->csam.s.StatTimeDisasm, a);
-        if (disret == false)
-        {
-            Log(("Disassembly failed at %VGv (probably page not present) -> return to caller\n", pCurInstrGC));
+        if (VBOX_FAILURE(rc2))
+        {
+            Log(("Disassembly failed at %VGv with %Vrc (probably page not present) -> return to caller\n", pCurInstrGC, rc2));
             rc = VINF_SUCCESS;
             goto done;

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

@@ -506 +506 @@
  * @param   pDest       HC destination pointer
  * @param   size        Number of bytes to read
- * @param   dwUserdata  Callback specific user data (pCpu)
- *
- */
-int32_t patmReadBytes(RTHCUINTPTR pSrc, uint8_t *pDest, uint32_t size, RTHCUINTPTR dwUserdata)
-{
-    DISCPUSTATE  *pCpu     = (DISCPUSTATE *)dwUserdata;
-    PATMDISASM   *pDisInfo = (PATMDISASM *)pCpu->dwUserData[0];
+ * @param   pvUserdata  Callback specific user data (pCpu)
+ *
+ */
+int patmReadBytes(RTHCUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata)
+{
+    DISCPUSTATE  *pCpu     = (DISCPUSTATE *)pvUserdata;
+    PATMDISASM   *pDisInfo = (PATMDISASM *)pCpu->apvUserData[0];
     int           orgsize  = size;
 

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

@@ -662 +662 @@
  * @param   pDest       HC destination pointer
  * @param   size        Number of bytes to read
- * @param   dwUserdata  Callback specific user data (pCpu)
- *
- */
-int32_t patmReadBytes(RTHCUINTPTR pSrc, uint8_t *pDest, uint32_t size, RTHCUINTPTR dwUserdata);
+ * @param   pvUserdata  Callback specific user data (pCpu)
+ *
+ */
+int patmReadBytes(RTHCUINTPTR pSrc, uint8_t *pDest, unsigned size, void *pvUserdata);
 
 
@@ -697 +697 @@
     disinfo.fReadFlags = fReadFlags;
     (pCpu)->pfnReadBytes  = patmReadBytes;
-    (pCpu)->dwUserData[0] = (RTHCUINTPTR)&disinfo;
-    return DISInstr(pCpu, InstrGC, 0, pOpsize, pszOutput);
+    (pCpu)->apvUserData[0] = &disinfo;
+    return VBOX_SUCCESS(DISInstr(pCpu, InstrGC, 0, pOpsize, pszOutput));
 }
 #endif /* !IN_GC */