vbox的更動 41663 路徑 trunk/src/VBox/Disassembler/DisasmReg.cpp

時間撮記:

2012-6-12 上午08:40:22 (12 年 以前)

作者:

vboxsync

訊息:

DIS,EM,PGM,PATM: Changed the size and scale members of OP_PARAMETER from uint32_t to uint8_t, saving 4 more bytes.

檔案:

• trunk/src/VBox/Disassembler/DisasmReg.cpp (修改) (9 筆差異)

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -260 +260 @@
 
     default:
-        if (pParam->size)
-            return pParam->size;
+        if (pParam->cb)
+            return pParam->cb;
         else //@todo dangerous!!!
             return 4;
@@ -523 +523 @@
         // Effective address
         pParamVal->type = PARMTYPE_ADDRESS;
-        pParamVal->size = pParam->size;
+        pParamVal->size = pParam->cb;
 
         if (pParam->flags & USE_BASE)
@@ -651 +651 @@
             // Caller needs to interpret the register according to the instruction (source/target, special value etc)
             pParamVal->type = PARMTYPE_REGISTER;
-            pParamVal->size = pParam->size;
+            pParamVal->size = pParam->cb;
             return VINF_SUCCESS;
         }
@@ -700 +700 @@
         {
             pParamVal->flags |= PARAM_VAL8;
-            if (pParam->size == 2)
+            if (pParam->cb == 2)
             {
                 pParamVal->size   = sizeof(uint16_t);
@@ -717 +717 @@
             pParamVal->size   = sizeof(uint16_t);
             pParamVal->val.val16 = (uint16_t)pParam->parval;
-            AssertMsg(pParamVal->size == pParam->size || ((pParam->size == 1) && (pParam->flags & USE_IMMEDIATE16_SX8)), ("pParamVal->size %d vs %d EIP=%RX32\n", pParamVal->size, pParam->size, pCtx->eip) );
+            AssertMsg(pParamVal->size == pParam->cb || ((pParam->cb == 1) && (pParam->flags & USE_IMMEDIATE16_SX8)), ("pParamVal->size %d vs %d EIP=%RX32\n", pParamVal->size, pParam->cb, pCtx->eip) );
         }
         else
@@ -725 +725 @@
             pParamVal->size   = sizeof(uint32_t);
             pParamVal->val.val32 = (uint32_t)pParam->parval;
-            Assert(pParamVal->size == pParam->size || ((pParam->size == 1) && (pParam->flags & USE_IMMEDIATE32_SX8)) );
+            Assert(pParamVal->size == pParam->cb || ((pParam->cb == 1) && (pParam->flags & USE_IMMEDIATE32_SX8)) );
         }
         else
@@ -733 +733 @@
             pParamVal->size   = sizeof(uint64_t);
             pParamVal->val.val64 = pParam->parval;
-            Assert(pParamVal->size == pParam->size || ((pParam->size == 1) && (pParam->flags & USE_IMMEDIATE64_SX8)) );
+            Assert(pParamVal->size == pParam->cb || ((pParam->cb == 1) && (pParam->flags & USE_IMMEDIATE64_SX8)) );
         }
         else
@@ -742 +742 @@
             pParamVal->val.farptr.sel    = (uint16_t)RT_LOWORD(pParam->parval >> 16);
             pParamVal->val.farptr.offset = (uint32_t)RT_LOWORD(pParam->parval);
-            Assert(pParamVal->size == pParam->size);
+            Assert(pParamVal->size == pParam->cb);
         }
         else
@@ -751 +751 @@
             pParamVal->val.farptr.sel    = (uint16_t)RT_LOWORD(pParam->parval >> 32);
             pParamVal->val.farptr.offset = (uint32_t)(pParam->parval & 0xFFFFFFFF);
-            Assert(pParam->size == 8);
+            Assert(pParam->cb == 8);
         }
     }