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

call correctly resolve_memtype function

Browse Source
This commit is contained in:
Stanislav Shwartsman 2015-03-21 20:28:22 +00:00
parent 56323b2806
commit 05635a9534
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/cpu/paging.cc
View File

@ -700,7 +700,7 @@ bx_phy_address BX_CPU_C::translate_linear_long_mode(bx_address laddr, Bit32u &lp
#endif
#if BX_SUPPORT_MEMTYPE
entry_memtype[leaf] = resolve_memtype(entry_addr[leaf], memtype_by_pat(calculate_pcd_pwt((Bit32u) curr_entry)));
entry_memtype[leaf] = resolve_memtype(memtype_by_mtrr(entry_addr[leaf]), memtype_by_pat(calculate_pcd_pwt((Bit32u) curr_entry)));
#endif
access_read_physical(entry_addr[leaf], 8, &entry[leaf]);
BX_NOTIFY_PHY_MEMORY_ACCESS(entry_addr[leaf], 8, entry_memtype[leaf], BX_READ, (BX_PTE_ACCESS + leaf), (Bit8u*)(&entry[leaf]));
@ -927,7 +927,7 @@ bx_phy_address BX_CPU_C::translate_linear_PAE(bx_address laddr, Bit32u &lpf_mask
#endif
#if BX_SUPPORT_MEMTYPE
entry_memtype[leaf] = resolve_memtype(entry_addr[leaf], memtype_by_pat(calculate_pcd_pwt((Bit32u) curr_entry)));
entry_memtype[leaf] = resolve_memtype(memtype_by_mtrr(entry_addr[leaf]), memtype_by_pat(calculate_pcd_pwt((Bit32u) curr_entry)));
#endif
access_read_physical(entry_addr[leaf], 8, &entry[leaf]);
BX_NOTIFY_PHY_MEMORY_ACCESS(entry_addr[leaf], 8, entry_memtype[leaf], BX_READ, (BX_PTE_ACCESS + leaf), (Bit8u*)(&entry[leaf]));
@ -1039,7 +1039,7 @@ bx_phy_address BX_CPU_C::translate_linear_legacy(bx_address laddr, Bit32u &lpf_m
#endif
#if BX_SUPPORT_MEMTYPE
entry_memtype[leaf] = resolve_memtype(entry_addr[leaf], memtype_by_pat(calculate_pcd_pwt(curr_entry)));
entry_memtype[leaf] = resolve_memtype(memtype_by_mtrr(entry_addr[leaf]), memtype_by_pat(calculate_pcd_pwt(curr_entry)));
#endif
access_read_physical(entry_addr[leaf], 4, &entry[leaf]);
BX_NOTIFY_PHY_MEMORY_ACCESS(entry_addr[leaf], 4, entry_memtype[leaf], BX_READ, (BX_PTE_ACCESS + leaf), (Bit8u*)(&entry[leaf]));