i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong address mask (page directory vs. page table).

Browse Source
This commit is contained in:
Michael Lotz
2012-12-04 23:38:07 +01:00
parent fd6e3a11e2
commit 926d1024d0
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/arm/paging/32bit/ARMVMTranslationMap32Bit.cpp
+3 -4
View File
@@ -574,8 +574,7 @@ ARMVMTranslationMap32Bit::Query(addr_t va, phys_addr_t *_physical,
pd[index] & ARM_PDE_ADDRESS_MASK); pd[index] & ARM_PDE_ADDRESS_MASK);
page_table_entry entry = pt[VADDR_TO_PTENT(va)]; page_table_entry entry = pt[VADDR_TO_PTENT(va)];
*_physical = (entry & ARM_PDE_ADDRESS_MASK) *_physical = (entry & ARM_PTE_ADDRESS_MASK) | VADDR_TO_PGOFF(va);
| VADDR_TO_PGOFF(va);
#if 0 //IRA #if 0 //IRA
// read in the page state flags // read in the page state flags
@@ -622,8 +621,8 @@ ARMVMTranslationMap32Bit::QueryInterrupt(addr_t va, phys_addr_t *_physical,
pd[index] & ARM_PDE_ADDRESS_MASK); pd[index] & ARM_PDE_ADDRESS_MASK);
page_table_entry entry = pt[VADDR_TO_PTENT(va)]; page_table_entry entry = pt[VADDR_TO_PTENT(va)];
*_physical = (entry & ARM_PDE_ADDRESS_MASK) *_physical = (entry & ARM_PTE_ADDRESS_MASK) | VADDR_TO_PGOFF(va);
| VADDR_TO_PGOFF(va);
#if 0 #if 0
// read in the page state flags // read in the page state flags
if ((entry & ARM_PTE_USER) != 0) { if ((entry & ARM_PTE_USER) != 0) {