Skip to content

[svdconv] changed casts to dynamic_cast (#1336) #2240

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
edriouk merged 1 commit into from
Oct 20, 2025
Merged

[svdconv] changed casts to dynamic_cast (#1336) #2240

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
66 changes: 34 additions & 32 deletions tools/svdconv/SVDModel/src/SvdCpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,38 +238,40 @@ bool SvdCpu::ProcessXmlAttributes(XMLTreeElement* xmlElement)

bool SvdCpu::CopyItem(SvdItem *from)
{
const auto pFrom = (SvdCpu*) from;

const auto& revisionStr = GetRevisionStr ();
const auto revision = GetRevision ();
const auto nvicPrioBits = GetNvicPrioBits ();
const auto mpuPresent = GetMpuPresent ();
const auto fpuPresent = GetFpuPresent ();
const auto vendorSystickConfig = GetVendorSystickConfig ();
const auto fpuDP = GetFpuDP ();
const auto icachePresent = GetIcachePresent ();
const auto dcachePresent = GetDcachePresent ();
const auto itcmPresent = GetItcmPresent ();
const auto dtcmPresent = GetDtcmPresent ();
const auto vtorPresent = GetVtorPresent ();
const auto endian = GetEndian ();
const auto type = GetType ();

if(revisionStr == "") { SetRevisionStr (pFrom->GetRevisionStr ()); }
if(revision == 0 ) { SetRevision (pFrom->GetRevision ()); }
if(nvicPrioBits == 0 ) { SetNvicPrioBits (pFrom->GetNvicPrioBits ()); }
if(mpuPresent == 0 ) { SetMpuPresent (pFrom->GetMpuPresent ()); }
if(fpuPresent == 0 ) { SetFpuPresent (pFrom->GetFpuPresent ()); }
if(vendorSystickConfig == 0 ) { SetVendorSystickConfig (pFrom->GetVendorSystickConfig ()); }
if(fpuDP == 0 ) { SetFpuDP (pFrom->GetFpuDP ()); }
if(icachePresent == 0 ) { SetIcachePresent (pFrom->GetIcachePresent ()); }
if(dcachePresent == 0 ) { SetDcachePresent (pFrom->GetDcachePresent ()); }
if(itcmPresent == 0 ) { SetItcmPresent (pFrom->GetItcmPresent ()); }
if(dtcmPresent == 0 ) { SetDtcmPresent (pFrom->GetDtcmPresent ()); }
if(vtorPresent == 0 ) { SetVtorPresent (pFrom->GetVtorPresent ()); }
if(endian == SvdTypes::Endian::UNDEF) { SetEndian (pFrom->GetEndian ()); }
if(type == SvdTypes::CpuType::UNDEF) { SetType (pFrom->GetType ()); }

const auto pFrom = dynamic_cast<SvdCpu*>(from);

if(pFrom) {
const auto& revisionStr = GetRevisionStr ();
const auto revision = GetRevision ();
const auto nvicPrioBits = GetNvicPrioBits ();
const auto mpuPresent = GetMpuPresent ();
const auto fpuPresent = GetFpuPresent ();
const auto vendorSystickConfig = GetVendorSystickConfig ();
const auto fpuDP = GetFpuDP ();
const auto icachePresent = GetIcachePresent ();
const auto dcachePresent = GetDcachePresent ();
const auto itcmPresent = GetItcmPresent ();
const auto dtcmPresent = GetDtcmPresent ();
const auto vtorPresent = GetVtorPresent ();
const auto endian = GetEndian ();
const auto type = GetType ();

if(revisionStr == "") { SetRevisionStr (pFrom->GetRevisionStr ()); }
if(revision == 0 ) { SetRevision (pFrom->GetRevision ()); }
if(nvicPrioBits == 0 ) { SetNvicPrioBits (pFrom->GetNvicPrioBits ()); }
if(mpuPresent == 0 ) { SetMpuPresent (pFrom->GetMpuPresent ()); }
if(fpuPresent == 0 ) { SetFpuPresent (pFrom->GetFpuPresent ()); }
if(vendorSystickConfig == 0 ) { SetVendorSystickConfig (pFrom->GetVendorSystickConfig ()); }
if(fpuDP == 0 ) { SetFpuDP (pFrom->GetFpuDP ()); }
if(icachePresent == 0 ) { SetIcachePresent (pFrom->GetIcachePresent ()); }
if(dcachePresent == 0 ) { SetDcachePresent (pFrom->GetDcachePresent ()); }
if(itcmPresent == 0 ) { SetItcmPresent (pFrom->GetItcmPresent ()); }
if(dtcmPresent == 0 ) { SetDtcmPresent (pFrom->GetDtcmPresent ()); }
if(vtorPresent == 0 ) { SetVtorPresent (pFrom->GetVtorPresent ()); }
if(endian == SvdTypes::Endian::UNDEF) { SetEndian (pFrom->GetEndian ()); }
if(type == SvdTypes::CpuType::UNDEF) { SetType (pFrom->GetType ()); }
}

SvdItem::CopyItem(from);

return false;
Expand Down
18 changes: 10 additions & 8 deletions tools/svdconv/SVDModel/src/SvdEnum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,21 +225,23 @@ bool SvdEnum::SetValue(uint64_t value)

bool SvdEnum::CopyItem(SvdItem *from)
{
const auto pFrom = (SvdEnum*) from;
const auto pFrom = dynamic_cast<SvdEnum*>(from);

bool valValid = GetValue ().bValid;
bool isDefault = IsDefault();

if(!valValid) {
if(pFrom->GetValue().bValid) {
SetValue(pFrom->GetValue().u32);
if(pFrom) {
if(!valValid) {
if(pFrom->GetValue().bValid) {
SetValue(pFrom->GetValue().u32);
}
}
}

if(isDefault == 0 ) {
SetIsDefault(pFrom->IsDefault());
if(isDefault == 0 ) {
SetIsDefault(pFrom->IsDefault());
}
}

return SvdItem::CopyItem(from);
}

Expand Down
Loading