Index: /trunk/include/VBox/dis.h
===================================================================
--- /trunk/include/VBox/dis.h	(revision 41729)
+++ /trunk/include/VBox/dis.h	(revision 41730)
@@ -487,9 +487,28 @@
 typedef DISOPPARAM *PDISOPPARAM;
 /** Pointer to opcode parameter. */
-typedef const DISOPPARAM *PCOP_PARAMETER;
-
-
+typedef const DISOPPARAM *PCDISOPPARAM;
+
+
+/**
+ * Opcode descriptor.
+ */
+typedef struct DISOPCODE
+{
+#ifndef DIS_CORE_ONLY
+    const char  *pszOpcode;
+#endif
+    uint8_t     idxParse1;
+    uint8_t     idxParse2;
+    uint8_t     idxParse3;
+    uint8_t     uUnused;
+    uint16_t    opcode;
+    uint16_t    param1;
+    uint16_t    param2;
+    uint16_t    param3;
+    uint32_t    optype;
+} DISOPCODE;
 /** Pointer to const opcode. */
 typedef const struct DISOPCODE *PCDISOPCODE;
+
 
 /**
@@ -511,7 +530,12 @@
  * @remark no DECLCALLBACK() here because it's considered to be internal (really, I'm too lazy to update all the functions). */
 typedef unsigned FNDISPARSE(RTUINTPTR pu8CodeBlock, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pCpu);
+/** Pointer to a disassembler parser function. */
 typedef FNDISPARSE *PFNDISPARSE;
+/** Pointer to a const disassembler parser function pointer. */
 typedef PFNDISPARSE const *PCPFNDISPARSE;
 
+/**
+ * The diassembler state and result.
+ */
 typedef struct DISCPUSTATE
 {
@@ -614,23 +638,4 @@
 
 
-/**
- * Opcode descriptor.
- */
-typedef struct DISOPCODE
-{
-#ifndef DIS_CORE_ONLY
-    const char  *pszOpcode;
-#endif
-    uint8_t     idxParse1;
-    uint8_t     idxParse2;
-    uint8_t     idxParse3;
-    uint8_t     uUnused;
-    uint16_t    opcode;
-    uint16_t    param1;
-    uint16_t    param2;
-    uint16_t    param3;
-    uint32_t    optype;
-} DISOPCODE;
-
 
 DISDECL(int) DISInstrToStr(void const *pvInstr, DISCPUMODE enmCpuMode,
Index: /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp
===================================================================
--- /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp	(revision 41729)
+++ /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp	(revision 41730)
@@ -91,5 +91,5 @@
  * @param   pcchReg     Where to store the length of the name.
  */
-static const char *disasmFormatYasmBaseReg(PCDISCPUSTATE pCpu, PCOP_PARAMETER pParam, size_t *pcchReg)
+static const char *disasmFormatYasmBaseReg(PCDISCPUSTATE pCpu, PCDISOPPARAM pParam, size_t *pcchReg)
 {
     switch (pParam->fUse & (  DISUSE_REG_GEN8 | DISUSE_REG_GEN16 | DISUSE_REG_GEN32 | DISUSE_REG_GEN64
@@ -202,5 +202,5 @@
  * @param   pcchReg     Where to store the length of the name.
  */
-static const char *disasmFormatYasmIndexReg(PCDISCPUSTATE pCpu, PCOP_PARAMETER pParam, size_t *pcchReg)
+static const char *disasmFormatYasmIndexReg(PCDISCPUSTATE pCpu, PCDISOPPARAM pParam, size_t *pcchReg)
 {
     switch (pCpu->addrmode)
@@ -554,5 +554,5 @@
          * Formatting context and associated macros.
          */
-        PCOP_PARAMETER pParam = &pCpu->param1;
+        PCDISOPPARAM pParam = &pCpu->param1;
         int iParam = 1;
 
Index: /trunk/src/VBox/VMM/VMMAll/IOMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/IOMAll.cpp	(revision 41729)
+++ /trunk/src/VBox/VMM/VMMAll/IOMAll.cpp	(revision 41730)
@@ -65,5 +65,5 @@
  * @param   pcbSize             Where to store the size of data (1, 2, 4, 8).
  */
-bool iomGetRegImmData(PDISCPUSTATE pCpu, PCOP_PARAMETER pParam, PCPUMCTXCORE pRegFrame, uint64_t *pu64Data, unsigned *pcbSize)
+bool iomGetRegImmData(PDISCPUSTATE pCpu, PCDISOPPARAM pParam, PCPUMCTXCORE pRegFrame, uint64_t *pu64Data, unsigned *pcbSize)
 {
     NOREF(pCpu);
@@ -159,5 +159,5 @@
  * @param   u64Data             8/16/32/64 bit data to store.
  */
-bool iomSaveDataToReg(PDISCPUSTATE pCpu, PCOP_PARAMETER pParam, PCPUMCTXCORE pRegFrame, uint64_t u64Data)
+bool iomSaveDataToReg(PDISCPUSTATE pCpu, PCDISOPPARAM pParam, PCPUMCTXCORE pRegFrame, uint64_t u64Data)
 {
     NOREF(pCpu);
Index: /trunk/src/VBox/VMM/include/IOMInternal.h
===================================================================
--- /trunk/src/VBox/VMM/include/IOMInternal.h	(revision 41729)
+++ /trunk/src/VBox/VMM/include/IOMInternal.h	(revision 41730)
@@ -431,6 +431,6 @@
 
 /* Disassembly helpers used in IOMAll.cpp & IOMAllMMIO.cpp */
-bool    iomGetRegImmData(PDISCPUSTATE pCpu, PCOP_PARAMETER pParam, PCPUMCTXCORE pRegFrame, uint64_t *pu64Data, unsigned *pcbSize);
-bool    iomSaveDataToReg(PDISCPUSTATE pCpu, PCOP_PARAMETER pParam, PCPUMCTXCORE pRegFrame, uint64_t u32Data);
+bool    iomGetRegImmData(PDISCPUSTATE pCpu, PCDISOPPARAM pParam, PCPUMCTXCORE pRegFrame, uint64_t *pu64Data, unsigned *pcbSize);
+bool    iomSaveDataToReg(PDISCPUSTATE pCpu, PCDISOPPARAM pParam, PCPUMCTXCORE pRegFrame, uint64_t u32Data);
 
 RT_C_DECLS_END