use builder api

Author: robamu

cortex-ar/src/mmu.rs

@@ -170,7 +170,7 @@ impl SectionAttributes {
     /// Retrieves the corresponding L1 section part without the section base address being set.
     const fn l1_section_part(&self) -> L1Section {
         L1Section::builder()
-            .with_base_addr(u12::new(0))
+            .with_base_addr_upper_bits(u12::new(0))
             .with_ng(self.non_global)
             .with_s(self.shareable)
             .with_apx(self.access.apx())
@@ -208,9 +208,9 @@ impl SectionAttributes {
 #[bitbybit::bitfield(u32, default = 0x00)]
 #[derive(PartialEq, Eq)]
 pub struct L1Section {
-    /// Section base address.
+    /// Section base address upper bits.
     #[bits(20..=31, rw)]
-    base_addr: u12,
+    base_addr_upper_bits: u12,
     /// Non-global bit.
     #[bit(17, rw)]
     ng: bool,
@@ -243,7 +243,7 @@ impl core::fmt::Debug for L1Section {
         write!(
             f,
             "L1Section {{ base_addr={:#x} ng={} s={} apx={} tex={:#b} ap={:#b} domain={:#b} xn={} c={} b={} }}",
-            self.base_addr(),
+            self.base_addr_upper_bits(),
             self.ng() as u8,
             self.s() as u8,
             self.apx() as u8,
@@ -272,8 +272,21 @@ impl L1Section {
         if phys_addr & 0x000F_FFFF != 0 {
             panic!("physical base address for L1 section must be aligned to 1 MB");
         }
-        let higher_bits = phys_addr >> 20;
-        Self::new_with_raw_value((higher_bits << 20) | section_attrs.l1_section_part().raw_value())
+        let attrs = section_attrs.l1_section_part();
+        L1Section::builder()
+            .with_base_addr_upper_bits(u12::new((phys_addr >> 20) as u16))
+            .with_ng(attrs.ng())
+            .with_s(attrs.s())
+            .with_apx(attrs.apx())
+            .with_tex(attrs.tex())
+            .with_ap(attrs.ap())
+            .with_p_bit(attrs.p_bit())
+            .with_domain(attrs.domain())
+            .with_xn(attrs.xn())
+            .with_c(attrs.c())
+            .with_b(attrs.b())
+            .with_entry_type(attrs.entry_type())
+            .build()
     }
 
     /// Retrieve the section attributes.
@@ -285,7 +298,20 @@ impl L1Section {
     /// Set the section attributes without changing the address.
     #[inline]
     pub fn set_section_attrs(&mut self, section_attrs: SectionAttributes) {
-        self.raw_value =
-            ((self.base_addr().value() as u32) << 20) | section_attrs.l1_section_part().raw_value();
+        let attrs = section_attrs.l1_section_part();
+        *self = L1Section::builder()
+            .with_base_addr_upper_bits(self.base_addr_upper_bits())
+            .with_ng(attrs.ng())
+            .with_s(attrs.s())
+            .with_apx(attrs.apx())
+            .with_tex(attrs.tex())
+            .with_ap(attrs.ap())
+            .with_p_bit(attrs.p_bit())
+            .with_domain(attrs.domain())
+            .with_xn(attrs.xn())
+            .with_c(attrs.c())
+            .with_b(attrs.b())
+            .with_entry_type(attrs.entry_type())
+            .build()
     }
 }