diff --git a/svd2utra/src/generate.rs b/svd2utra/src/generate.rs index e287db44e..e8326aa7e 100644 --- a/svd2utra/src/generate.rs +++ b/svd2utra/src/generate.rs @@ -18,14 +18,14 @@ pub enum ParseError { #[derive(Default, Debug, Clone)] pub struct Field { name: String, - lsb: usize, - msb: usize, + lsb: u32, + msb: u32, } #[derive(Default, Debug, Clone)] pub struct Register { name: String, - offset: usize, + offset: u64, description: Option, fields: Vec, } @@ -33,14 +33,14 @@ pub struct Register { #[derive(Default, Debug, Clone)] pub struct Interrupt { name: String, - value: usize, + value: u64, } #[derive(Default, Debug)] pub struct Peripheral { name: String, - pub base: usize, - _size: usize, + pub base: u64, + _size: u64, interrupt: Vec, registers: Vec, } @@ -48,8 +48,8 @@ pub struct Peripheral { #[derive(Default, Debug)] pub struct MemoryRegion { pub name: String, - pub base: usize, - pub size: usize, + pub base: u64, + pub size: u64, } #[derive(Default, Debug)] @@ -98,10 +98,16 @@ pub fn get_base(value: &str) -> (&str, u32) { } } -fn parse_usize(value: &[u8]) -> Result { +fn parse_u64(value: &[u8]) -> Result { let value_as_str = String::from_utf8(value.to_vec()).or(Err(ParseError::NonUTF8))?; let (value, base) = get_base(&value_as_str); - usize::from_str_radix(value, base).or(Err(ParseError::ParseIntError)) + u64::from_str_radix(value, base).or(Err(ParseError::ParseIntError)) +} + +fn parse_u32(value: &[u8]) -> Result { + let value_as_str = String::from_utf8(value.to_vec()).or(Err(ParseError::NonUTF8))?; + let (value, base) = get_base(&value_as_str); + u32::from_str_radix(value, base).or(Err(ParseError::ParseIntError)) } fn extract_contents(reader: &mut Reader) -> Result { @@ -133,8 +139,8 @@ fn generate_field(reader: &mut Reader) -> Result name = Some(extract_contents(reader)?), - "lsb" => lsb = Some(parse_usize(extract_contents(reader)?.as_bytes())?), - "msb" => msb = Some(parse_usize(extract_contents(reader)?.as_bytes())?), + "lsb" => lsb = Some(parse_u32(extract_contents(reader)?.as_bytes())?), + "msb" => msb = Some(parse_u32(extract_contents(reader)?.as_bytes())?), "bitRange" => { let range = extract_contents(reader)?; if !range.starts_with('[') || !range.ends_with(']') { @@ -146,22 +152,22 @@ fn generate_field(reader: &mut Reader) -> Result() + .parse::() .map_err(|_| ParseError::ParseIntError)?, ); lsb = Some( parts .next() .ok_or(ParseError::UnexpectedValue)? - .parse::() + .parse::() .map_err(|_| ParseError::ParseIntError)?, ); } "bitWidth" => { - bit_width = Some(parse_usize(extract_contents(reader)?.as_bytes())?) + bit_width = Some(parse_u32(extract_contents(reader)?.as_bytes())?) } "bitOffset" => { - bit_offset = Some(parse_usize(extract_contents(reader)?.as_bytes())?) + bit_offset = Some(parse_u32(extract_contents(reader)?.as_bytes())?) } _ => (), } @@ -233,7 +239,7 @@ fn generate_register(reader: &mut Reader) -> Result name = Some(extract_contents(reader)?), "addressOffset" => { - offset = Some(parse_usize(extract_contents(reader)?.as_bytes())?) + offset = Some(parse_u64(extract_contents(reader)?.as_bytes())?) } "fields" => generate_fields(reader, &mut fields)?, _ => (), @@ -272,7 +278,7 @@ fn generate_interrupts( .map_err(|_| ParseError::NonUTF8)?; match tag_name { "name" => name = Some(extract_contents(reader)?), - "value" => value = Some(parse_usize(extract_contents(reader)?.as_bytes())?), + "value" => value = Some(parse_u64(extract_contents(reader)?.as_bytes())?), _ => (), } } @@ -318,7 +324,7 @@ fn generate_registers( Ok(()) } -fn derive_peripheral(base: &Peripheral, child_name: &str, child_base: usize) -> Peripheral { +fn derive_peripheral(base: &Peripheral, child_name: &str, child_base: u64) -> Peripheral { Peripheral { name: child_name.to_owned(), base: child_base, @@ -348,9 +354,9 @@ fn generate_peripheral( match tag_name { "name" => name = Some(extract_contents(reader)?), "baseAddress" => { - base = Some(parse_usize(extract_contents(reader)?.as_bytes())?) + base = Some(parse_u64(extract_contents(reader)?.as_bytes())?) } - "size" => size = Some(parse_usize(extract_contents(reader)?.as_bytes())?), + "size" => size = Some(parse_u64(extract_contents(reader)?.as_bytes())?), "registers" => generate_registers(reader, &mut registers)?, "interrupt" => generate_interrupts(reader, &mut interrupts)?, _ => (), @@ -438,9 +444,9 @@ fn generate_memory_region(reader: &mut Reader) -> Result name = Some(extract_contents(reader)?), "baseAddress" => { - base = Some(parse_usize(extract_contents(reader)?.as_bytes())?) + base = Some(parse_u64(extract_contents(reader)?.as_bytes())?) } - "size" => size = Some(parse_usize(extract_contents(reader)?.as_bytes())?), + "size" => size = Some(parse_u64(extract_contents(reader)?.as_bytes())?), _ => (), } }