[svdconv] disableCondition Inheritance leads to a segment violation #1796 (#1176)

Author: thorstendb-ARM

tools/svdconv/SVDModel/include/SvdCExpression.h

@@ -24,13 +24,13 @@ class SvdCExpression : public SvdElement
 
   virtual bool CheckItem();
 
-  class Symbols_t {
+  class Symbols {
   public:
     SvdCExpressionParser::token_s token;
     SvdItem* svdItem;
     std::list<std::string> searchname;
 
-    Symbols_t() {
+    Symbols() {
       clear();
     }
     void clear() {
@@ -40,7 +40,7 @@ class SvdCExpression : public SvdElement
       token.type = SvdCExpressionParser::xme_what;
     }
   };
-  using SymbolsList = std::list<Symbols_t>;
+  using SymbolsList = std::list<Symbols>;
 
   using RegList = std::map<std::string, SvdItem*>;
 

tools/svdconv/SVDModel/include/SvdPeripheral.h

@@ -90,6 +90,8 @@ class SvdPeripheral : public SvdItem
   bool                    CalcDisableCondition        ();
   bool                    AddToMap                    (SvdEnum *enu, std::map<std::string, SvdEnum*> &map);
   bool                    CalculateMaxPaddingWidth    ();
+  bool                    CopyDisableCondition        ( SvdCExpression*     disableCondition);
+
 
   const std::string&      GetVersion                  () { return m_version;          }
   const std::string&      GetGroupName                () { return m_groupName;        }
@@ -110,7 +112,6 @@ class SvdPeripheral : public SvdItem
   bool                    SetAlternate                ( const std::string&  alternate       )  { m_alternate        = alternate       ;  return true; }
   bool                    SetPrependToName            ( const std::string&  prependToName   )  { m_prependToName    = prependToName   ;  return true; }
   bool                    SetAppendToName             ( const std::string&  appendToName    )  { m_appendToName     = appendToName    ;  return true; }
-  bool                    SetDisableCondition         ( SvdCExpression*     disableCondition)  { m_disableCondition = disableCondition;  return true; }
   bool                    SetAddress                  ( uint64_t            address         )  { m_address.u64      = address         ;  m_address.bValid = true; return true; }
   bool                    SetResetValue               ( uint64_t            resetValue      )  { m_resetValue       = resetValue      ;  return true; }
   bool                    SetResetMask                ( uint64_t            resetMask       )  { m_resetMask        = resetMask       ;  return true; }

tools/svdconv/SVDModel/src/SvdCExpression.cpp

@@ -52,7 +52,7 @@ bool SvdCExpression::LinkSymbols(SvdItem* item, const SvdCExpressionParser::Toke
   }
 
   m_symbolsList.clear();
-  Symbols_t symbol;
+  Symbols symbol;
   string errText;
 
   for(const auto& token : tokens) {

tools/svdconv/SVDModel/src/SvdPeripheral.cpp

@@ -369,7 +369,7 @@ bool SvdPeripheral::CopyItem(SvdItem *from)
   if(alternate        == "")                      { SetAlternate           (pFrom->GetAlternate           ()); }
   if(prependToName    == "")                      { SetPrependToName       (pFrom->GetPrependToName       ()); }
   if(appendToName     == "")                      { SetAppendToName        (pFrom->GetAppendToName        ()); }
-  if(disableCondition == nullptr)                 { SetDisableCondition    (pFrom->GetDisableCondition    ()); }  // TODO: Add a copy mechanism?
+  if(disableCondition == nullptr)                 { CopyDisableCondition    (pFrom->GetDisableCondition    ()); }  // TODO: Add a copy mechanism?
   if(address          == 0 )                      { SetAddress             (pFrom->GetAddress             ()); }
   if(resetValue       == 0 )                      { SetResetValue          (pFrom->GetResetValue          ()); }
   if(resetMask        == 0 )                      { SetResetMask           (pFrom->GetResetMask           ()); }
@@ -429,6 +429,17 @@ bool SvdPeripheral::CalculateMaxPaddingWidth()
   return true;
 }
 
+bool SvdPeripheral::CopyDisableCondition(SvdCExpression* from)
+{
+  if(!from) {
+    return true;
+  }
+
+  m_disableCondition = new SvdCExpression(*from);
+
+  return true; 
+}
+
 bool SvdPeripheral::Calculate()
 {
   CalculateMaxPaddingWidth();

tools/svdconv/Test/data/accViolationDisableCond/accViolationDisableCond.xml

@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='utf-8'?>
+<device xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" schemaVersion="1.3">
+  <name>test</name>
+  <version>1.0</version>
+  <description>Test_Example device</description>
+  <addressUnitBits>8</addressUnitBits>
+  <width>32</width>
+  <peripherals>
+    <peripheral>
+      <name>PeripheralA</name>
+      <disableCondition>0 == 0</disableCondition>
+      <baseAddress>0x40004000</baseAddress>
+      <addressBlock>
+        <offset>0x0</offset>
+        <size>0x1000</size>
+        <usage>registers</usage>
+      </addressBlock>
+      <registers>
+        <register>
+          <name>RegisterA</name>
+          <addressOffset>0x0</addressOffset>
+        </register>
+      </registers>
+    </peripheral>
+    <peripheral derivedFrom="PeripheralA">
+      <name>PeripheralB</name>
+      <baseAddress>0x40002000</baseAddress>
+    </peripheral>
+  </peripherals>
+</device>

tools/svdconv/Test/integtests/src/SvdConvIntegTests.cpp

@@ -157,3 +157,14 @@ TEST_F(SvdConvIntegTests, CheckSauNumRegions_Errors) {
     FAIL() << "Occurrences of M219, M364 are wrong.";
   }
 }
+
+// Validate NameHasBrackets
+TEST_F(SvdConvIntegTests, CheckAccViolationDisableCond) {
+  const string& inFile = SvdConvIntegTestEnv::localtestdata_dir + "/accViolationDisableCond/accViolationDisableCond.xml";
+  ASSERT_TRUE(RteFsUtils::Exists(inFile));
+
+  Arguments args("SVDConv.exe", inFile);
+
+  SvdConv svdConv;
+  EXPECT_EQ(1, svdConv.Check(args, args, nullptr));
+}