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

Timestamp:

Aug 18, 2008 9:23:18 AM (16 years ago)

Author:

vboxsync

Message:

Use DISGetParamSize instead of iomGetRegSize.

File:

• trunk/src/VBox/VMM/VMMAll/IOMAll.cpp (modified) (3 diffs)

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

@@ -38 +38 @@
 
 
-/**
- * Calculates the size of register parameter.
- *
- * @returns 1, 2, 4 on success.
- * @returns 0 if non-register parameter.
- * @param   pCpu                Pointer to current disassembler context.
- * @param   pParam              Pointer to parameter of instruction to proccess.
- */
-static unsigned iomGetRegSize(PDISCPUSTATE pCpu, PCOP_PARAMETER pParam)
-{
-    if (pParam->flags & (USE_BASE | USE_INDEX | USE_SCALE | USE_DISPLACEMENT8 | USE_DISPLACEMENT16 | USE_DISPLACEMENT32 | USE_IMMEDIATE8 | USE_IMMEDIATE16 | USE_IMMEDIATE32 | USE_IMMEDIATE16_SX8 | USE_IMMEDIATE32_SX8))
-        return 0;
-
-    if (pParam->flags & USE_REG_GEN32)
-        return 4;
-
-    if (pParam->flags & USE_REG_GEN16)
-        return 2;
-
-    if (pParam->flags & USE_REG_GEN8)
-        return 1;
-
-    if (pParam->flags & USE_REG_GEN64)
-        return 8;
-
-    if (pParam->flags & USE_REG_SEG)
-        return 2;
-    return 0;
-}
-
 
 /**
@@ -74 +44 @@
  * @returns true on success.
  *
+ * @todo Get rid of this code. Use DISQueryParamVal instead
+ * 
  * @param   pCpu                Pointer to current disassembler context.
  * @param   pParam              Pointer to parameter of instruction to proccess.
@@ -884 +856 @@
     AssertMsg(fRc, ("Failed to get reg/imm port number!\n")); NOREF(fRc);
 
-    cbSize = iomGetRegSize(pCpu, &pCpu->param1);
+    cbSize = DISGetParamSize(pCpu, &pCpu->param1);
     Assert(cbSize > 0);
     int rc = IOMInterpretCheckPortIOAccess(pVM, pRegFrame, uPort, cbSize);