Skip to content

Merge parent processor attributes #5

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

Open
david-sawatzke wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Merge parent processor attributes #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 19 additions & 4 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 @@ -144,6 +144,15 @@ struct ProcessorBuilder {
}

impl ProcessorBuilder {
fn merge(self, other: &Self) -> Self {
Self {
core: self.core.or(other.core.clone()),
units: self.units.or(other.units),
name: self.name.or(other.name.clone()),
fpu: self.fpu.or(other.fpu.clone()),
mpu: self.mpu.or(other.mpu.clone()),
}
}
fn build(self, debugs: &Vec<Debug>) -> Result<Vec<Processor>, Error> {
let units = self.units.unwrap_or(1);
let name = self.name.clone();
Expand Down Expand Up @@ -219,11 +228,17 @@ impl FromElem for ProcessorBuilder {
struct ProcessorsBuilder(Vec<ProcessorBuilder>);

impl ProcessorsBuilder {
fn merge(mut self, parent: &Option<Self>) -> Self {
fn merge(mut self, parent: &Option<Self>) -> Result<Self, Error> {
if let Some(parent) = parent {
self.0.extend(parent.0.iter().map(|v| v.clone()))
if let [parent] = &parent.0[..] {
self.0 = self.0.into_iter().map(|x| x.merge(parent)).collect();
} else {
Err(format_err!(
"Support for two parent processors not implemented!"
))?;
}
}
self
Ok(self)
}

fn merge_into(&mut self, other: Self) {
Expand Down Expand Up @@ -569,7 +584,7 @@ impl<'dom> DeviceBuilder<'dom> {
algorithms: self.algorithms,
memories: merge_memories(self.memories, &parent.memories),
processor: match self.processor {
Some(old_proc) => Some(old_proc.merge(&parent.processor)),
Some(old_proc) => Some(old_proc.merge(&parent.processor)?),
None => parent.processor.clone(),
},
debugs: self.debugs.merge(&parent.debugs),
Expand Down