Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add APv2 support #225

Closed
wants to merge 4 commits into from
Closed

Add APv2 support #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0669e8
Use the element’s name rather than hardcoding it
ithinuel Apr 6, 2024
0345411
Remove unnecessary allocation as suggested by clippy
ithinuel Apr 6, 2024
2572c26
Introduce AccessPort v2 support
ithinuel Apr 6, 2024
f29a35c
Merge branch 'main' into add-apv2-support
mathias-arm Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 59 additions & 24 deletions rust/cmsis-pack/src/pdsc/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::str::FromStr;

use crate::utils::prelude::*;
use anyhow::{format_err, Error};
use minidom::Element;
use minidom::{Element, NSChoice};
use serde::{Deserialize, Serialize};

#[derive(Debug, Clone, Serialize, Deserialize)]
Expand Down Expand Up @@ -134,9 +134,8 @@ pub struct Processor {
pub core: Core,
pub fpu: FPU,
pub mpu: MPU,
pub ap: u8,
pub ap: AccessPort,
pub dp: u8,
pub apid: Option<u32>,
pub address: Option<u32>,
pub svd: Option<String>,
pub name: Option<String>,
Expand Down Expand Up @@ -171,9 +170,8 @@ impl ProcessorBuilder {
.into_iter()
.map(|unit| {
let default = Debug {
ap: 0,
ap: AccessPort::Index(0),
dp: 0,
apid: None,
address: None,
svd: None,
name: name.clone(),
Expand All @@ -183,7 +181,6 @@ impl ProcessorBuilder {
let Debug {
ap,
dp,
apid,
address,
svd,
name,
Expand All @@ -206,9 +203,8 @@ impl ProcessorBuilder {
.ok_or_else(|| format_err!("No Core found!"))?,
fpu: self.fpu.clone().unwrap_or(FPU::None),
mpu: self.mpu.clone().unwrap_or(MPU::NotPresent),
ap: *ap,
dp: *dp,
apid: *apid,
ap: *ap,
address: *address,
svd: svd.clone(),
name: name.clone(),
Expand Down Expand Up @@ -270,11 +266,20 @@ impl FromElem for ProcessorsBuilder {
}
}

#[derive(Debug, Clone, Copy, Deserialize, Serialize)]
pub enum AccessPort {
Index(u8),
Address(u64),
}
impl Default for AccessPort {
fn default() -> Self {
Self::Index(0)
}
}
#[derive(Debug, Clone, Deserialize, Serialize)]
pub struct Debug {
pub ap: u8,
pub dp: u8,
pub apid: Option<u32>,
pub ap: AccessPort,
pub address: Option<u32>,
pub svd: Option<String>,
pub name: Option<String>,
Expand All @@ -284,9 +289,8 @@ pub struct Debug {

#[derive(Debug, Clone)]
struct DebugBuilder {
ap: Option<u8>,
dp: Option<u8>,
apid: Option<u32>,
ap: Option<AccessPort>,
address: Option<u32>,
svd: Option<String>,
name: Option<String>,
Expand All @@ -297,9 +301,8 @@ struct DebugBuilder {
impl DebugBuilder {
fn build(self) -> Debug {
Debug {
ap: self.ap.unwrap_or_default(),
dp: self.dp.unwrap_or_default(),
apid: self.apid,
ap: self.ap.unwrap_or_default(),
address: self.address,
svd: self.svd,
name: self.name,
Expand All @@ -309,12 +312,42 @@ impl DebugBuilder {
}
}

impl FromElem for DebugBuilder {
fn from_elem(e: &Element) -> Result<Self, Error> {
impl DebugBuilder {
fn from_elem_and_parent(e: &Element, p: &Element) -> Result<Self, Error> {
let (dp, ap) = if p.has_child("accessportV1", NSChoice::None)
|| p.has_child("accessportV2", NSChoice::None)
{
let __apid: u32 = attr_parse(e, "__apid")?;
let ap = p
.children()
.find(|c| {
c.name().starts_with("accessportV")
&& attr_parse(c, "__apid")
.map(|apid: u32| apid == __apid)
.unwrap_or(false)
})
.ok_or_else(|| anyhow::anyhow!("Unable do find Access Port with id {__apid:?}."))?;
match ap.name() {
"accessportV1" => (
attr_parse(ap, "__dp").ok(),
attr_parse(ap, "index").ok().map(AccessPort::Index),
),
"accessportV2" => (
attr_parse(ap, "__dp").ok(),
attr_parse(ap, "address").ok().map(AccessPort::Address),
),
_ => unreachable!(),
}
} else {
(
attr_parse(e, "__dp").ok(),
attr_parse(e, "__ap").ok().map(AccessPort::Index),
)
};

Ok(DebugBuilder {
ap: attr_parse(e, "__ap").ok(),
dp: attr_parse(e, "__dp").ok(),
apid: attr_parse(e, "__apid").ok(),
dp,
ap,
address: attr_parse(e, "address").ok(),
svd: attr_parse(e, "svd").ok(),
name: attr_parse(e, "Pname").ok(),
Expand All @@ -327,9 +360,11 @@ impl FromElem for DebugBuilder {
#[derive(Debug)]
struct DebugsBuilder(Vec<DebugBuilder>);

impl FromElem for DebugsBuilder {
fn from_elem(e: &Element) -> Result<Self, Error> {
Ok(DebugsBuilder(vec![DebugBuilder::from_elem(e)?]))
impl DebugsBuilder {
fn from_elem_and_parent(e: &Element, p: &Element) -> Result<Self, Error> {
Ok(DebugsBuilder(vec![DebugBuilder::from_elem_and_parent(
e, p,
)?]))
}
}

Expand Down Expand Up @@ -678,7 +713,7 @@ fn parse_device<'dom>(e: &'dom Element) -> Vec<DeviceBuilder<'dom>> {
None
}
"debug" => {
FromElem::from_elem(child)
DebugsBuilder::from_elem_and_parent(child, e)
.ok_warn()
.map(|debug| device.add_debug(debug));
None
Expand Down Expand Up @@ -721,7 +756,7 @@ fn parse_sub_family<'dom>(e: &'dom Element) -> Vec<DeviceBuilder<'dom>> {
Vec::new()
}
"debug" => {
FromElem::from_elem(child)
DebugsBuilder::from_elem_and_parent(child, e)
.ok_warn()
.map(|debug| sub_family_device.add_debug(debug));
Vec::new()
Expand Down
2 changes: 1 addition & 1 deletion rust/cmsis-pack/src/pdsc/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mod condition;
mod device;
pub use component::{ComponentBuilders, FileRef};
pub use condition::{Condition, Conditions};
pub use device::{Algorithm, Core, Device, Devices, Memories, Processor};
pub use device::{AccessPort, Algorithm, Core, Device, Devices, Memories, Processor};

pub struct Release {
pub version: String,
Expand Down
Loading