Skip to content

[cbuild-run] Fix effective datapatch handling #2075

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

Merged
jkrech merged 1 commit into from
May 9, 2025
Merged

[cbuild-run] Fix effective datapatch handling #2075

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
__var TraceD0_Pin = 0x00040003; // PE3
__var TraceD1_Pin = 0x00040004; // PE4
</debugvars>
<debug>
<datapatch address="0x1000FFFF" value="0xCC" info="Family level datapatch"/>
</debug>
<sequences>
<!-- Override for Pre-Defined Sequences -->
<sequence name="DebugDeviceUnlock">
Expand Down
35 changes: 18 additions & 17 deletions tools/projmgr/src/ProjMgrRunDebug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,23 +374,24 @@ void ProjMgrRunDebug::CollectDebugTopology(const ContextItem& context, const vec

// datapatches
for (const auto& [debug, _] : debugs) {
Collection<RteItem*> datapatches;
debug->GetChildrenByTag("datapatch", datapatches);
for (const auto& datapatch : datapatches) {
DatapatchType patch;
patch.address = datapatch->GetAttributeAsULL("address");
patch.value = datapatch->GetAttributeAsULL("value");
if (datapatch->HasAttribute("mask")) {
patch.mask = datapatch->GetAttributeAsULL("mask");
}
patch.type = datapatch->GetAttribute("type");
patch.info = datapatch->GetAttribute("info");
if (datapatch->HasAttribute("__apid")) {
datapatchById[datapatch->GetAttributeAsInt("__apid")].push_back(patch);
} else {
const auto& dp = datapatch->GetAttributeAsInt("__dp", defaultDp);
const auto& apIndex = datapatch->GetAttributeAsInt("__ap", debug->GetAttributeAsInt("__ap", 0));
datapatchByIndex[dp][apIndex].push_back(patch);
const RteDevicePropertyGroup* properties = dynamic_cast<const RteDeviceDebug*>(debug);
for (const auto& datapatch : properties->GetEffectiveContent()) {
if (datapatch->GetTag() == "datapatch") {
DatapatchType patch;
patch.address = datapatch->GetAttributeAsULL("address");
patch.value = datapatch->GetAttributeAsULL("value");
if (datapatch->HasAttribute("mask")) {
patch.mask = datapatch->GetAttributeAsULL("mask");
}
patch.type = datapatch->GetAttribute("type");
patch.info = datapatch->GetAttribute("info");
if (datapatch->HasAttribute("__apid")) {
datapatchById[datapatch->GetAttributeAsInt("__apid")].push_back(patch);
} else {
const auto& dp = datapatch->GetAttributeAsInt("__dp", defaultDp);
const auto& apIndex = datapatch->GetAttributeAsInt("__ap", debug->GetAttributeAsInt("__ap", 0));
datapatchByIndex[dp][apIndex].push_back(patch);
}
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW3.cbuild-run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ cbuild-run:
- address: 0xE0040FF0
value: 0x0000000D
info: CIDR0
- address: 0x1000FFFF
value: 0x000000CC
info: Family level datapatch
- dpid: 1
accessports:
- apid: 1
Expand Down
Loading