feat(memory): consistent formatting for PAddr/VAddr

Closes #101. Sorry y'all, I was tired of waiting.
sos-os · Jun 6, 2017 · adebcff · adebcff
1 parent c989b4d
commit adebcff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/memory/src/arch/x86_64/mod.rs b/memory/src/arch/x86_64/mod.rs
@@ -22,7 +22,7 @@ pub const HUGE_PAGE_SIZE: u64 = 1024 * 1024 * 1024;
 
 macro_attr! {
     /// A physical (linear) memory address is a 64-bit unsigned integer
-    #[derive(Copy, Clone, Eq, Ord, PartialEq, PartialOrd, Addr!(u64))]
+    #[derive(Copy, Clone, Eq, Ord, PartialEq, PartialOrd, Addr!(u64, 'P'))]
     #[repr(C)]
     pub struct PAddr(u64);
 }

diff --git a/memory/src/lib.rs b/memory/src/lib.rs
@@ -55,7 +55,7 @@ pub trait Addr: ops::Add<Self> + ops::Sub<Self>
 
 macro_attr! {
     /// A virtual address is a machine-sized unsigned integer
-    #[derive(Copy, Clone, Eq, Ord, PartialEq, PartialOrd, Addr!(usize))]
+    #[derive(Copy, Clone, Eq, Ord, PartialEq, PartialOrd, Addr!(usize, 'V'))]
     pub struct VAddr(usize);
 }
 

diff --git a/memory/src/macros.rs b/memory/src/macros.rs
@@ -9,25 +9,25 @@
 //! Macros to make our custom address types require a lot less repetitive code.
 #[macro_export]
 macro_rules! Addr {
-    (($size:ty) $(pub)* enum $name:ident $($tail:tt)*) => {
-        Addr! { @impl $name, $size }
+    (($size:ty, $letter:expr) $(pub)* enum $name:ident $($tail:tt)*) => {
+        Addr! { @impl $name, $size, $letter }
     };
-    (($size:ty) $(pub)* struct $name:ident $($tail:tt)*) => {
-        Addr! { @impl $name, $size }
+    (($size:ty, $letter:expr) $(pub)* struct $name:ident $($tail:tt)*) => {
+        Addr! { @impl $name, $size, $letter }
     };
-    (@impl $ty:ident, $size:ty) => {
+    (@impl $ty:ident, $size:ty, $letter:expr) => {
 
         impl ::core::fmt::Debug for $ty {
             fn fmt(&self, f: &mut ::core::fmt::Formatter)
                   -> ::core::fmt::Result {
-                write!(f, "{}({:#x})", stringify!($ty), self.0)
+                write!(f, "{}x{:x}", $letter, self.0)
             }
         }
 
         impl ::core::fmt::Pointer for $ty {
-            fn fmt(&self, f: &mut ::core::fmt::Formatter)
+            #[inline] fn fmt(&self, f: &mut ::core::fmt::Formatter)
                   -> ::core::fmt::Result {
-                write!(f, "{:#x}", self.0)
+                write!(f, "{:?}", self)
             }
         }