From d471b2ca678576241c879293e6e7e39784d2bf81 Mon Sep 17 00:00:00 2001 From: Erin Date: Sun, 4 Jun 2017 15:51:54 -0500 Subject: [PATCH] memory::paging::entry::Entry.set(): nicer misalignment panic message --- src/arch/x86_64/memory/paging/entry.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/arch/x86_64/memory/paging/entry.rs b/src/arch/x86_64/memory/paging/entry.rs index e2c8f9b..35b6c21 100644 --- a/src/arch/x86_64/memory/paging/entry.rs +++ b/src/arch/x86_64/memory/paging/entry.rs @@ -1,3 +1,5 @@ +//! Page table entry (meta)data + use arch::x86_64::memory::Frame; pub struct Entry(u64); @@ -27,7 +29,8 @@ impl Entry { pub fn set(&mut self, frame: Frame, flags: EntryFlags) { // Frame physical address must be page-aligned and smaller than 2^52 - assert!(frame.start_address() & !0x000fffff_fffff000 == 0); + assert!(frame.start_address() & !0x000fffff_fffff000 == 0, + "Frame physical addresses must be page-aligned and smaller than 2^52!"); self.0 = (frame.start_address() as u64) | flags.bits(); }