vbox的更動 10277 路徑 trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

時間撮記:

2008-7-5 下午02:02:00 (16 年 以前)

作者:

vboxsync

訊息:

Deal with 8 byte movsx instructions.

檔案:

• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (修改) (6 筆差異)

trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

@@ -179 +179 @@
      */
     unsigned cb = DISGetParamSize(pCpu, &pCpu->param2);
-    AssertMsg(cb > 0 && cb <= sizeof(uint32_t), ("cb=%d\n", cb));
-
-    uint32_t u32Data = 0;
-    int rc = iomMMIODoRead(pVM, pRange, GCPhysFault, &u32Data, cb);
+    AssertMsg(cb > 0 && cb <= sizeof(uint64_t), ("cb=%d\n", cb));
+
+    uint64_t u64Data = 0;
+    int rc = iomMMIODoRead(pVM, pRange, GCPhysFault, &u64Data, cb);
     if (rc == VINF_SUCCESS)
     {
@@ -194 +194 @@
             {
                 /* DWORD <- BYTE */
-                int32_t iData = (int8_t)u32Data;
-                u32Data = (uint32_t)iData;
+                int64_t iData = (int8_t)u64Data;
+                u64Data = (uint64_t)iData;
             }
             else
             {
                 /* DWORD <- WORD */
-                int32_t iData = (int16_t)u32Data;
-                u32Data = (uint32_t)iData;
+                int64_t iData = (int16_t)u64Data;
+                u64Data = (uint64_t)iData;
             }
         }
@@ -208 +208 @@
          * Store the result to register (parameter 1).
          */
-        bool fRc = iomSaveDataToReg(pCpu, &pCpu->param1, pRegFrame, u32Data);
+        bool fRc = iomSaveDataToReg(pCpu, &pCpu->param1, pRegFrame, u64Data);
         AssertMsg(fRc, ("Failed to store register value!\n")); NOREF(fRc);
     }
@@ -319 +319 @@
      */
     unsigned cb = DISGetParamSize(pCpu, &pCpu->param1);
-    Assert(cb);
+    AssertMsg(cb > 0 && cb <= sizeof(uint32_t), ("cb=%d\n", cb));
     int      offIncrement = pRegFrame->eflags.Bits.u1DF ? -(signed)cb : (signed)cb;
 
@@ -557 +557 @@
      */
     unsigned cb = DISGetParamSize(pCpu, &pCpu->param1);
-    Assert(cb);
+    AssertMsg(cb > 0 && cb <= sizeof(uint32_t), ("cb=%d\n", cb));
     int      offIncrement = pRegFrame->eflags.Bits.u1DF ? -(signed)cb : (signed)cb;
 
@@ -663 +663 @@
      */
     unsigned cb = DISGetParamSize(pCpu, &pCpu->param2);
-    Assert(cb);
+    AssertMsg(cb > 0 && cb <= sizeof(uint32_t), ("cb=%d\n", cb));
     int     offIncrement = pRegFrame->eflags.Bits.u1DF ? -(signed)cb : (signed)cb;