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

時間撮記:

2008-7-8 下午04:29:43 (16 年 以前)

作者:

vboxsync

訊息:

Possible fix for Linux guest regression

檔案:

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

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -554 +554 @@
                 if (VBOX_FAILURE(DISFetchReg64(pCtx, pParam->base.reg_gen, &pParamVal->val.val64))) return VERR_INVALID_PARAMETER;
             }
-            else {
+            else 
+            {
                 AssertFailed();
                 return VERR_INVALID_PARAMETER;
@@ -562 +563 @@
         if (pParam->flags & USE_INDEX)
         {
-            uint64_t val64;
-
             if (pParam->flags & USE_REG_GEN32)
             {
@@ -571 +570 @@
                 if (VBOX_FAILURE(DISFetchReg32(pCtx, pParam->index.reg_gen, &val32))) return VERR_INVALID_PARAMETER;
 
-                val64 = val32;
+                if (pParam->flags & USE_SCALE)
+                    val32 *= pParam->scale;
+
+                pParamVal->val.val32 += val32;
             }
             else
             if (pParam->flags & USE_REG_GEN64)
             {
+                uint64_t val64;
+
                 pParamVal->flags |= PARAM_VAL64;
                 if (VBOX_FAILURE(DISFetchReg64(pCtx, pParam->index.reg_gen, &val64))) return VERR_INVALID_PARAMETER;
-            }
-
-            if (pParam->flags & USE_SCALE)
-                val64 *= pParam->scale;
-
-            pParamVal->val.val64 += val64;
+
+                if (pParam->flags & USE_SCALE)
+                    val64 *= pParam->scale;
+
+                pParamVal->val.val64 += val64;
+            }
         }