From 96732e8650592415bcd28e13b3188ed754504b57 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 13 Jun 2010 19:54:13 +0000 Subject: [PATCH] X86VMTranslationMap{32bit,PAE}::UnmapPage(): Added some helpful output to asserts. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37128 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp | 5 +++-- .../kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp b/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp index 8c0c5ce3e1..482086b368 100644 --- a/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp +++ b/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp @@ -334,7 +334,7 @@ X86VMTranslationMap32Bit::UnmapPage(VMArea* area, addr_t address, // get the page vm_page* page = vm_lookup_page( (oldEntry & X86_PTE_ADDRESS_MASK) / B_PAGE_SIZE); - ASSERT(page != NULL); + ASSERT_PRINT(page != NULL, "page: %p, pte: %#" B_PRIx32, page, oldEntry); // transfer the accessed/dirty flags to the page if ((oldEntry & X86_PTE_ACCESSED) != 0) @@ -354,7 +354,8 @@ X86VMTranslationMap32Bit::UnmapPage(VMArea* area, addr_t address, } } - ASSERT(mapping != NULL); + ASSERT_PRINT(mapping != NULL, "page: %p, pte: %#" B_PRIx32, page, + oldEntry); } else page->wired_count--; diff --git a/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp b/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp index 97a7bd85aa..3b93712126 100644 --- a/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp +++ b/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp @@ -365,7 +365,7 @@ X86VMTranslationMapPAE::UnmapPage(VMArea* area, addr_t address, // get the page vm_page* page = vm_lookup_page( (oldEntry & X86_PAE_PTE_ADDRESS_MASK) / B_PAGE_SIZE); - ASSERT(page != NULL); + ASSERT_PRINT(page != NULL, "page: %p, pte: %#" B_PRIx64, page, oldEntry); // transfer the accessed/dirty flags to the page if ((oldEntry & X86_PAE_PTE_ACCESSED) != 0) @@ -388,7 +388,8 @@ X86VMTranslationMapPAE::UnmapPage(VMArea* area, addr_t address, } } - ASSERT(mapping != NULL); + ASSERT_PRINT(mapping != NULL, "page: %p, pte: %#" B_PRIx64, page, + oldEntry); } else page->wired_count--;