Changeset 15605 in vbox for trunk

Timestamp:

Dec 16, 2008 7:54:21 PM (16 years ago)

Author:

vboxsync

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

41117

Message:

#3281: Making #undef HWACCM_VMX_EMULATE_REALMODE work again, looks like the Windows XP hacks doesn't work and that VT-x doesn't like esp >= ss.limit. Make sure we update the limit and everything else in that case.

Location:

trunk/src

Files:

• VBox/VMM/HWACCM.cpp (modified) (4 diffs)
• VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (3 diffs)
• VBox/VMM/VMMR0/HWVMXR0.h (modified) (1 diff)
• recompiler_new/VBoxRecompiler.c (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -782 +782 @@
 
             /* Allocate three pages for the TSS we need for real mode emulation. (2 page for the IO bitmap) */
+#if 1
             rc = PDMR3VMMDevHeapAlloc(pVM, HWACCM_VTX_TOTAL_DEVHEAP_MEM, (RTR3PTR *)&pVM->hwaccm.s.vmx.pRealModeTSS);
+#else
+            rc = VERR_NO_MEMORY; /* simulation of no VMMDev Heap. */
+#endif
             if (RT_SUCCESS(rc))
             {
-
                 /* The I/O bitmap starts right after the virtual interrupt redirection bitmap. */
                 ASMMemZero32(pVM->hwaccm.s.vmx.pRealModeTSS, sizeof(*pVM->hwaccm.s.vmx.pRealModeTSS));
@@ -1249 +1252 @@
         if (!CPUMIsGuestInLongModeEx(pCtx))
         {
+            /** @todo   This should (probably) be set on every excursion to the REM,
+             *          however it's too risky right now. So, only apply it when we go
+             *          back to REM for real mode execution. (The XP hack below doesn't
+             *          work reliably without this.) */
+            pVM->aCpus[0].hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_ALL_GUEST;
+
             /* Too early for VT-x; Solaris guests will fail with a guru meditation otherwise; same for XP. */
             if (pCtx->idtr.pIdt == 0 || pCtx->idtr.cbIdt == 0 || pCtx->tr == 0)
@@ -1260 +1269 @@
             if (pCtx->ssHid.Attr.n.u1Present == 0)
                 return false;
+
+            /* Windows XP: possible same as above, but new recompiler requires new heuristics?
+               VT-x doesn't seem to like something about the guest state and this stuff avoids it. */
+            if (pCtx->rsp >= pCtx->ssHid.u32Limit)
+                return false;
+#if 0
+            if (    pCtx->cs >= pCtx->gdtr.cbGdt
+                ||  pCtx->ss >= pCtx->gdtr.cbGdt
+                ||  pCtx->ds >= pCtx->gdtr.cbGdt
+                ||  pCtx->es >= pCtx->gdtr.cbGdt
+                ||  pCtx->fs >= pCtx->gdtr.cbGdt
+                ||  pCtx->gs >= pCtx->gdtr.cbGdt)
+                return false;
+#endif
         }
     }
@@ -1502 +1525 @@
 }
 
-
-
-

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1431 +1431 @@
         val =   0
 #ifdef HWACCM_VMX_EMULATE_REALMODE
-              | X86_CR4_VME
+              | (pVM->hwaccm.s.vmx.pRealModeTSS ? X86_CR4_VME : 0)
 #endif
               | X86_CR4_PAE
@@ -3121 +3121 @@
 
         VMXReadVMCS(VMX_VMCS64_GUEST_CR0, &val);
-        Log(("VMX_VMCS_GUEST_CR0        %RX64\n", val));
+        Log(("VMX_VMCS_GUEST_CR0        %RX64\n", (uint64_t)val));
 
         VMXReadVMCS(VMX_VMCS64_GUEST_CR3, &val);
-        Log(("VMX_VMCS_GUEST_CR3        %RGp\n", val));
+        Log(("VMX_VMCS_GUEST_CR3        %RX64\n", (uint64_t)val));
 
         VMXReadVMCS(VMX_VMCS64_GUEST_CR4, &val);
-        Log(("VMX_VMCS_GUEST_CR4        %RX64\n", val));
+        Log(("VMX_VMCS_GUEST_CR4        %RX64\n", (uint64_t)val));
 
         VMXReadVMCS(VMX_VMCS_GUEST_RFLAGS, &val);
@@ -3142 +3142 @@
 
         VMXReadVMCS(VMX_VMCS64_GUEST_GDTR_BASE, &val);
-        Log(("VMX_VMCS_GUEST_GDTR_BASE    %RGv\n", val));
+        Log(("VMX_VMCS_GUEST_GDTR_BASE    %RX64\n", (uint64_t)val));
         VMXReadVMCS(VMX_VMCS64_GUEST_IDTR_BASE, &val);
-        Log(("VMX_VMCS_GUEST_IDTR_BASE    %RGv\n", val));
+        Log(("VMX_VMCS_GUEST_IDTR_BASE    %RX64\n", (uint64_t)val));
 #endif /* VBOX_STRICT */
         rc = VERR_VMX_INVALID_GUEST_STATE;

trunk/src/VBox/VMM/VMMR0/HWVMXR0.h

@@ -263 +263 @@
         Log(("%s Limit        %x\n", szSelReg, val));                \
         VMXReadVMCS(VMX_VMCS64_GUEST_##REG##_BASE,          &val);   \
-        Log(("%s Base         %RX64\n", szSelReg, val));             \
+        Log(("%s Base         %RX64\n", szSelReg, (uint64_t)val));   \
         VMXReadVMCS(VMX_VMCS32_GUEST_##REG##_ACCESS_RIGHTS, &val);   \
         Log(("%s Attributes   %x\n", szSelReg, val));                \

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -1035 +1035 @@
         Ctx.idtr.pIdt      = env->idt.base;
 
+        Ctx.gdtr.cbGdt     = env->gdt.limit;
+        Ctx.gdtr.pGdt      = env->gdt.base;
+
+        Ctx.rsp            = env->regs[R_ESP];
+#ifdef LOG_ENABLED
+        Ctx.rip            = env->eip;
+#endif
+
         Ctx.eflags.u32     = env->eflags;
 
@@ -1377 +1385 @@
     if (!fGlobal && !(env->cr[4] & X86_CR4_PGE))
         fGlobal = true;
-    Log(("remR3FlushTLB: CR0=%RGr CR3=%RGr CR4=%RGr %s\n", env->cr[0], env->cr[3], env->cr[4], fGlobal ? " global" : ""));
+    Log(("remR3FlushTLB: CR0=%08RX64 CR3=%08RX64 CR4=%08RX64 %s\n", (uint64_t)env->cr[0], (uint64_t)env->cr[3], (uint64_t)env->cr[4], fGlobal ? " global" : ""));
 
     /*