Changeset 38300 in vbox for trunk

Timestamp:

Aug 3, 2011 11:58:41 AM (13 years ago)

Author:

vboxsync

Message:

REM,PGM: Fix A20 syncing between the VMM and the recompiler.

Location:

trunk

Files:

• include/VBox/vmm/rem.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/PGMPhys.cpp (modified) (1 diff)
• src/recompiler/VBoxREM.def (modified) (2 diffs)
• src/recompiler/VBoxREMWrapper.cpp (modified) (3 diffs)
• src/recompiler/VBoxRecompiler.c (modified) (2 diffs)
• src/recompiler/softmmu_header.h (modified) (4 diffs)

trunk/include/VBox/vmm/rem.h

@@ -71 +71 @@
 REMR3DECL(int)  REMR3StateBack(PVM pVM, PVMCPU pVCpu);
 REMR3DECL(void) REMR3StateUpdate(PVM pVM, PVMCPU pVCpu);
-REMR3DECL(void) REMR3A20Set(PVM pVM, PVMCPU pVCpu, bool fEnable);
 REMR3DECL(int)  REMR3DisasEnableStepping(PVM pVM, bool fEnable);
 REMR3DECL(void) REMR3ReplayHandlerNotifications(PVM pVM);

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -3681 +3681 @@
         pVCpu->pgm.s.fA20Enabled = fEnable;
         pVCpu->pgm.s.GCPhysA20Mask = ~(RTGCPHYS)(!fEnable << 20);
-        REMR3A20Set(pVCpu->pVMR3, pVCpu, fEnable);
         /** @todo we're not handling this correctly for VT-x / AMD-V. See #2911 */
     }

trunk/src/recompiler/VBoxREM.def

@@ -5 +5 @@
 
 ;
-; Copyright (C) 2006-2007 Oracle Corporation
+; Copyright (C) 2006-2011 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31 +31 @@
     REMR3StateBack
     REMR3StateUpdate
-    REMR3A20Set
     REMR3DisasEnableStepping
     REMR3ReplayHandlerNotifications

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -361 +361 @@
 static DECLCALLBACKPTR(int, pfnREMR3StateBack)(PVM, PVMCPU);
 static DECLCALLBACKPTR(void, pfnREMR3StateUpdate)(PVM, PVMCPU);
-static DECLCALLBACKPTR(void, pfnREMR3A20Set)(PVM, PVMCPU, bool);
 static DECLCALLBACKPTR(void, pfnREMR3ReplayHandlerNotifications)(PVM pVM);
 static DECLCALLBACKPTR(void, pfnREMR3NotifyPhysRamRegister)(PVM, RTGCPHYS, RTGCPHYS, unsigned);
@@ -1148 +1147 @@
     { "REMR3StateBack",                         (void *)&pfnREMR3StateBack,                         &g_aArgsVMandVMCPU[0],                      RT_ELEMENTS(g_aArgsVMandVMCPU),                        REMFNDESC_FLAGS_RET_INT,    sizeof(int),    NULL },
     { "REMR3StateUpdate",                       (void *)&pfnREMR3StateUpdate,                       &g_aArgsVMandVMCPU[0],                      RT_ELEMENTS(g_aArgsVMandVMCPU),                        REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
-    { "REMR3A20Set",                            (void *)&pfnREMR3A20Set,                            &g_aArgsA20Set[0],                          RT_ELEMENTS(g_aArgsA20Set),                            REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
     { "REMR3ReplayHandlerNotifications",        (void *)&pfnREMR3ReplayHandlerNotifications,        &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
     { "REMR3NotifyPhysRamRegister",             (void *)&pfnREMR3NotifyPhysRamRegister,             &g_aArgsNotifyPhysRamRegister[0],           RT_ELEMENTS(g_aArgsNotifyPhysRamRegister),             REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
@@ -2309 +2307 @@
 }
 
-REMR3DECL(void) REMR3A20Set(PVM pVM, PVMCPU pVCpu, bool fEnable)
-{
-#ifndef USE_REM_STUBS
-    Assert(VALID_PTR(pfnREMR3A20Set));
-    pfnREMR3A20Set(pVM, pVCpu, fEnable);
-#endif
-}
-
 REMR3DECL(void) REMR3ReplayHandlerNotifications(PVM pVM)
 {

trunk/src/recompiler/VBoxRecompiler.c

@@ -2160 +2160 @@
 
     /*
+     * Sync the A20 gate.
+     */
+    bool fA20State = PGMPhysIsA20Enabled(pVCpu);
+    if (fA20State != RT_BOOL(pVM->rem.s.Env.a20_mask & RT_BIT(20)))
+    {
+        ASMAtomicIncU32(&pVM->rem.s.cIgnoreAll);
+        cpu_x86_set_a20(&pVM->rem.s.Env, fA20State);
+        ASMAtomicDecU32(&pVM->rem.s.cIgnoreAll);
+    }
+
+    /*
      * Registers which are rarely changed and require special handling / order when changed.
      */
@@ -2941 +2952 @@
 #undef LOG_GROUP
 #define LOG_GROUP LOG_GROUP_REM
-
-
-/**
- * Notify the recompiler about Address Gate 20 state change.
- *
- * This notification is required since A20 gate changes are
- * initialized from a device driver and the VM might just as
- * well be in REM mode as in RAW mode.
- *
- * @param   pVM         VM handle.
- * @param   pVCpu       VMCPU handle.
- * @param   fEnable     True if the gate should be enabled.
- *                      False if the gate should be disabled.
- */
-REMR3DECL(void) REMR3A20Set(PVM pVM, PVMCPU pVCpu, bool fEnable)
-{
-    LogFlow(("REMR3A20Set: fEnable=%d\n", fEnable));
-    VM_ASSERT_EMT(pVM);
-
-    ASMAtomicIncU32(&pVM->rem.s.cIgnoreAll);
-    cpu_x86_set_a20(&pVM->rem.s.Env, fEnable);
-    ASMAtomicDecU32(&pVM->rem.s.cIgnoreAll);
-}
 
 

trunk/src/recompiler/softmmu_header.h

@@ -87 +87 @@
     RES_TYPE res;
     target_ulong addr;
+#ifdef VBOX
+    uintptr_t physaddr;
+#else
     unsigned long physaddr;
+#endif
     int mmu_idx;
 
@@ -108 +112 @@
     int res, page_index;
     target_ulong addr;
+#ifdef VBOX
+    uintptr_t physaddr;
+#else
     unsigned long physaddr;
+#endif
     int mmu_idx;
 
@@ -133 +141 @@
     int page_index;
     target_ulong addr;
+#ifdef VBOX
+    uintptr_t physaddr;
+#else
     unsigned long physaddr;
+#endif
     int mmu_idx;
 
@@ -207 +219 @@
 #undef MMUSUFFIX
 #undef ADDR_READ
+
+#include <iprt/assert.h>
+AssertCompileSize(uint64_t,8);
+AssertCompileSize(uint32_t,4);
+AssertCompileSize(uint16_t,2);
+AssertCompileSize(uint8_t,1);