Changeset 10276 in vbox

Timestamp:

Jul 5, 2008 1:47:48 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

32888

Message:

Handle 64 bits index (SIB).

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmReg.cpp (modified) (1 diff)
• DisasmTest.cpp (modified) (1 diff)

trunk/src/VBox/Disassembler/DisasmReg.cpp

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

trunk/src/VBox/Disassembler/DisasmTest.cpp

@@ -78 +78 @@
             char         szOutput[256];
 
-__debugbreak();
             memset(&cpu, 0, sizeof(cpu));
             cpu.mode = CPUMODE_64BIT;