Changeset 13175 in vbox

Timestamp:

Oct 10, 2008 1:30:50 PM (16 years ago)

Author:

vboxsync

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

37698

Message:

Proper naming

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (2 diffs)
• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -602 +602 @@
              * real and protected mode without paging with EPT.
              */
-            pVM->hwaccm.s.vmx.pRealModeEPTPageTable = (PX86PD)((char *)pVM->hwaccm.s.vmx.pRealModeTSS + PAGE_SIZE * 3);
+            pVM->hwaccm.s.vmx.pNonPagingModeEPTPageTable = (PX86PD)((char *)pVM->hwaccm.s.vmx.pRealModeTSS + PAGE_SIZE * 3);
             for (unsigned i=0;i<X86_PG_ENTRIES;i++)
             {
-                pVM->hwaccm.s.vmx.pRealModeEPTPageTable->a[i].u = X86_PDE4M_P | X86_PDE4M_RW | X86_PDE4M_US | X86_PDE4M_A | X86_PDE4M_D | X86_PDE4M_PS | X86_PDE4M_G;
-                pVM->hwaccm.s.vmx.pRealModeEPTPageTable->a[i].b.u10PageNo  = _4M * i;
+                pVM->hwaccm.s.vmx.pNonPagingModeEPTPageTable->a[i].u = X86_PDE4M_P | X86_PDE4M_RW | X86_PDE4M_US | X86_PDE4M_A | X86_PDE4M_D | X86_PDE4M_PS | X86_PDE4M_G;
+                pVM->hwaccm.s.vmx.pNonPagingModeEPTPageTable->a[i].b.u10PageNo  = _4M * i;
             }
 
@@ -614 +614 @@
             LogRel(("HWACCM: Real Mode TSS guest physaddr  = %VGp\n", GCPhys));
 
-            rc = PDMVMMDevHeapR3ToGCPhys(pVM, pVM->hwaccm.s.vmx.pRealModeEPTPageTable, &GCPhys);
+            rc = PDMVMMDevHeapR3ToGCPhys(pVM, pVM->hwaccm.s.vmx.pNonPagingModeEPTPageTable, &GCPhys);
             AssertRC(rc);            
-            LogRel(("HWACCM: Real Mode EPT CR3             = %VGp\n", GCPhys));
+            LogRel(("HWACCM: Non-Paging Mode EPT CR3       = %VGp\n", GCPhys));
 
             rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_HWACC_SETUP_VM, 0, NULL);

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -240 +240 @@
         R3PTRTYPE(PVBOXTSS)         pRealModeTSS;
 
-        /** Virtual address of the identity page table used for real mode emulation in EPT mode. */
-        R3PTRTYPE(PX86PD)           pRealModeEPTPageTable;
+        /** Virtual address of the identity page table used for real mode and protected mode without paging emulation in EPT mode. */
+        R3PTRTYPE(PX86PD)           pNonPagingModeEPTPageTable;
 
         /** R0 memory object for the virtual APIC mmio cache. */

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

@@ -1212 +1212 @@
 
                 /* We convert it here every time as pci regions could be reconfigured. */
-                rc = PDMVMMDevHeapR3ToGCPhys(pVM, pVM->hwaccm.s.vmx.pRealModeEPTPageTable, &GCPhys);
+                rc = PDMVMMDevHeapR3ToGCPhys(pVM, pVM->hwaccm.s.vmx.pNonPagingModeEPTPageTable, &GCPhys);
                 AssertRC(rc);