Merge pull request rust-embedded#198 from dreiss/master

Add some utility methods to Mstatus and Mcause
rmsyn · Mar 27, 2024 · aca6410 · aca6410
2 parents 62a54a7 + b3c100a
commit aca6410
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/riscv/CHANGELOG.md b/riscv/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+
+- Add `Mcause::from(usize)` for use in unit tests
+- Add `Mstatus.bits()`
+
 ### Fixed
 
 - Fixed `sip::set_ssoft` and `sip::clear_ssoft` using wrong address

diff --git a/riscv/src/register/mcause.rs b/riscv/src/register/mcause.rs
@@ -6,6 +6,13 @@ pub struct Mcause {
     bits: usize,
 }
 
+impl From<usize> for Mcause {
+    #[inline]
+    fn from(bits: usize) -> Self {
+        Self { bits }
+    }
+}
+
 /// Trap Cause
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum Trap {

diff --git a/riscv/src/register/mstatus.rs b/riscv/src/register/mstatus.rs
@@ -65,6 +65,12 @@ impl From<bool> for Endianness {
 }
 
 impl Mstatus {
+    /// Returns the contents of the register as raw bits
+    #[inline]
+    pub fn bits(&self) -> usize {
+        self.bits
+    }
+
     /// Supervisor Interrupt Enable
     #[inline]
     pub fn sie(&self) -> bool {