Author: bonefish Date: 2010-06-13 21:54:13 +0200 (Sun, 13 Jun 2010) New Revision: 37128 Changeset: http://dev.haiku-os.org/changeset/37128/haiku Modified: haiku/trunk/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp haiku/trunk/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp Log: X86VMTranslationMap{32bit,PAE}::UnmapPage(): Added some helpful output to asserts. Modified: haiku/trunk/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp =================================================================== --- haiku/trunk/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp 2010-06-13 18:59:11 UTC (rev 37127) +++ haiku/trunk/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp 2010-06-13 19:54:13 UTC (rev 37128) @@ -334,7 +334,7 @@ // 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 @@ } } - ASSERT(mapping != NULL); + ASSERT_PRINT(mapping != NULL, "page: %p, pte: %#" B_PRIx32, page, + oldEntry); } else page->wired_count--; Modified: haiku/trunk/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp =================================================================== --- haiku/trunk/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp 2010-06-13 18:59:11 UTC (rev 37127) +++ haiku/trunk/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp 2010-06-13 19:54:13 UTC (rev 37128) @@ -365,7 +365,7 @@ // 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 @@ } } - ASSERT(mapping != NULL); + ASSERT_PRINT(mapping != NULL, "page: %p, pte: %#" B_PRIx64, page, + oldEntry); } else page->wired_count--;