Index: /trunk/src/VBox/Disassembler/DisasmCore.cpp
===================================================================
--- /trunk/src/VBox/Disassembler/DisasmCore.cpp	(revision 8149)
+++ /trunk/src/VBox/Disassembler/DisasmCore.cpp	(revision 8150)
@@ -1083,11 +1083,6 @@
 {
     if (pCpu->opmode == CPUMODE_32BIT)
-    {
         return sizeof(uint32_t);
-    }
-    else
-    {
-        return sizeof(uint16_t);
-    }
+    return sizeof(uint16_t);
 }
 //*****************************************************************************
@@ -1137,11 +1132,6 @@
 {
     if (pCpu->opmode == CPUMODE_32BIT)
-    {
         return sizeof(int32_t);
-    }
-    else
-    {
-        return sizeof(uint16_t);
-    }
+    return sizeof(uint16_t);
 }
 //*****************************************************************************
@@ -1500,7 +1490,5 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1522,7 +1510,5 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1543,7 +1529,5 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1564,7 +1548,5 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1622,7 +1604,5 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1642,12 +1622,8 @@
 
     if (mod == 3 && rm == 0)
-    {
         pOp = (PCOPCODE)&g_aMapX86_Group7_mod11_rm000[reg];
-    }
     else
     if (mod == 3 && rm == 1)
-    {
         pOp = (PCOPCODE)&g_aMapX86_Group7_mod11_rm001[reg];
-    }
     else
         pOp = (PCOPCODE)&g_aMapX86_Group7_mem[reg];
@@ -1655,7 +1631,5 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1676,7 +1650,5 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1697,7 +1669,5 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1718,7 +1688,5 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1736,7 +1704,5 @@
 
     if (pCpu->prefix & PREFIX_OPSIZE)
-    {
         reg += 8;   //2nd table
-    }
 
     pOp = (PCOPCODE)&g_aMapX86_Group12[reg];
@@ -1744,10 +1710,7 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
-
     return size;
 }
@@ -1761,7 +1724,5 @@
     reg   = MODRM_REG(modrm);
     if (pCpu->prefix & PREFIX_OPSIZE)
-    {
         reg += 8;   //2nd table
-    }
 
     pOp = (PCOPCODE)&g_aMapX86_Group13[reg];
@@ -1769,7 +1730,5 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1786,7 +1745,5 @@
     reg   = MODRM_REG(modrm);
     if (pCpu->prefix & PREFIX_OPSIZE)
-    {
         reg += 8;   //2nd table
-    }
 
     pOp = (PCOPCODE)&g_aMapX86_Group14[reg];
@@ -1794,7 +1751,5 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
@@ -1820,10 +1775,7 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
-
     return size;
 }
@@ -1841,10 +1793,7 @@
     //little hack to make sure the ModRM byte is included in the returned size
     if (pOp->idxParse1 != IDX_ParseModRM && pOp->idxParse2 != IDX_ParseModRM)
-    {
         size = sizeof(uint8_t); //ModRM byte
-    }
 
     size += ParseInstruction(lpszCodeBlock, pOp, pCpu);
-
     return size;
 }
@@ -1863,12 +1812,8 @@
     subtype = OP_PARM_VSUBTYPE(pParam->param);
     if (fRegAddr)
-    {
         subtype = OP_PARM_d;
-    }
     else
     if (subtype == OP_PARM_v || subtype == OP_PARM_NONE)
-    {
         subtype = (pCpu->opmode == CPUMODE_32BIT) ? OP_PARM_d : OP_PARM_w;
-    }
 
     switch (subtype)