mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed VMX+EPT VirtualBox failures

Browse Source
This commit is contained in:
Stanislav Shwartsman 2012-01-06 10:30:07 +00:00
parent c98decb552
commit edfff5bf44
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bochs/cpu/paging.cc
View File

@ -1164,17 +1164,18 @@ bx_phy_address BX_CPU_C::translate_linear(bx_address laddr, unsigned user, unsig
ppf = (bx_phy_address) lpf; ppf = (bx_phy_address) lpf;
} }
// Calculate physical memory address and fill in TLB cache entry
paddress = A20ADDR(ppf | poffset);
#if BX_SUPPORT_VMX >= 2 #if BX_SUPPORT_VMX >= 2
if (BX_CPU_THIS_PTR in_vmx_guest) { if (BX_CPU_THIS_PTR in_vmx_guest) {
if (SECONDARY_VMEXEC_CONTROL(VMX_VM_EXEC_CTRL3_EPT_ENABLE)) { if (SECONDARY_VMEXEC_CONTROL(VMX_VM_EXEC_CTRL3_EPT_ENABLE)) {
ppf = translate_guest_physical(ppf, laddr, 1, 0, rw); paddress = translate_guest_physical(paddress, laddr, 1, 0, rw);
ppf = PPFOf(paddress);
} }
} }
#endif #endif
// Calculate physical memory address and fill in TLB cache entry
paddress = A20ADDR(ppf | poffset);
// direct memory access is NOT allowed by default // direct memory access is NOT allowed by default
tlbEntry->lpf = lpf | TLB_HostPtr; tlbEntry->lpf = lpf | TLB_HostPtr;
tlbEntry->lpf_mask = lpf_mask; tlbEntry->lpf_mask = lpf_mask;