Changeset 12023 in vbox

Timestamp:

Sep 3, 2008 9:52:16 AM (16 years ago)

Author:

vboxsync

Message:

Must sync the HF_LMA_MASK too

File:

• trunk/src/recompiler/VBoxRecompiler.c (modified) (5 diffs)

trunk/src/recompiler/VBoxRecompiler.c

@@ -1521 +1521 @@
     }
 #endif
-    Log(("remR3NotifyTrap: uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%08x\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]));
+    Log(("remR3NotifyTrap: uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%VGv\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]));
     if(   uTrap < 0x20
        && (env->cr[0] & X86_CR0_PE)
@@ -1705 +1705 @@
     pVM->rem.s.Env.fmask        = pCtx->msrSFMASK;
     pVM->rem.s.Env.kernelgsbase = pCtx->msrKERNELGSBASE;
+
+    /* Update the internal long mode activate flag according to the new EFER value. */
+    if (pCtx->msrEFER & MSR_K6_EFER_LMA)
+        pVM->rem.s.Env.hflags |= HF_LMA_MASK;
+    else
+        pVM->rem.s.Env.hflags &= ~(HF_LMA_MASK | HF_CS64_MASK);
 #endif
 
@@ -1712 +1718 @@
      */
     fFlags = CPUMGetAndClearChangedFlagsREM(pVM);
+    LogFlow(("CPUMGetAndClearChangedFlagsREM %x\n", fFlags));
     if (fFlags & (  CPUM_CHANGED_CR4  | CPUM_CHANGED_CR3  | CPUM_CHANGED_CR0
                   | CPUM_CHANGED_GDTR | CPUM_CHANGED_IDTR | CPUM_CHANGED_LDTR | CPUM_CHANGED_TR
@@ -1726 +1733 @@
         }
 
+        /* CR4 before CR0! */
         if (fFlags & CPUM_CHANGED_CR4)
         {
@@ -3484 +3492 @@
 #ifdef USE_OLD_DUMP_AND_DISASSEMBLY
     PVM pVM = env->pVM;
+
+    /* Doesn't work in long mode. */
+    if (env->hflags & HF_LMA_MASK)
+        return false; 
 
     /*