Ensure helper functions get inline always

andre-richter · andre-richter · commit 7c41b9a70502 · 2021-03-07T13:38:16.000+01:00
diff --git a/src/regs/ttbr0_el1.rs b/src/regs/ttbr0_el1.rs
@@ -38,12 +38,12 @@ impl RegisterReadWrite<u64, TTBR0_EL1::Register> for Reg {
 }
 
 impl Reg {
-    #[inline]
+    #[inline(always)]
     pub fn get_baddr(&self) -> u64 {
         self.read(TTBR0_EL1::BADDR) << 1
     }
 
-    #[inline]
+    #[inline(always)]
     pub fn set_baddr(&self, addr: u64) {
         self.write(TTBR0_EL1::BADDR.val(addr >> 1));
     }
diff --git a/src/regs/ttbr0_el2.rs b/src/regs/ttbr0_el2.rs
@@ -34,15 +34,15 @@ impl RegisterReadWrite<u64, TTBR0_EL2::Register> for Reg {
 }
 
 impl Reg {
-    #[inline]
+    #[inline(always)]
     pub fn get_baddr(&self) -> u64 {
         self.read(TTBR0_EL2::BADDR) << 1
     }
 
-    #[inline]
+    #[inline(always)]
     pub fn set_baddr(&self, addr: u64) {
         self.write(TTBR0_EL2::BADDR.val(addr >> 1));
     }
 }
 
-pub static TTBR0_EL2: Reg = Reg {};
+pub static TTBR0_EL2: Reg = Reg {};
diff --git a/src/regs/ttbr1_el1.rs b/src/regs/ttbr1_el1.rs
@@ -38,12 +38,12 @@ impl RegisterReadWrite<u64, TTBR1_EL1::Register> for Reg {
 }
 
 impl Reg {
-    #[inline]
+    #[inline(always)]
     pub fn get_baddr(&self) -> u64 {
         self.read(TTBR1_EL1::BADDR) << 1
     }
 
-    #[inline]
+    #[inline(always)]
     pub fn set_baddr(&self, addr: u64) {
         self.write(TTBR1_EL1::BADDR.val(addr >> 1));
     }

Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,12 @@ impl RegisterReadWrite<u64, TTBR0_EL1::Register> for Reg {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`impl Reg {`
`41`		`- #[inline]`
	`41`	`+ #[inline(always)]`
`42`	`42`	`pub fn get_baddr(&self) -> u64 {`
`43`	`43`	`self.read(TTBR0_EL1::BADDR) << 1`
`44`	`44`	`}`
`45`	`45`
`46`		`- #[inline]`
	`46`	`+ #[inline(always)]`
`47`	`47`	`pub fn set_baddr(&self, addr: u64) {`
`48`	`48`	`self.write(TTBR0_EL1::BADDR.val(addr >> 1));`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,15 @@ impl RegisterReadWrite<u64, TTBR0_EL2::Register> for Reg {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`impl Reg {`
`37`		`- #[inline]`
	`37`	`+ #[inline(always)]`
`38`	`38`	`pub fn get_baddr(&self) -> u64 {`
`39`	`39`	`self.read(TTBR0_EL2::BADDR) << 1`
`40`	`40`	`}`
`41`	`41`
`42`		`- #[inline]`
	`42`	`+ #[inline(always)]`
`43`	`43`	`pub fn set_baddr(&self, addr: u64) {`
`44`	`44`	`self.write(TTBR0_EL2::BADDR.val(addr >> 1));`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`-pub static TTBR0_EL2: Reg = Reg {};`
	`48`	`+pub static TTBR0_EL2: Reg = Reg {};`