From 4ae6b241fa9e170b765fdfcdb864e86bb8edb4ad Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 14 Jan 2024 22:58:55 +0800 Subject: [PATCH] format svd2repl --- svd2repl/src/generate.rs | 77 +++++++++++----------------------------- svd2repl/src/lib.rs | 3 +- svd2repl/src/main.rs | 2 +- 3 files changed, 23 insertions(+), 59 deletions(-) diff --git a/svd2repl/src/generate.rs b/svd2repl/src/generate.rs index 27f230cb2..8bf8546ba 100644 --- a/svd2repl/src/generate.rs +++ b/svd2repl/src/generate.rs @@ -1,9 +1,10 @@ -use quick_xml::events::Event; -use quick_xml::Reader; -use quick_xml::name::QName; use std::collections::HashMap; use std::io::{BufRead, BufReader, Read, Write}; +use quick_xml::events::Event; +use quick_xml::name::QName; +use quick_xml::Reader; + #[derive(Debug)] pub enum ParseError { UnexpectedTag, @@ -112,14 +113,9 @@ fn parse_usize(value: &[u8]) -> Result { fn extract_contents(reader: &mut Reader) -> Result { let mut buf = Vec::new(); - let contents = reader - .read_event_into(&mut buf) - .map_err(|_| ParseError::UnexpectedTag)?; + let contents = reader.read_event_into(&mut buf).map_err(|_| ParseError::UnexpectedTag)?; match contents { - Event::Text(t) => t - .unescape() - .map(|s| s.to_string()) - .map_err(|_| ParseError::NonUTF8), + Event::Text(t) => t.unescape().map(|s| s.to_string()).map_err(|_| ParseError::NonUTF8), _ => Err(ParseError::UnexpectedTag), } } @@ -158,10 +154,7 @@ fn generate_field(reader: &mut Reader) -> Result( - reader: &mut Reader, - fields: &mut Vec, -) -> Result<(), ParseError> { +fn generate_fields(reader: &mut Reader, fields: &mut Vec) -> Result<(), ParseError> { let mut buf = Vec::new(); loop { match reader.read_event_into(&mut buf) { @@ -193,13 +186,10 @@ fn generate_register(reader: &mut Reader) -> Result { let tag_binding = e.local_name().as_ref().to_vec(); - let tag_name = std::str::from_utf8(&tag_binding) - .map_err(|_| ParseError::NonUTF8)?; + let tag_name = std::str::from_utf8(&tag_binding).map_err(|_| ParseError::NonUTF8)?; match tag_name { "name" => name = Some(extract_contents(reader)?), - "addressOffset" => { - offset = Some(parse_usize(extract_contents(reader)?.as_bytes())?) - } + "addressOffset" => offset = Some(parse_usize(extract_contents(reader)?.as_bytes())?), "fields" => generate_fields(reader, &mut fields)?, _ => (), } @@ -233,8 +223,7 @@ fn generate_interrupts( match reader.read_event_into(&mut buf) { Ok(Event::Start(ref e)) => { let tag_binding = e.local_name().as_ref().to_vec(); - let tag_name = std::str::from_utf8(&tag_binding) - .map_err(|_| ParseError::NonUTF8)?; + let tag_name = std::str::from_utf8(&tag_binding).map_err(|_| ParseError::NonUTF8)?; match tag_name { "name" => name = Some(extract_contents(reader)?), "value" => value = Some(parse_usize(extract_contents(reader)?.as_bytes())?), @@ -294,13 +283,10 @@ fn generate_peripheral(reader: &mut Reader) -> Result { let tag_binding = e.local_name().as_ref().to_vec(); - let tag_name = std::str::from_utf8(&tag_binding) - .map_err(|_| ParseError::NonUTF8)?; + let tag_name = std::str::from_utf8(&tag_binding).map_err(|_| ParseError::NonUTF8)?; match tag_name { "name" => name = Some(extract_contents(reader)?), - "baseAddress" => { - base = Some(parse_usize(extract_contents(reader)?.as_bytes())?) - } + "baseAddress" => base = Some(parse_usize(extract_contents(reader)?.as_bytes())?), "size" => size = Some(parse_usize(extract_contents(reader)?.as_bytes())?), "registers" => generate_registers(reader, &mut registers)?, "interrupt" => generate_interrupts(reader, &mut interrupts)?, @@ -358,13 +344,10 @@ fn generate_memory_region(reader: &mut Reader) -> Result { let tag_binding = e.local_name().as_ref().to_vec(); - let tag_name = std::str::from_utf8(&tag_binding) - .map_err(|_| ParseError::NonUTF8)?; + let tag_name = std::str::from_utf8(&tag_binding).map_err(|_| ParseError::NonUTF8)?; match tag_name { "name" => name = Some(extract_contents(reader)?), - "baseAddress" => { - base = Some(parse_usize(extract_contents(reader)?.as_bytes())?) - } + "baseAddress" => base = Some(parse_usize(extract_contents(reader)?.as_bytes())?), "size" => size = Some(parse_usize(extract_contents(reader)?.as_bytes())?), _ => (), } @@ -394,9 +377,7 @@ fn parse_memory_regions( loop { match reader.read_event_into(&mut buf) { Ok(Event::Start(ref e)) => match e.name() { - QName(b"memoryRegion") => description - .memory_regions - .push(generate_memory_region(reader)?), + QName(b"memoryRegion") => description.memory_regions.push(generate_memory_region(reader)?), _ => panic!("unexpected tag in : {:?}", e), }, Ok(Event::End(ref e)) => match e.name() { @@ -431,9 +412,7 @@ fn generate_constants( .expect("constant: error parsing attribute value"); match att_name { _ if att_name == "name" => constant_descriptor.name = att_value, - _ if att_name == "value" => { - constant_descriptor.value = att_value - } + _ if att_name == "value" => constant_descriptor.value = att_value, _ => panic!("unexpected attribute name"), } } @@ -525,11 +504,7 @@ fn print_memory_regions( let region_size = if region.size < 4096 { 4096 } else { - if region.size & 4095 != 0 { - region.size + 4096 - (region.size & 4095) - } else { - region.size - } + if region.size & 4095 != 0 { region.size + 4096 - (region.size & 4095) } else { region.size } }; // Ignore the CSR region, since we explicitly define registers there. @@ -543,11 +518,7 @@ fn print_memory_regions( continue; } - writeln!( - out, - "{}: Memory.MappedMemory @ sysbus 0x{:08x}", - region_name, region.base - )?; + writeln!(out, "{}: Memory.MappedMemory @ sysbus 0x{:08x}", region_name, region.base)?; writeln!(out, " size: 0x{:08x}", region_size)?; writeln!(out)?; } @@ -572,11 +543,7 @@ fn print_peripherals( // peripheral.size // }; if let Some(renode_device) = cs_peripherals.get(lc_name.as_str()) { - writeln!( - out, - "{}: {} @ sysbus 0x{:08x}", - lc_name, renode_device, peripheral.base - )?; + writeln!(out, "{}: {} @ sysbus 0x{:08x}", lc_name, renode_device, peripheral.base)?; // TODO: Get the frequency from the `constants` table under `CONFIG_CLOCK_FREQUENCY` if lc_name == "timer0" { @@ -610,11 +577,7 @@ fn print_peripherals( writeln!(out, " IRQ -> cpu @ {}", 1000 + irq.value)?; } } else { - writeln!( - out, - "// Unrecognized peripheral: {} @ 0x{:08x}", - lc_name, peripheral.base - )?; + writeln!(out, "// Unrecognized peripheral: {} @ 0x{:08x}", lc_name, peripheral.base)?; } writeln!(out)?; } diff --git a/svd2repl/src/lib.rs b/svd2repl/src/lib.rs index 4a81ed72c..432af7757 100644 --- a/svd2repl/src/lib.rs +++ b/svd2repl/src/lib.rs @@ -3,8 +3,9 @@ pub use generate::*; #[cfg(test)] mod tests { - use super::*; use std::fs::{DirBuilder, File}; + + use super::*; #[test] fn basic_generate() { let src = File::open("examples/soc.svd").unwrap(); diff --git a/svd2repl/src/main.rs b/svd2repl/src/main.rs index 5241754a3..ff08cc20a 100644 --- a/svd2repl/src/main.rs +++ b/svd2repl/src/main.rs @@ -3,7 +3,7 @@ mod generate; fn main() -> Result<(), Box> { if std::env::args().count() != 3 { println!("Usage: svd2repl "); - return Ok(()) + return Ok(()); } let svd_filename = std::env::args().nth(1).ok_or("Must specify SVD input filename")?; let generated_filename = std::env::args().nth(2).ok_or("Must specify destination utralib filename")?;