Changeset 4953 in vbox for trunk/src/VBox/VMM/DBGFDisas.cpp

Timestamp:

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

Author:

vboxsync

Message:

Cleaned up disassembler

File:

• trunk/src/VBox/VMM/DBGFDisas.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/DBGFDisas.cpp

@@ -40 +40 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static DECLCALLBACK(int32_t) dbgfR3DisasInstrRead(RTHCUINTPTR pSrc, uint8_t *pDest, uint32_t size, RTHCUINTPTR dwUserdata);
+static DECLCALLBACK(int) dbgfR3DisasInstrRead(RTHCUINTPTR pSrc, uint8_t *pDest, uint32_t size, void *pvUserdata);
 
 
@@ -65 +65 @@
     /** Pointer to the current page - GC Ptr. */
     RTGCPTR         pvPageGC;
-    /** The rc of the operation.
-     * @todo r=bird: it's rather annoying that we have to keep track of the status code of the operation.
-     *               When we've got time we should adjust the disassembler to use VBox status codes and not
-     *               boolean returns.
-     */
-    int             rc;
     /** Pointer to the next instruction (relative to GCPtrSegBase). */
     RTGCUINTPTR     GCPtrNext;
@@ -97 +91 @@
     pState->pvPageGC        = 0;
     pState->pvPageHC        = NULL;
-    pState->rc              = VINF_SUCCESS;
     pState->pVM             = pVM;
     Assert((uintptr_t)GCPtr == GCPtr);
     uint32_t cbInstr;
-    if (DISInstr(&pState->Cpu, GCPtr, 0, &cbInstr, NULL))
+    int rc = DISInstr(&pState->Cpu, GCPtr, 0, &cbInstr, NULL);
+    if (VBOX_SUCCESS(rc))
     {
         pState->GCPtrNext = GCPtr + cbInstr;
         return VINF_SUCCESS;
     }
-    if (VBOX_FAILURE(pState->rc))
-        return pState->rc;
-    return VERR_GENERAL_FAILURE;
+    return rc;
 }
 
@@ -123 +115 @@
     pState->rc              = VINF_SUCCESS;
     uint32_t cbInstr;
-    if (DISInstr(&pState->Cpu, (void *)pState->GCPtrNext, 0, &cbInstr, NULL))
+    int rc = DISInstr(&pState->Cpu, (void *)pState->GCPtrNext, 0, &cbInstr, NULL);
+    if (VBOX_SUCCESS(rc))
     {
         pState->GCPtrNext = GCPtr + cbInstr;
         return VINF_SUCCESS;
     }
-    if (VBOX_FAILURE(pState->rc))
-        return pState->rc;
-    return VERR_GENERAL_FAILURE;
+    return rc;
 }
 #endif
@@ -146 +137 @@
  *                      In this context it's always pointer to the Core of a DBGFDISASSTATE.
  */
-static DECLCALLBACK(int32_t) dbgfR3DisasInstrRead(RTHCUINTPTR PtrSrc, uint8_t *pu8Dst, uint32_t cbRead, RTHCUINTPTR uDisCpu)
-{
-    PDBGFDISASSTATE pState = (PDBGFDISASSTATE)uDisCpu;
+static DECLCALLBACK(int) dbgfR3DisasInstrRead(RTHCUINTPTR PtrSrc, uint8_t *pu8Dst, unsigned cbRead, void *pvDisCpu)
+{
+    PDBGFDISASSTATE pState = (PDBGFDISASSTATE)pvDisCpu;
     Assert(cbRead > 0);
     for (;;)
@@ -158 +149 @@
             ||  (GCPtr >> PAGE_SHIFT) != (pState->pvPageGC >> PAGE_SHIFT))
         {
+            int rc = VINF_SUCCESS;
+
             /* translate the address */
             pState->pvPageGC = GCPtr & PAGE_BASE_GC_MASK;
@@ -164 +157 @@
                 pState->pvPageHC = MMHyperGC2HC(pState->pVM, pState->pvPageGC);
                 if (!pState->pvPageHC)
-                    pState->rc = VERR_INVALID_POINTER;
+                    rc = VERR_INVALID_POINTER;
             }
             else if (pState->enmMode <= PGMMODE_PROTECTED)
-                pState->rc = PGMPhysGCPhys2HCPtr(pState->pVM, pState->pvPageGC, PAGE_SIZE, &pState->pvPageHC);
+                rc = PGMPhysGCPhys2HCPtr(pState->pVM, pState->pvPageGC, PAGE_SIZE, &pState->pvPageHC);
             else
-                pState->rc = PGMPhysGCPtr2HCPtr(pState->pVM, pState->pvPageGC, &pState->pvPageHC);
-            if (VBOX_FAILURE(pState->rc))
+                rc = PGMPhysGCPtr2HCPtr(pState->pVM, pState->pvPageGC, &pState->pvPageHC);
+            if (VBOX_FAILURE(rc))
             {
                 pState->pvPageHC = NULL;
-                return pState->rc;
+                return rc;
             }
         }
@@ -179 +172 @@
         /* check the segemnt limit */
         if (PtrSrc > pState->cbSegLimit)
-            return pState->rc = VERR_OUT_OF_SELECTOR_BOUNDS;
+            return VERR_OUT_OF_SELECTOR_BOUNDS;
 
         /* calc how much we can read */
@@ -544 +537 @@
         size_t  cbBits = State.Cpu.opsize;
         uint8_t *pau8Bits = (uint8_t *)alloca(cbBits);
-        rc = dbgfR3DisasInstrRead(GCPtr, pau8Bits, cbBits, (uintptr_t)&State);
+        rc = dbgfR3DisasInstrRead(GCPtr, pau8Bits, cbBits, &State);
         AssertRC(rc);
         if (fFlags & DBGF_DISAS_FLAGS_NO_ADDRESS)