From fab8687aebcbb24b5e1b5a081937b81067085e75 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 27 Apr 2021 00:38:09 +0800 Subject: [PATCH] move susres stuff to its own server --- svd2utra/src/generate.rs | 114 ++++++--------------------------------- 1 file changed, 15 insertions(+), 99 deletions(-) diff --git a/svd2utra/src/generate.rs b/svd2utra/src/generate.rs index b7c8c68ee..4cd21b3c5 100644 --- a/svd2utra/src/generate.rs +++ b/svd2utra/src/generate.rs @@ -479,15 +479,20 @@ fn print_header(out: &mut U) -> std::io::Result<()> { let s = r####" #![allow(dead_code)] use core::convert::TryInto; + +#[derive(Debug, Copy, Clone)] pub struct Register { /// Offset of this register within this CSR offset: usize, + /// Mask of SVD-specified bits for the register + mask: usize, } impl Register { - pub const fn new(offset: usize) -> Register { - Register { offset } + pub const fn new(offset: usize, mask: usize) -> Register { + Register { offset, mask } } } +#[derive(Debug, Copy, Clone)] pub struct Field { /// A bitmask we use to AND to the value, unshifted. /// E.g. for a width of `3` bits, this mask would be 0b111. @@ -680,107 +685,13 @@ fn print_peripherals(peripherals: &[Peripheral], out: &mut U) -> std:: let s = r####" pub mod utra { - pub enum Error { - OutOfMemory, - } - - #[derive(Debug, Copy, Clone)] - pub struct ManagedReg { - pub offset: T, - pub mask: usize, - pub value: usize, - } - //#[derive(Debug)] - pub struct SusResRegManager { - pub csr: crate::CSR, - pub registers: [Option>; N], - pub sus_prologue: Option, - pub sus_epilogue: Option, - pub res_prologue: Option, - pub res_epilogue: Option, - } - impl SusResRegManager:: where ManagedReg: core::marker::Copy { - pub fn new(reg_base: *mut u32) -> SusResRegManager { - SusResRegManager:: { - csr: crate::CSR::new(reg_base), - registers: [None; N], - sus_prologue: None, - sus_epilogue: None, - res_prologue: None, - res_epilogue: None, - } - } - } - pub trait SusResReg { - fn push(&mut self, mr: ManagedReg) -> Result<(), Error>; - fn suspend(&mut self); - fn resume(&mut self); - } - impl SusResReg for SusResRegManager where T: core::convert::Into + Copy { - // push registers into the manager in the order you want them suspended - fn push(&mut self, mr: ManagedReg) -> Result<(), Error> { - for entry in self.registers.iter_mut() { - if entry.is_none() { - *entry = Some(mr); - return Ok(()) - } - } - Err(Error::OutOfMemory) - } - fn suspend(&mut self) { - if let Some(sp) = self.sus_prologue { - sp(self); - } - for entry in self.registers.iter_mut() { - if let Some(reg) = entry { - // masking is done on the write side - reg.value = self.csr.r(crate::Register{offset: reg.offset.into()}) as usize; - } - } - if let Some(se) = self.sus_epilogue { - se(self); - } - } - fn resume(&mut self) { - if let Some(rp) = self.res_prologue { - rp(self); - } - for entry in self.registers.iter().rev() { // this is in reverse order to the suspend - if let Some(reg) = entry { - self.csr.wo(crate::Register{offset: reg.offset.into()}, (reg.value & reg.mask) as u32); - } - } - if let Some(re) = self.res_epilogue { - re(self); - } - } - } -/* - pub struct ManagedMem { - pub mem: xous::MemoryRange, - pub backing: [u32; N], - } - pub trait SusResMem { - fn suspend(&mut self) { - let src = self.mem.as_ptr() as *const u32; - for words in 0..self.mem.len() { - self.backing[words] = unsafe{src.add(words).read_volatile()}; - } - } - fn resume(&mut self) { - let dst = self.mem.as_ptr() as *mut u32; - for words in 0..self.mem.len() { - unsafe{dst.add(words).write_volatile(self.backing[words])}; - } - } - } -*/ "####; out.write_all(s.as_bytes())?; for peripheral in peripherals { writeln!(out)?; writeln!(out, " pub mod {} {{", peripheral.name.to_lowercase())?; + writeln!(out, " // this enum is vestigal, and currently not used by anything")?; writeln!(out, " #[derive(Debug, Copy, Clone)]")?; writeln!(out, " pub enum {}Offset {{", peripheral.name.to_case(Case::UpperCamel))?; for register in &peripheral.registers { @@ -793,11 +704,16 @@ pub mod utra { if let Some(description) = ®ister.description { writeln!(out, " /// {}", description)?; } + let mut mask: usize = 0; + for field in ®ister.fields { + mask |= ((1 << (field.msb + 1 - field.lsb)) - 1) << field.lsb; + } writeln!( out, - " pub const {}: crate::Register = crate::Register::new({});", + " pub const {}: crate::Register = crate::Register::new({}, 0x{:x});", register.name.to_uppercase(), - register.offset / 4 + register.offset / 4, + mask, )?; for field in ®ister.fields { writeln!(