Changeset 41742 in vbox

Timestamp:

Jun 15, 2012 1:54:42 AM (13 years ago)

Author:

vboxsync

Message:

DISOPPARAM: s/scale/uScale/ + doc

Location:

trunk

Files:

• include/VBox/dis.h (modified) (1 diff)
• src/VBox/Disassembler/DisasmCore.cpp (modified) (2 diffs)
• src/VBox/Disassembler/DisasmFormatYasm.cpp (modified) (1 diff)
• src/VBox/Disassembler/DisasmReg.cpp (modified) (2 diffs)

trunk/include/VBox/dis.h

@@ -432 +432 @@
     } index;
 
-    /** 2, 4 or 8. */
-    uint8_t         scale;
+    /** 2, 4 or 8, if DISUSE_SCALE is set in fUse. */
+    uint8_t         uScale;
     /** Parameter size. */
     uint8_t         cb;

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -592 +592 @@
 void UseSIB(RTUINTPTR uCodePtr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pCpu)
 {
-    unsigned scale, base, index, regtype;
+    unsigned regtype;
     const char **ppszSIBIndexReg;
     const char **ppszSIBBaseReg;
     NOREF(uCodePtr); NOREF(pOp);
 
-    scale = pCpu->SIB.Bits.Scale;
-    base  = pCpu->SIB.Bits.Base;
-    index = pCpu->SIB.Bits.Index;
+    unsigned scale = pCpu->SIB.Bits.Scale;
+    unsigned base  = pCpu->SIB.Bits.Base;
+    unsigned index = pCpu->SIB.Bits.Index;
 
     if (pCpu->uAddrMode == DISCPUMODE_32BIT)
@@ -621 +621 @@
          if (scale != 0)
          {
-             pParam->fUse |= DISUSE_SCALE;
-             pParam->scale  = (1<<scale);
+             pParam->fUse  |= DISUSE_SCALE;
+             pParam->uScale = (1<<scale);
          }
     }

trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp

@@ -732 +732 @@
                             {
                                 PUT_C('*');
-                                PUT_C('0' + pParam->scale);
+                                PUT_C('0' + pParam->uScale);
                             }
                         }

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -564 +564 @@
 
                 if (pParam->fUse & DISUSE_SCALE)
-                    val32 *= pParam->scale;
+                    val32 *= pParam->uScale;
 
                 pParamVal->val.val32 += val32;
@@ -577 +577 @@
 
                 if (pParam->fUse & DISUSE_SCALE)
-                    val64 *= pParam->scale;
+                    val64 *= pParam->uScale;
 
                 pParamVal->val.val64 += val64;