Skip to content

Commit 9e91acb

Browse files
fix(dcsr): remove redundant wrapper methods and update tests
- Removed `debug_cause`, `privilege_level`, and `set_privilege_level` from `Dcsr` because the macros `read_write_csr_field!` and `csr_field_enum!` already generate the necessary accessors. - Updated tests to use `try_cause()`, `try_prv()`, and `set_prv()` instead of the removed wrapper methods.
1 parent 213181c commit 9e91acb

File tree

1 file changed

+4
-21
lines changed

1 file changed

+4
-21
lines changed

riscv/src/register/dcsr.rs

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
read_write_csr! {
66
/// Debug Control and Status Register
77
Dcsr: 0x7b0,
8-
mask: 0xffff_ffff,
8+
mask: 0x8000_0fff,
99
}
1010

1111
csr_field_enum! {
@@ -114,23 +114,6 @@ read_only_csr_field! {
114114
xdebugver: [28:31],
115115
}
116116

117-
impl Dcsr {
118-
/// Returns the debug cause as an enum
119-
pub fn debug_cause(&self) -> crate::result::Result<Cause> {
120-
self.try_cause()
121-
}
122-
123-
/// Returns the previous privilege level as an enum
124-
pub fn privilege_level(&self) -> crate::result::Result<Prv> {
125-
self.try_prv()
126-
}
127-
128-
/// Sets the previous privilege level
129-
pub fn set_privilege_level(&mut self, level: Prv) {
130-
self.set_prv(level);
131-
}
132-
}
133-
134117
#[cfg(test)]
135118
mod tests {
136119
use super::*;
@@ -192,7 +175,7 @@ mod tests {
192175
.for_each(|(val, variant)| {
193176
dcsr = Dcsr::from_bits((val as usize) << 6);
194177
assert_eq!(dcsr.cause(), variant);
195-
assert_eq!(dcsr.debug_cause(), Ok(variant));
178+
assert_eq!(dcsr.try_cause(), Ok(variant));
196179
});
197180

198181
// invalid variant value 6
@@ -204,8 +187,8 @@ mod tests {
204187
fn test_dcsr_convenience_methods() {
205188
let mut dcsr = Dcsr::from_bits(0);
206189

207-
dcsr.set_privilege_level(Prv::Machine);
208-
assert_eq!(dcsr.privilege_level().unwrap(), Prv::Machine);
190+
dcsr.set_prv(Prv::Machine);
191+
assert_eq!(dcsr.try_prv().unwrap(), Prv::Machine);
209192
assert_eq!(dcsr.prv(), Prv::Machine);
210193
}
211194
}

0 commit comments

Comments
 (0)