vbox的更動 17106 路徑 trunk/src/recompiler_new

時間撮記:

2009-2-25 上午12:35:15 (16 年 以前)

作者:

vboxsync

訊息:

VMM,REM: Removed the single page limitation on the TSS monitoring and going over the interrupt redirection bitmap monitoring.

檔案:

• trunk/src/recompiler_new/VBoxRecompiler.c (修改) (7 筆差異)

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -1283 +1283 @@
     pCtx->cr0 = env->cr[0];
     pCtx->cr3 = env->cr[3];
+    if ((env->cr[4] ^ pCtx->cr4) & X86_CR4_VME)
+        VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
     pCtx->cr4 = env->cr[4];
 
@@ -1403 +1405 @@
     pCtx->cr0 = env->cr[0];
     pCtx->cr3 = env->cr[3];
+    if ((env->cr[4] ^ pCtx->cr4) & X86_CR4_VME)
+        VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
     pCtx->cr4 = env->cr[4];
 
@@ -1438 +1442 @@
     pCtx->cr0 = env->cr[0];
     pCtx->cr3 = env->cr[3];
+    if ((env->cr[4] ^ pCtx->cr4) & X86_CR4_VME)
+        VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
     pCtx->cr4 = env->cr[4];
 
@@ -2137 +2143 @@
     pCtx->cr2           = pVM->rem.s.Env.cr[2];
     pCtx->cr3           = pVM->rem.s.Env.cr[3];
+    if ((pVM->rem.s.Env.cr[4] ^ pCtx->cr4) & X86_CR4_VME)
+        VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
     pCtx->cr4           = pVM->rem.s.Env.cr[4];
 
-    for (i=0;i<8;i++)
+    for (i = 0; i < 8; i++)
         pCtx->dr[i] = pVM->rem.s.Env.dr[i];
 
@@ -2349 +2357 @@
     pCtx->cr2           = pVM->rem.s.Env.cr[2];
     pCtx->cr3           = pVM->rem.s.Env.cr[3];
+    if ((pVM->rem.s.Env.cr[4] ^ pCtx->cr4) & X86_CR4_VME)
+        VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
     pCtx->cr4           = pVM->rem.s.Env.cr[4];
 
-    for (i=0;i<8;i++)
+    for (i = 0; i < 8; i++)
         pCtx->dr[i] = pVM->rem.s.Env.dr[i];
 
@@ -2370 +2380 @@
     }
 
-    if (pCtx->ldtr != pVM->rem.s.Env.ldt.selector)
-    {
-        pCtx->ldtr      = pVM->rem.s.Env.ldt.selector;
+    if (    pCtx->ldtr             != pVM->rem.s.Env.ldt.selector
+        ||  pCtx->ldtrHid.u64Base  != pVM->rem.s.Env.ldt.base
+        ||  pCtx->ldtrHid.u32Limit != pVM->rem.s.Env.ldt.limit
+        ||  pCtx->ldtrHid.Attr.u   != ((pVM->rem.s.Env.ldt.flags >> 8) & 0xF0FF))
+    {
+        pCtx->ldtr              = pVM->rem.s.Env.ldt.selector;
+        pCtx->ldtrHid.u64Base   = pVM->rem.s.Env.ldt.base;
+        pCtx->ldtrHid.u32Limit  = pVM->rem.s.Env.ldt.limit;
+        pCtx->ldtrHid.Attr.u    = (pVM->rem.s.Env.ldt.flags >> 8) & 0xFFFF;
         STAM_COUNTER_INC(&gStatREMLDTRChange);
         VM_FF_SET(pVM, VM_FF_SELM_SYNC_LDT);
     }
-    if (pCtx->tr != pVM->rem.s.Env.tr.selector)
-    {
-        pCtx->tr        = pVM->rem.s.Env.tr.selector;
+
+    if (    pCtx->tr             != pVM->rem.s.Env.tr.selector
+        ||  pCtx->trHid.u64Base  != pVM->rem.s.Env.tr.base
+        ||  pCtx->trHid.u32Limit != pVM->rem.s.Env.tr.limit
+            /* Qemu and AMD/Intel have different ideas about the busy flag ... */
+        ||  pCtx->trHid.Attr.u   != (  (pVM->rem.s.Env.tr.flags >> 8) & 0xF0FF
+                                     ? (pVM->rem.s.Env.tr.flags | DESC_TSS_BUSY_MASK) >> 8
+                                     : 0) )
+    {
+        Log(("REM: TR changed! %#x{%#llx,%#x,%#x} -> %#x{%llx,%#x,%#x}\n",
+             pCtx->tr, pCtx->trHid.u64Base, pCtx->trHid.u32Limit, pCtx->trHid.Attr.u,
+             pVM->rem.s.Env.tr.selector, (uint64_t)pVM->rem.s.Env.tr.base, pVM->rem.s.Env.tr.limit,
+             (pVM->rem.s.Env.tr.flags >> 8) & 0xF0FF ? (pVM->rem.s.Env.tr.flags | DESC_TSS_BUSY_MASK) >> 8 : 0));
+        pCtx->tr                = pVM->rem.s.Env.tr.selector;
+        pCtx->trHid.u64Base     = pVM->rem.s.Env.tr.base;
+        pCtx->trHid.u32Limit    = pVM->rem.s.Env.tr.limit;
+        pCtx->trHid.Attr.u      = (pVM->rem.s.Env.tr.flags >> 8) & 0xF0FF;
+        if (pCtx->trHid.Attr.u)
+            pCtx->trHid.Attr.u |= DESC_TSS_BUSY_MASK >> 8;
         STAM_COUNTER_INC(&gStatREMTRChange);
         VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
@@ -2408 +2440 @@
     pCtx->ssHid.u32Limit   = pVM->rem.s.Env.segs[R_SS].limit;
     pCtx->ssHid.Attr.u     = (pVM->rem.s.Env.segs[R_SS].flags >> 8) & 0xFFFF;
-
-    pCtx->ldtrHid.u64Base  = pVM->rem.s.Env.ldt.base;
-    pCtx->ldtrHid.u32Limit = pVM->rem.s.Env.ldt.limit;
-    pCtx->ldtrHid.Attr.u   = (pVM->rem.s.Env.ldt.flags >> 8) & 0xFFFF;
-
-    pCtx->trHid.u64Base    = pVM->rem.s.Env.tr.base;
-    pCtx->trHid.u32Limit   = pVM->rem.s.Env.tr.limit;
-    pCtx->trHid.Attr.u     = (pVM->rem.s.Env.tr.flags >> 8) & 0xFFFF;
 
     /* Sysenter MSR */