儲存庫 vbox 的更動 12404

時間撮記:

2008-9-11 下午02:58:38 (16 年 以前)

作者:

vboxsync

訊息:

Cut off calculated addresses when not in 64 bits mode. (fixes OS/2 guests #3115)

檔案:

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

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

@@ -127 +127 @@
         }
     }
-    return (RTGCPTR)(pHiddenSel->u64Base + (RTGCUINTPTR)Addr);
+    /* AMD64 manual: compatibility mode ignores the high 32 bits when calculating an effective address. */
+    Assert(pHiddenSel->u64Base <= 0xffffffff);
+    return ((pHiddenSel->u64Base + (RTGCUINTPTR)Addr) & 0xffffffff);
 }
 
@@ -208 +210 @@
         }
         else
-            pvFlat = (RTGCPTR)(pHiddenSel->u64Base + (RTGCUINTPTR)Addr);
+        {
+            /* AMD64 manual: compatibility mode ignores the high 32 bits when calculating an effective address. */
+            Assert(pHiddenSel->u64Base <= 0xffffffff);
+            pvFlat = (RTGCPTR)((pHiddenSel->u64Base + (RTGCUINTPTR)Addr) & 0xffffffff);
+        }
 
         /*
@@ -489 +495 @@
         u32Limit      = pHiddenSel->u32Limit;
         pvFlat        = (RTGCPTR)(pHiddenSel->u64Base + (RTGCUINTPTR)Addr);
+
+        if (   !CPUMIsGuestInLongMode(pVM)
+            || !pHiddenSel->Attr.n.u1Long)
+        {
+            /* AMD64 manual: compatibility mode ignores the high 32 bits when calculating an effective address. */
+            pvFlat &= 0xffffffff;
+        }
     }
     else