mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
Merge pull request #256 from eupn/implement-derivefrom
Implement derivedFrom SVD attribute for peripherals
This commit is contained in:
commit
872eec5aaa
1 changed files with 80 additions and 21 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
use convert_case::{Case, Casing};
|
use convert_case::{Case, Casing};
|
||||||
use quick_xml::events::Event;
|
use quick_xml::events::{attributes::Attribute, Event};
|
||||||
use quick_xml::Reader;
|
use quick_xml::Reader;
|
||||||
use std::io::{BufRead, BufReader, Read, Write};
|
use std::io::{BufRead, BufReader, Read, Write};
|
||||||
|
|
||||||
|
|
@ -11,16 +11,17 @@ pub enum ParseError {
|
||||||
NonUTF8,
|
NonUTF8,
|
||||||
WriteError,
|
WriteError,
|
||||||
UnexpectedValue,
|
UnexpectedValue,
|
||||||
|
MissingBasePeripheral(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
#[derive(Default, Debug, Clone)]
|
||||||
pub struct Field {
|
pub struct Field {
|
||||||
name: String,
|
name: String,
|
||||||
lsb: usize,
|
lsb: usize,
|
||||||
msb: usize,
|
msb: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
#[derive(Default, Debug, Clone)]
|
||||||
pub struct Register {
|
pub struct Register {
|
||||||
name: String,
|
name: String,
|
||||||
offset: usize,
|
offset: usize,
|
||||||
|
|
@ -28,7 +29,7 @@ pub struct Register {
|
||||||
fields: Vec<Field>,
|
fields: Vec<Field>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
#[derive(Default, Debug, Clone)]
|
||||||
pub struct Interrupt {
|
pub struct Interrupt {
|
||||||
name: String,
|
name: String,
|
||||||
value: usize,
|
value: usize,
|
||||||
|
|
@ -73,6 +74,7 @@ impl core::fmt::Display for ParseError {
|
||||||
ParseIntError => write!(f, "unable to parse number"),
|
ParseIntError => write!(f, "unable to parse number"),
|
||||||
NonUTF8 => write!(f, "file is not UTF-8"),
|
NonUTF8 => write!(f, "file is not UTF-8"),
|
||||||
WriteError => write!(f, "unable to write destination file"),
|
WriteError => write!(f, "unable to write destination file"),
|
||||||
|
MissingBasePeripheral(ref name) => write!(f, "undeclared base peripheral: {}", name),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -132,14 +134,24 @@ fn generate_field<T: BufRead>(reader: &mut Reader<T>) -> Result<Field, ParseErro
|
||||||
"bitRange" => {
|
"bitRange" => {
|
||||||
let range = extract_contents(reader)?;
|
let range = extract_contents(reader)?;
|
||||||
if !range.starts_with("[") || !range.ends_with("]") {
|
if !range.starts_with("[") || !range.ends_with("]") {
|
||||||
return Err(ParseError::UnexpectedValue)
|
return Err(ParseError::UnexpectedValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut parts = range[1..range.len() - 1].split(':');
|
let mut parts = range[1..range.len() - 1].split(':');
|
||||||
msb = Some(parts.next().ok_or_else(|| ParseError::UnexpectedValue)?
|
msb = Some(
|
||||||
.parse::<usize>().or_else(|_| Err(ParseError::ParseIntError))?);
|
parts
|
||||||
lsb = Some(parts.next().ok_or_else(|| ParseError::UnexpectedValue)?
|
.next()
|
||||||
.parse::<usize>().or_else(|_| Err(ParseError::ParseIntError))?);
|
.ok_or_else(|| ParseError::UnexpectedValue)?
|
||||||
|
.parse::<usize>()
|
||||||
|
.or_else(|_| Err(ParseError::ParseIntError))?,
|
||||||
|
);
|
||||||
|
lsb = Some(
|
||||||
|
parts
|
||||||
|
.next()
|
||||||
|
.ok_or_else(|| ParseError::UnexpectedValue)?
|
||||||
|
.parse::<usize>()
|
||||||
|
.or_else(|_| Err(ParseError::ParseIntError))?,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
_ => (),
|
_ => (),
|
||||||
}
|
}
|
||||||
|
|
@ -286,13 +298,27 @@ fn generate_registers<T: BufRead>(
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_peripheral<T: BufRead>(reader: &mut Reader<T>) -> Result<Peripheral, ParseError> {
|
fn derive_peripheral(base: &Peripheral, child_name: &str, child_base: usize) -> Peripheral {
|
||||||
|
Peripheral {
|
||||||
|
name: child_name.to_owned(),
|
||||||
|
base: child_base,
|
||||||
|
_size: base._size,
|
||||||
|
interrupt: base.interrupt.clone(),
|
||||||
|
registers: base.registers.clone(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn generate_peripheral<T: BufRead>(
|
||||||
|
base_peripheral: Option<&Peripheral>,
|
||||||
|
reader: &mut Reader<T>,
|
||||||
|
) -> Result<Peripheral, ParseError> {
|
||||||
let mut buf = Vec::new();
|
let mut buf = Vec::new();
|
||||||
let mut name = None;
|
let mut name = None;
|
||||||
let mut base = None;
|
let mut base = None;
|
||||||
let mut size = None;
|
let mut size = None;
|
||||||
let mut registers = vec![];
|
let mut registers = vec![];
|
||||||
let mut interrupts = vec![];
|
let mut interrupts = vec![];
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
match reader.read_event(&mut buf) {
|
match reader.read_event(&mut buf) {
|
||||||
Ok(Event::Start(ref e)) => {
|
Ok(Event::Start(ref e)) => {
|
||||||
|
|
@ -320,22 +346,50 @@ fn generate_peripheral<T: BufRead>(reader: &mut Reader<T>) -> Result<Peripheral,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(Peripheral {
|
let name = name.ok_or(ParseError::MissingValue)?;
|
||||||
name: name.ok_or(ParseError::MissingValue)?,
|
let base = base.ok_or(ParseError::MissingValue)?;
|
||||||
base: base.ok_or(ParseError::MissingValue)?,
|
|
||||||
_size: size.ok_or(ParseError::MissingValue)?,
|
// Derive from the base peripheral if specified
|
||||||
interrupt: interrupts,
|
if let Some(base_peripheral) = base_peripheral {
|
||||||
registers,
|
return Ok(derive_peripheral(base_peripheral, &name, base));
|
||||||
})
|
} else {
|
||||||
|
Ok(Peripheral {
|
||||||
|
name,
|
||||||
|
base,
|
||||||
|
_size: size.ok_or(ParseError::MissingValue)?,
|
||||||
|
interrupt: interrupts,
|
||||||
|
registers,
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_peripherals<T: BufRead>(reader: &mut Reader<T>) -> Result<Vec<Peripheral>, ParseError> {
|
fn generate_peripherals<T: BufRead>(reader: &mut Reader<T>) -> Result<Vec<Peripheral>, ParseError> {
|
||||||
let mut buf = Vec::new();
|
let mut buf = Vec::new();
|
||||||
let mut peripherals = vec![];
|
let mut peripherals: Vec<Peripheral> = vec![];
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
match reader.read_event(&mut buf) {
|
match reader.read_event(&mut buf) {
|
||||||
Ok(Event::Start(ref e)) => match e.name() {
|
Ok(Event::Start(ref e)) => match e.name() {
|
||||||
b"peripheral" => peripherals.push(generate_peripheral(reader)?),
|
b"peripheral" => {
|
||||||
|
let base_peripheral = match e.attributes().next() {
|
||||||
|
Some(Ok(Attribute { key, value })) if key == b"derivedFrom" => {
|
||||||
|
let base_peripheral_name = String::from_utf8(value.to_vec())
|
||||||
|
.or_else(|_| Err(ParseError::NonUTF8))?;
|
||||||
|
|
||||||
|
let base = peripherals
|
||||||
|
.iter()
|
||||||
|
.find(|p| p.name == base_peripheral_name)
|
||||||
|
.ok_or_else(|| {
|
||||||
|
ParseError::MissingBasePeripheral(base_peripheral_name)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Some(base)
|
||||||
|
}
|
||||||
|
_ => None,
|
||||||
|
};
|
||||||
|
|
||||||
|
peripherals.push(generate_peripheral(base_peripheral, reader)?);
|
||||||
|
}
|
||||||
_ => panic!("unexpected tag in <peripherals>: {:?}", e),
|
_ => panic!("unexpected tag in <peripherals>: {:?}", e),
|
||||||
},
|
},
|
||||||
Ok(Event::End(ref e)) => match e.name() {
|
Ok(Event::End(ref e)) => match e.name() {
|
||||||
|
|
@ -908,11 +962,16 @@ mod tests {
|
||||||
let mod_name = peripheral.name.to_lowercase();
|
let mod_name = peripheral.name.to_lowercase();
|
||||||
let per_name = peripheral.name.to_lowercase() + "_csr";
|
let per_name = peripheral.name.to_lowercase() + "_csr";
|
||||||
|
|
||||||
write!(out, r####"
|
write!(
|
||||||
|
out,
|
||||||
|
r####"
|
||||||
#[test]
|
#[test]
|
||||||
#[ignore]
|
#[ignore]
|
||||||
fn compile_check_{}() {{
|
fn compile_check_{}() {{
|
||||||
use super::*;"####, per_name)?;
|
use super::*;
|
||||||
|
"####,
|
||||||
|
per_name
|
||||||
|
)?;
|
||||||
|
|
||||||
writeln!(
|
writeln!(
|
||||||
out,
|
out,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue