From bb40980419ff7608fb2631ad2337dea108540182 Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Thu, 14 Apr 2022 22:59:55 +0300
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=93=A6=20Add=20formatter=20fo?=
 =?UTF-8?q?r=20memory::AttributeFields?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 machine/src/arch/aarch64/memory/mod.rs | 43 ++++++++++++++------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/machine/src/arch/aarch64/memory/mod.rs b/machine/src/arch/aarch64/memory/mod.rs
index b5a1aa2..99d6f1f 100644
--- a/machine/src/arch/aarch64/memory/mod.rs
+++ b/machine/src/arch/aarch64/memory/mod.rs
@@ -7,7 +7,7 @@
 
 use {
     crate::println,
-    core::{fmt, ops::RangeInclusive},
+    core::{fmt, fmt::Formatter, ops::RangeInclusive},
 };
 
 mod addr;
@@ -289,6 +289,26 @@ pub fn get_virt_addr_properties(
     Ok((virt_addr, AttributeFields::default()))
 }
 
+/// Human-readable output of AttributeFields
+impl fmt::Display for AttributeFields {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        let attr = match self.mem_attributes {
+            MemAttributes::CacheableDRAM => "C",
+            MemAttributes::NonCacheableDRAM => "NC",
+            MemAttributes::Device => "Dev",
+        };
+
+        let acc_p = match self.acc_perms {
+            AccessPermissions::ReadOnly => "RO",
+            AccessPermissions::ReadWrite => "RW",
+        };
+
+        let xn = if self.execute_never { "PXN" } else { "PX" };
+
+        write!(f, "{: <3} {} {: <3}", attr, acc_p, xn)
+    }
+}
+
 /// Human-readable output of a Descriptor.
 impl fmt::Display for Descriptor {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -312,27 +332,10 @@ impl fmt::Display for Descriptor {
             (size, "Byte")
         };
 
-        let attr = match self.attribute_fields.mem_attributes {
-            MemAttributes::CacheableDRAM => "C",
-            MemAttributes::NonCacheableDRAM => "NC",
-            MemAttributes::Device => "Dev",
-        };
-
-        let acc_p = match self.attribute_fields.acc_perms {
-            AccessPermissions::ReadOnly => "RO",
-            AccessPermissions::ReadWrite => "RW",
-        };
-
-        let xn = if self.attribute_fields.execute_never {
-            "PXN"
-        } else {
-            "PX"
-        };
-
         write!(
             f,
-            "      {:#010X} - {:#010X} | {: >3} {} | {: <3} {} {: <3} | {}",
-            start, end, size, unit, attr, acc_p, xn, self.name
+            "      {:#010x} - {:#010x} | {: >3} {} | {} | {}",
+            start, end, size, unit, self.attribute_fields, self.name
         )
     }
 }