Index: /trunk/include/VBox/dis.h
===================================================================
--- /trunk/include/VBox/dis.h	(revision 41734)
+++ /trunk/include/VBox/dis.h	(revision 41735)
@@ -530,7 +530,7 @@
     uint8_t         mode;
     /** The addressing mode (DISCPUMODE). */
-    uint8_t         addrmode;
+    uint8_t         uAddrMode;
     /** The operand mode (DISCPUMODE). */
-    uint8_t         opmode;
+    uint8_t         uOpMode;
     /** Per instruction prefix settings. */
     uint8_t         fPrefix;
Index: /trunk/src/VBox/Disassembler/DisasmCore.cpp
===================================================================
--- /trunk/src/VBox/Disassembler/DisasmCore.cpp	(revision 41734)
+++ /trunk/src/VBox/Disassembler/DisasmCore.cpp	(revision 41735)
@@ -295,12 +295,12 @@
     {
         paOneByteMap        = g_aOneByteMapX64;
-        pCpu->addrmode      = DISCPUMODE_64BIT;
-        pCpu->opmode        = DISCPUMODE_32BIT;
+        pCpu->uAddrMode     = DISCPUMODE_64BIT;
+        pCpu->uOpMode       = DISCPUMODE_32BIT;
     }
     else
     {
         paOneByteMap        = g_aOneByteMapX86;
-        pCpu->addrmode      = enmCpuMode;
-        pCpu->opmode        = enmCpuMode;
+        pCpu->uAddrMode     = enmCpuMode;
+        pCpu->uOpMode       = enmCpuMode;
     }
     pCpu->fPrefix           = DISPREFIX_NONE;
@@ -378,10 +378,10 @@
                 pCpu->fPrefix |= DISPREFIX_ADDRSIZE;
                 if (pCpu->mode == DISCPUMODE_16BIT)
-                    pCpu->addrmode = DISCPUMODE_32BIT;
+                    pCpu->uAddrMode = DISCPUMODE_32BIT;
                 else
                 if (pCpu->mode == DISCPUMODE_32BIT)
-                    pCpu->addrmode = DISCPUMODE_16BIT;
+                    pCpu->uAddrMode = DISCPUMODE_16BIT;
                 else
-                    pCpu->addrmode = DISCPUMODE_32BIT;     /* 64 bits */
+                    pCpu->uAddrMode = DISCPUMODE_32BIT;     /* 64 bits */
 
                 iByte        += sizeof(uint8_t);
@@ -392,7 +392,7 @@
                 pCpu->fPrefix |= DISPREFIX_OPSIZE;
                 if (pCpu->mode == DISCPUMODE_16BIT)
-                    pCpu->opmode = DISCPUMODE_32BIT;
+                    pCpu->uOpMode = DISCPUMODE_32BIT;
                 else
-                    pCpu->opmode = DISCPUMODE_16BIT;  /* for 32 and 64 bits mode (there is no 32 bits operand size override prefix) */
+                    pCpu->uOpMode = DISCPUMODE_16BIT;  /* for 32 and 64 bits mode (there is no 32 bits operand size override prefix) */
 
                 iByte        += sizeof(uint8_t);
@@ -418,5 +418,5 @@
 
                 if (pCpu->fRexPrefix & DISPREFIX_REX_FLAGS_W)
-                    pCpu->opmode = DISCPUMODE_64BIT;  /* overrides size prefix byte */
+                    pCpu->uOpMode = DISCPUMODE_64BIT;  /* overrides size prefix byte */
                 continue;   //fetch the next byte
             }
@@ -479,9 +479,9 @@
     {
         if (pOp->optype & DISOPTYPE_FORCED_64_OP_SIZE)
-            pCpu->opmode = DISCPUMODE_64BIT;
+            pCpu->uOpMode = DISCPUMODE_64BIT;
         else
         if (    (pOp->optype & DISOPTYPE_DEFAULT_64_OP_SIZE)
             &&  !(pCpu->fPrefix & DISPREFIX_OPSIZE))
-            pCpu->opmode = DISCPUMODE_64BIT;
+            pCpu->uOpMode = DISCPUMODE_64BIT;
     }
     else
@@ -490,5 +490,5 @@
         /* Forced 32 bits operand size for certain instructions (mov crx, mov drx). */
         Assert(pCpu->mode != DISCPUMODE_64BIT);
-        pCpu->opmode = DISCPUMODE_32BIT;
+        pCpu->uOpMode = DISCPUMODE_32BIT;
     }
 
@@ -558,9 +558,9 @@
         /* Note: redundant, but just in case this ever changes */
         if (fpop->optype & DISOPTYPE_FORCED_64_OP_SIZE)
-            pCpu->opmode = DISCPUMODE_64BIT;
+            pCpu->uOpMode = DISCPUMODE_64BIT;
         else
         if (    (fpop->optype & DISOPTYPE_DEFAULT_64_OP_SIZE)
             &&  !(pCpu->fPrefix & DISPREFIX_OPSIZE))
-            pCpu->opmode = DISCPUMODE_64BIT;
+            pCpu->uOpMode = DISCPUMODE_64BIT;
     }
 
@@ -601,5 +601,5 @@
     index = pCpu->SIB.Bits.Index;
 
-    if (pCpu->addrmode == DISCPUMODE_32BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_32BIT)
     {
         ppszSIBIndexReg = szSIBIndexReg;
@@ -629,5 +629,5 @@
     {
         // [scaled index] + disp32
-        if (pCpu->addrmode == DISCPUMODE_32BIT)
+        if (pCpu->uAddrMode == DISCPUMODE_32BIT)
         {
             pParam->fUse |= DISUSE_DISPLACEMENT32;
@@ -738,5 +738,5 @@
 
                 if (    pCpu->pCurInstr->opcode == OP_MOV_CR
-                    &&  pCpu->opmode == DISCPUMODE_32BIT
+                    &&  pCpu->uOpMode == DISCPUMODE_32BIT
                     &&  (pCpu->fPrefix & DISPREFIX_LOCK))
                 {
@@ -787,7 +787,7 @@
     /* @todo bound */
 
-    if (pCpu->addrmode != DISCPUMODE_16BIT)
-    {
-        Assert(pCpu->addrmode == DISCPUMODE_32BIT || pCpu->addrmode == DISCPUMODE_64BIT);
+    if (pCpu->uAddrMode != DISCPUMODE_16BIT)
+    {
+        Assert(pCpu->uAddrMode == DISCPUMODE_32BIT || pCpu->uAddrMode == DISCPUMODE_64BIT);
 
         /*
@@ -906,7 +906,7 @@
     *pSibInc = 0;
 
-    if (pCpu->addrmode != DISCPUMODE_16BIT)
-    {
-        Assert(pCpu->addrmode == DISCPUMODE_32BIT || pCpu->addrmode == DISCPUMODE_64BIT);
+    if (pCpu->uAddrMode != DISCPUMODE_16BIT)
+    {
+        Assert(pCpu->uAddrMode == DISCPUMODE_32BIT || pCpu->uAddrMode == DISCPUMODE_64BIT);
 
         /*
@@ -989,7 +989,7 @@
     *pSibInc = 0;
 
-    if (pCpu->addrmode != DISCPUMODE_16BIT)
-    {
-        Assert(pCpu->addrmode == DISCPUMODE_32BIT || pCpu->addrmode == DISCPUMODE_64BIT);
+    if (pCpu->uAddrMode != DISCPUMODE_16BIT)
+    {
+        Assert(pCpu->uAddrMode == DISCPUMODE_32BIT || pCpu->uAddrMode == DISCPUMODE_64BIT);
         /*
          * Note: displacements in long mode are 8 or 32 bits and sign-extended to 64 bits
@@ -1181,5 +1181,5 @@
 {
     NOREF(pOp);
-    if (pCpu->opmode == DISCPUMODE_32BIT)
+    if (pCpu->uOpMode == DISCPUMODE_32BIT)
     {
         pParam->parval = (uint32_t)(int8_t)disReadByte(pCpu, uCodePtr);
@@ -1188,5 +1188,5 @@
     }
     else
-    if (pCpu->opmode == DISCPUMODE_64BIT)
+    if (pCpu->uOpMode == DISCPUMODE_64BIT)
     {
         pParam->parval = (uint64_t)(int8_t)disReadByte(pCpu, uCodePtr);
@@ -1265,5 +1265,5 @@
 {
     NOREF(pOp);
-    if (pCpu->opmode == DISCPUMODE_32BIT)
+    if (pCpu->uOpMode == DISCPUMODE_32BIT)
     {
         pParam->parval = disReadDWord(pCpu, uCodePtr);
@@ -1273,5 +1273,5 @@
     }
 
-    if (pCpu->opmode == DISCPUMODE_64BIT)
+    if (pCpu->uOpMode == DISCPUMODE_64BIT)
     {
         pParam->parval = disReadQWord(pCpu, uCodePtr);
@@ -1291,7 +1291,7 @@
 {
     NOREF(uCodePtr); NOREF(pOp); NOREF(pParam);
-    if (pCpu->opmode == DISCPUMODE_32BIT)
+    if (pCpu->uOpMode == DISCPUMODE_32BIT)
         return sizeof(uint32_t);
-    if (pCpu->opmode == DISCPUMODE_64BIT)
+    if (pCpu->uOpMode == DISCPUMODE_64BIT)
         return sizeof(uint64_t);
     return sizeof(uint16_t);
@@ -1303,5 +1303,5 @@
     NOREF(pOp);
     /* Word for 16-bit operand-size or doubleword for 32 or 64-bit operand-size. */
-    if (pCpu->opmode == DISCPUMODE_16BIT)
+    if (pCpu->uOpMode == DISCPUMODE_16BIT)
     {
         pParam->parval = disReadWord(pCpu, uCodePtr);
@@ -1312,5 +1312,5 @@
 
     /* 64 bits op mode means *sign* extend to 64 bits. */
-    if (pCpu->opmode == DISCPUMODE_64BIT)
+    if (pCpu->uOpMode == DISCPUMODE_64BIT)
     {
         pParam->parval = (uint64_t)(int32_t)disReadDWord(pCpu, uCodePtr);
@@ -1332,5 +1332,5 @@
     NOREF(uCodePtr); NOREF(pOp); NOREF(pParam);
     /* Word for 16-bit operand-size or doubleword for 32 or 64-bit operand-size. */
-    if (pCpu->opmode == DISCPUMODE_16BIT)
+    if (pCpu->uOpMode == DISCPUMODE_16BIT)
         return sizeof(uint16_t);
     return sizeof(uint32_t);
@@ -1362,5 +1362,5 @@
 {
     NOREF(pOp);
-    if (pCpu->opmode == DISCPUMODE_32BIT)
+    if (pCpu->uOpMode == DISCPUMODE_32BIT)
     {
         pParam->parval = disReadDWord(pCpu, uCodePtr);
@@ -1370,5 +1370,5 @@
     }
 
-    if (pCpu->opmode == DISCPUMODE_64BIT)
+    if (pCpu->uOpMode == DISCPUMODE_64BIT)
     {
         /* 32 bits relative immediate sign extended to 64 bits. */
@@ -1390,5 +1390,5 @@
 {
     NOREF(uCodePtr); NOREF(pOp); NOREF(pParam);
-    if (pCpu->opmode == DISCPUMODE_16BIT)
+    if (pCpu->uOpMode == DISCPUMODE_16BIT)
         return sizeof(int16_t);
     /* Both 32 & 64 bits mode use 32 bits relative immediates. */
@@ -1399,5 +1399,5 @@
 unsigned ParseImmAddr(RTUINTPTR uCodePtr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pCpu)
 {
-    if (pCpu->addrmode == DISCPUMODE_32BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_32BIT)
     {
         if (OP_PARM_VSUBTYPE(pParam->param) == OP_PARM_p)
@@ -1423,5 +1423,5 @@
     }
 
-    if (pCpu->addrmode == DISCPUMODE_64BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_64BIT)
     {
         Assert(OP_PARM_VSUBTYPE(pParam->param) != OP_PARM_p);
@@ -1462,5 +1462,5 @@
 {
     NOREF(uCodePtr); NOREF(pOp);
-    if (pCpu->addrmode == DISCPUMODE_32BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_32BIT)
     {
         if (OP_PARM_VSUBTYPE(pParam->param) == OP_PARM_p)
@@ -1473,5 +1473,5 @@
         }
     }
-    if (pCpu->addrmode == DISCPUMODE_64BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_64BIT)
     {
         Assert(OP_PARM_VSUBTYPE(pParam->param) != OP_PARM_p);
@@ -1495,7 +1495,7 @@
 {
     // immediate far pointers - only 16:16 or 16:32; determined by operand, *not* address size!
-    Assert(pCpu->opmode == DISCPUMODE_16BIT || pCpu->opmode == DISCPUMODE_32BIT);
+    Assert(pCpu->uOpMode == DISCPUMODE_16BIT || pCpu->uOpMode == DISCPUMODE_32BIT);
     Assert(OP_PARM_VSUBTYPE(pParam->param) == OP_PARM_p);
-    if (pCpu->opmode == DISCPUMODE_32BIT)
+    if (pCpu->uOpMode == DISCPUMODE_32BIT)
     {
         // far 16:32 pointer
@@ -1519,7 +1519,7 @@
     NOREF(uCodePtr); NOREF(pOp);
     // immediate far pointers - only 16:16 or 16:32
-    Assert(pCpu->opmode == DISCPUMODE_16BIT || pCpu->opmode == DISCPUMODE_32BIT);
+    Assert(pCpu->uOpMode == DISCPUMODE_16BIT || pCpu->uOpMode == DISCPUMODE_32BIT);
     Assert(OP_PARM_VSUBTYPE(pParam->param) == OP_PARM_p);
-    if (pCpu->opmode == DISCPUMODE_32BIT)
+    if (pCpu->uOpMode == DISCPUMODE_32BIT)
     {
         // far 16:32 pointer
@@ -1556,5 +1556,5 @@
     {
         /* 32-bit EAX..EDI registers. */
-        if (pCpu->opmode == DISCPUMODE_32BIT)
+        if (pCpu->uOpMode == DISCPUMODE_32BIT)
         {
             /* Use 32-bit registers. */
@@ -1564,5 +1564,5 @@
         }
         else
-        if (pCpu->opmode == DISCPUMODE_64BIT)
+        if (pCpu->uOpMode == DISCPUMODE_64BIT)
         {
             /* Use 64-bit registers. */
@@ -1610,5 +1610,5 @@
         pParam->cb     = 1;
 
-        if (pCpu->opmode == DISCPUMODE_64BIT)
+        if (pCpu->uOpMode == DISCPUMODE_64BIT)
         {
             if (    (pOp->optype & DISOPTYPE_REXB_EXTENDS_OPREG)
@@ -1640,5 +1640,5 @@
 
     pParam->fUse |= DISUSE_POINTER_DS_BASED;
-    if (pCpu->addrmode == DISCPUMODE_32BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_32BIT)
     {
         pParam->base.reg_gen = DISGREG_ESI;
@@ -1646,5 +1646,5 @@
     }
     else
-    if (pCpu->addrmode == DISCPUMODE_64BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_64BIT)
     {
         pParam->base.reg_gen = DISGREG_RSI;
@@ -1665,5 +1665,5 @@
 
     pParam->fUse |= DISUSE_POINTER_DS_BASED;
-    if (pCpu->addrmode == DISCPUMODE_32BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_32BIT)
     {
         pParam->base.reg_gen = DISGREG_ESI;
@@ -1671,5 +1671,5 @@
     }
     else
-    if (pCpu->addrmode == DISCPUMODE_64BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_64BIT)
     {
         pParam->base.reg_gen = DISGREG_RSI;
@@ -1690,5 +1690,5 @@
 
     pParam->fUse |= DISUSE_POINTER_ES_BASED;
-    if (pCpu->addrmode == DISCPUMODE_32BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_32BIT)
     {
         pParam->base.reg_gen = DISGREG_EDI;
@@ -1696,5 +1696,5 @@
     }
     else
-    if (pCpu->addrmode == DISCPUMODE_64BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_64BIT)
     {
         pParam->base.reg_gen = DISGREG_RDI;
@@ -1715,5 +1715,5 @@
 
     pParam->fUse |= DISUSE_POINTER_ES_BASED;
-    if (pCpu->addrmode == DISCPUMODE_32BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_32BIT)
     {
         pParam->base.reg_gen = DISGREG_EDI;
@@ -1721,5 +1721,5 @@
     }
     else
-    if (pCpu->addrmode == DISCPUMODE_64BIT)
+    if (pCpu->uAddrMode == DISCPUMODE_64BIT)
     {
         pParam->base.reg_gen = DISGREG_RDI;
@@ -1761,5 +1761,5 @@
                 /* Cancel prefix changes. */
                 pCpu->fPrefix &= ~DISPREFIX_OPSIZE;
-                pCpu->opmode  = pCpu->mode;
+                pCpu->uOpMode  = pCpu->mode;
             }
             break;
@@ -1828,5 +1828,5 @@
                 /* Cancel prefix changes. */
                 pCpu->fPrefix &= ~DISPREFIX_OPSIZE;
-                pCpu->opmode  = pCpu->mode;
+                pCpu->uOpMode  = pCpu->mode;
             }
         }
@@ -1879,5 +1879,5 @@
             /* Cancel prefix changes. */
             pCpu->fPrefix &= ~DISPREFIX_OPSIZE;
-            pCpu->opmode  = pCpu->mode;
+            pCpu->uOpMode  = pCpu->mode;
         }
     }
@@ -2306,9 +2306,9 @@
     subtype = OP_PARM_VSUBTYPE(pParam->param);
     if (fRegAddr)
-        subtype = (pCpu->addrmode == DISCPUMODE_64BIT) ? OP_PARM_q : OP_PARM_d;
+        subtype = (pCpu->uAddrMode == DISCPUMODE_64BIT) ? OP_PARM_q : OP_PARM_d;
     else
     if (subtype == OP_PARM_v || subtype == OP_PARM_NONE)
     {
-        switch(pCpu->opmode)
+        switch (pCpu->uOpMode)
         {
         case DISCPUMODE_32BIT:
Index: /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp
===================================================================
--- /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp	(revision 41734)
+++ /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp	(revision 41735)
@@ -204,5 +204,5 @@
 static const char *disasmFormatYasmIndexReg(PCDISCPUSTATE pCpu, PCDISOPPARAM pParam, size_t *pcchReg)
 {
-    switch (pCpu->addrmode)
+    switch (pCpu->uAddrMode)
     {
         case DISCPUMODE_16BIT:
@@ -231,5 +231,5 @@
 
         default:
-            AssertMsgFailed(("%#x %#x\n", pParam->fUse, pCpu->addrmode));
+            AssertMsgFailed(("%#x %#x\n", pParam->fUse, pCpu->uAddrMode));
             *pcchReg = 3;
             return "r??";
@@ -417,17 +417,17 @@
         {
             case OP_JECXZ:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "jcxz %Jb" : pCpu->opmode == DISCPUMODE_32BIT ? "jecxz %Jb"   : "jrcxz %Jb";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "jcxz %Jb" : pCpu->uOpMode == DISCPUMODE_32BIT ? "jecxz %Jb"   : "jrcxz %Jb";
                 break;
             case OP_PUSHF:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "pushfw"   : pCpu->opmode == DISCPUMODE_32BIT ? "pushfd"      : "pushfq";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "pushfw"   : pCpu->uOpMode == DISCPUMODE_32BIT ? "pushfd"      : "pushfq";
                 break;
             case OP_POPF:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "popfw"    : pCpu->opmode == DISCPUMODE_32BIT ? "popfd"       : "popfq";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "popfw"    : pCpu->uOpMode == DISCPUMODE_32BIT ? "popfd"       : "popfq";
                 break;
             case OP_PUSHA:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "pushaw"   : "pushad";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "pushaw"   : "pushad";
                 break;
             case OP_POPA:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "popaw"    : "popad";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "popaw"    : "popad";
                 break;
             case OP_INSB:
@@ -435,5 +435,5 @@
                 break;
             case OP_INSWD:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "insw"     : pCpu->opmode == DISCPUMODE_32BIT ? "insd"  : "insq";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "insw"     : pCpu->uOpMode == DISCPUMODE_32BIT ? "insd"  : "insq";
                 break;
             case OP_OUTSB:
@@ -441,5 +441,5 @@
                 break;
             case OP_OUTSWD:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "outsw"    : pCpu->opmode == DISCPUMODE_32BIT ? "outsd" : "outsq";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "outsw"    : pCpu->uOpMode == DISCPUMODE_32BIT ? "outsd" : "outsq";
                 break;
             case OP_MOVSB:
@@ -447,5 +447,5 @@
                 break;
             case OP_MOVSWD:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "movsw"    : pCpu->opmode == DISCPUMODE_32BIT ? "movsd" : "movsq";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "movsw"    : pCpu->uOpMode == DISCPUMODE_32BIT ? "movsd" : "movsq";
                 break;
             case OP_CMPSB:
@@ -453,5 +453,5 @@
                 break;
             case OP_CMPWD:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "cmpsw"    : pCpu->opmode == DISCPUMODE_32BIT ? "cmpsd" : "cmpsq";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "cmpsw"    : pCpu->uOpMode == DISCPUMODE_32BIT ? "cmpsd" : "cmpsq";
                 break;
             case OP_SCASB:
@@ -459,5 +459,5 @@
                 break;
             case OP_SCASWD:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "scasw"    : pCpu->opmode == DISCPUMODE_32BIT ? "scasd" : "scasq";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "scasw"    : pCpu->uOpMode == DISCPUMODE_32BIT ? "scasd" : "scasq";
                 break;
             case OP_LODSB:
@@ -465,5 +465,5 @@
                 break;
             case OP_LODSWD:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "lodsw"    : pCpu->opmode == DISCPUMODE_32BIT ? "lodsd" : "lodsq";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "lodsw"    : pCpu->uOpMode == DISCPUMODE_32BIT ? "lodsd" : "lodsq";
                 break;
             case OP_STOSB:
@@ -471,11 +471,11 @@
                 break;
             case OP_STOSWD:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "stosw"    : pCpu->opmode == DISCPUMODE_32BIT ? "stosd" : "stosq";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "stosw"    : pCpu->uOpMode == DISCPUMODE_32BIT ? "stosd" : "stosq";
                 break;
             case OP_CBW:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "cbw"      : pCpu->opmode == DISCPUMODE_32BIT ? "cwde"  : "cdqe";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "cbw"      : pCpu->uOpMode == DISCPUMODE_32BIT ? "cwde"  : "cdqe";
                 break;
             case OP_CWD:
-                pszFmt = pCpu->opmode == DISCPUMODE_16BIT ? "cwd"      : pCpu->opmode == DISCPUMODE_32BIT ? "cdq"   : "cqo";
+                pszFmt = pCpu->uOpMode == DISCPUMODE_16BIT ? "cwd"      : pCpu->uOpMode == DISCPUMODE_32BIT ? "cdq"   : "cqo";
                 break;
             case OP_SHL:
@@ -574,5 +574,5 @@
                 { \
                     case OP_PARM_v: \
-                        switch (pCpu->opmode) \
+                        switch (pCpu->uOpMode) \
                         { \
                             case DISCPUMODE_16BIT: PUT_SZ("word "); break; \
@@ -800,5 +800,5 @@
 
                             case DISUSE_IMMEDIATE16:
-                                if (    pCpu->mode != pCpu->opmode
+                                if (    pCpu->mode != pCpu->uOpMode
                                     ||  (   (fFlags & DIS_FMT_FLAGS_STRICT)
                                          && (   (int8_t)pParam->parval == (int16_t)pParam->parval
@@ -823,5 +823,5 @@
 
                             case DISUSE_IMMEDIATE32:
-                                if (    pCpu->opmode != (pCpu->mode == DISCPUMODE_16BIT ? DISCPUMODE_16BIT : DISCPUMODE_32BIT) /* not perfect */
+                                if (    pCpu->uOpMode != (pCpu->mode == DISCPUMODE_16BIT ? DISCPUMODE_16BIT : DISCPUMODE_32BIT) /* not perfect */
                                     ||  (   (fFlags & DIS_FMT_FLAGS_STRICT)
                                          && (   (int8_t)pParam->parval == (int32_t)pParam->parval
@@ -1213,5 +1213,5 @@
      * Mod rm + SIB: Check for duplicate EBP encodings that yasm won't use for very good reasons.
      */
-    if (    pCpu->addrmode != DISCPUMODE_16BIT ///@todo correct?
+    if (    pCpu->uAddrMode != DISCPUMODE_16BIT ///@todo correct?
         &&  pCpu->ModRM.Bits.Rm == 4
         &&  pCpu->ModRM.Bits.Mod != 3)
Index: /trunk/src/VBox/Disassembler/DisasmReg.cpp
===================================================================
--- /trunk/src/VBox/Disassembler/DisasmReg.cpp	(revision 41734)
+++ /trunk/src/VBox/Disassembler/DisasmReg.cpp	(revision 41735)
@@ -207,5 +207,5 @@
     if (subtype == OP_PARM_v)
     {
-        switch(pCpu->opmode)
+        switch (pCpu->uOpMode)
         {
         case DISCPUMODE_32BIT:
@@ -240,8 +240,8 @@
 
     case OP_PARM_p: /* far pointer */
-        if (pCpu->addrmode == DISCPUMODE_32BIT)
+        if (pCpu->uAddrMode == DISCPUMODE_32BIT)
             return 6;   /* 16:32 */
         else
-        if (pCpu->addrmode == DISCPUMODE_64BIT)
+        if (pCpu->uAddrMode == DISCPUMODE_64BIT)
             return 12;  /* 16:64 */
         else
Index: /trunk/src/VBox/Disassembler/DisasmTestCore.cpp
===================================================================
--- /trunk/src/VBox/Disassembler/DisasmTestCore.cpp	(revision 41734)
+++ /trunk/src/VBox/Disassembler/DisasmTestCore.cpp	(revision 41735)
@@ -1,5 +1,5 @@
 /* $Id$ */
 /** @file
- * VBox disassembler - Test application for core. 
+ * VBox disassembler - Test application for core.
  */
 
@@ -39,5 +39,5 @@
         DISCPUSTATE cpu;
         if (DISInstr((void *)(uintptr_t)&DISInstr, DISCPUMODE_32BIT, &cpu, &cb))
-            printf("ok %d\n", cpu.addrmode);
+            printf("ok %d\n", cpu.uAddrMode);
         else
         {
Index: /trunk/src/VBox/VMM/VMMAll/EMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/EMAll.cpp	(revision 41734)
+++ /trunk/src/VBox/VMM/VMMAll/EMAll.cpp	(revision 41735)
@@ -1655,5 +1655,5 @@
         return VERR_EM_INTERPRETER;
 
-    switch (pDis->addrmode)
+    switch (pDis->uAddrMode)
     {
     case DISCPUMODE_16BIT:
@@ -1675,5 +1675,5 @@
 
     GCDest = SELMToFlat(pVM, DISSELREG_ES, pRegFrame, GCOffset);
-    switch (pDis->opmode)
+    switch (pDis->uOpMode)
     {
     case DISCPUMODE_16BIT:
@@ -1703,5 +1703,5 @@
 
         /* Update (e/r)di. */
-        switch (pDis->addrmode)
+        switch (pDis->uAddrMode)
         {
         case DISCPUMODE_16BIT:
@@ -1768,5 +1768,5 @@
 
         /* Update the registers. */
-        switch (pDis->addrmode)
+        switch (pDis->uAddrMode)
         {
         case DISCPUMODE_16BIT:
Index: /trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp	(revision 41734)
+++ /trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp	(revision 41735)
@@ -934,5 +934,5 @@
      * Get bytes/words/dwords/qwords count to copy.
      */
-    uint64_t const fAddrMask = iomDisModeToMask((DISCPUMODE)pCpu->addrmode);
+    uint64_t const fAddrMask = iomDisModeToMask((DISCPUMODE)pCpu->uAddrMode);
     RTGCUINTREG cTransfers = 1;
     if (pCpu->fPrefix & DISPREFIX_REP)
@@ -1078,5 +1078,5 @@
     if (rc == VINF_SUCCESS)
     {
-        uint64_t const fAddrMask = iomDisModeToMask((DISCPUMODE)pCpu->addrmode);
+        uint64_t const fAddrMask = iomDisModeToMask((DISCPUMODE)pCpu->uAddrMode);
         pRegFrame->rsi = ((pRegFrame->rsi + offIncrement) & fAddrMask)
                        | (pRegFrame->rsi & ~fAddrMask);
@@ -2147,5 +2147,5 @@
         cb = 1;
     else
-        cb = (pCpu->opmode == DISCPUMODE_16BIT) ? 2 : 4;       /* dword in both 32 & 64 bits mode */
+        cb = (pCpu->uOpMode == DISCPUMODE_16BIT) ? 2 : 4;       /* dword in both 32 & 64 bits mode */
 
     VBOXSTRICTRC rcStrict = IOMInterpretCheckPortIOAccess(pVM, pRegFrame, Port, cb);
@@ -2156,5 +2156,5 @@
     }
 
-    return IOMInterpretINSEx(pVM, pRegFrame, Port, pCpu->fPrefix, (DISCPUMODE)pCpu->addrmode, cb);
+    return IOMInterpretINSEx(pVM, pRegFrame, Port, pCpu->fPrefix, (DISCPUMODE)pCpu->uAddrMode, cb);
 }
 
@@ -2316,5 +2316,5 @@
         cb = 1;
     else
-        cb = (pCpu->opmode == DISCPUMODE_16BIT) ? 2 : 4;       /* dword in both 32 & 64 bits mode */
+        cb = (pCpu->uOpMode == DISCPUMODE_16BIT) ? 2 : 4;       /* dword in both 32 & 64 bits mode */
 
     VBOXSTRICTRC rcStrict = IOMInterpretCheckPortIOAccess(pVM, pRegFrame, Port, cb);
@@ -2325,5 +2325,5 @@
     }
 
-    return IOMInterpretOUTSEx(pVM, pRegFrame, Port, pCpu->fPrefix, (DISCPUMODE)pCpu->addrmode, cb);
+    return IOMInterpretOUTSEx(pVM, pRegFrame, Port, pCpu->fPrefix, (DISCPUMODE)pCpu->uAddrMode, cb);
 }
 
Index: /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp	(revision 41734)
+++ /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp	(revision 41735)
@@ -894,5 +894,5 @@
 
 #ifdef VBOX_STRICT
-    if (pDis->opmode == DISCPUMODE_32BIT)
+    if (pDis->uOpMode == DISCPUMODE_32BIT)
         Assert(uIncrement == 4);
     else
@@ -1198,6 +1198,6 @@
         if (    pDis->pCurInstr->opcode == OP_STOSWD
             &&  !pRegFrame->eflags.Bits.u1DF
-            &&  pDis->opmode == pDis->mode
-            &&  pDis->addrmode == pDis->mode)
+            &&  pDis->uOpMode == pDis->mode
+            &&  pDis->uAddrMode == pDis->mode)
         {
             bool fValidStosd = false;
Index: /trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp	(revision 41734)
+++ /trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp	(revision 41735)
@@ -2418,5 +2418,5 @@
                     Log2(("IOMInterpretOUTSEx %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, IoExitInfo.n.u16Port, uIOSize));
                     STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringWrite);
-                    rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, pDis->fPrefix, (DISCPUMODE)pDis->addrmode, uIOSize);
+                    rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, pDis->fPrefix, (DISCPUMODE)pDis->uAddrMode, uIOSize);
                 }
                 else
@@ -2424,5 +2424,5 @@
                     Log2(("IOMInterpretINSEx  %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, IoExitInfo.n.u16Port, uIOSize));
                     STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringRead);
-                    rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, pDis->fPrefix, (DISCPUMODE)pDis->addrmode, uIOSize);
+                    rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, pDis->fPrefix, (DISCPUMODE)pDis->uAddrMode, uIOSize);
                 }
             }
Index: /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp	(revision 41734)
+++ /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp	(revision 41735)
@@ -4321,5 +4321,5 @@
                     Log2(("IOMInterpretOUTSEx %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, uPort, cbSize));
                     STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringWrite);
-                    rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), uPort, pDis->fPrefix, (DISCPUMODE)pDis->addrmode, cbSize);
+                    rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), uPort, pDis->fPrefix, (DISCPUMODE)pDis->uAddrMode, cbSize);
                 }
                 else
@@ -4327,5 +4327,5 @@
                     Log2(("IOMInterpretINSEx  %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, uPort, cbSize));
                     STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringRead);
-                    rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), uPort, pDis->fPrefix, (DISCPUMODE)pDis->addrmode, cbSize);
+                    rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), uPort, pDis->fPrefix, (DISCPUMODE)pDis->uAddrMode, cbSize);
                 }
             }