[cbuild-run] bug fixes and enhancements (#1196)

Author: brondani

libs/rtemodel/src/RteItem.cpp

@@ -781,7 +781,7 @@ bool RteItem::IsExecuteAccess()
 {
   const string& id = GetAttribute("id");
   if (!id.empty()) {
-    return id.find("IROM") == 0;
+    return id.find("IROM") == 0 || id.find("IRAM") == 0;
   }
   const string& access = GetAccess();
   return access.find('x') != string::npos;

libs/rtemodel/test/src/RteChkTest.cpp

@@ -30,9 +30,9 @@ Generic: 4\n\
 DFP: 3\n\
 BSP: 1\n\
 \n\
-Components: 59\n\
+Components: 60\n\
 From generic packs: 36\n\
-From DFP: 23\n\
+From DFP: 24\n\
 From BSP: 0\n\
 \n\
 Devices: 10\n\
@@ -51,7 +51,7 @@ completed\n";
   int res = rteChk.RunCheckRte();
   EXPECT_EQ(res, 0);
   EXPECT_EQ(rteChk.GetPackCount(), 8);
-  EXPECT_EQ(rteChk.GetComponentCount(), 59);
+  EXPECT_EQ(rteChk.GetComponentCount(), 60);
   EXPECT_EQ(rteChk.GetDeviceCount(), 10);
   EXPECT_EQ(rteChk.GetBoardCount(), 14);
 

test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc

@@ -133,6 +133,11 @@
         <processor Pname="cm0_core0" Dcore="Cortex-M0" DcoreVersion="r0p0" Dfpu="NO_FPU" Dmpu="NO_MPU" Dendian="Configurable" Dclock="10000000" />
         <processor Pname="cm0_core1" Dcore="Cortex-M0" DcoreVersion="r0p0" Dfpu="NO_FPU" Dmpu="NO_MPU" Dendian="Configurable" Dclock="10000000"/>
         <compile header="Device/ARM/ARMCM0/Include/ARMCM0.h" define="ARMCM0"/>
+        <memory name="FLASH_DUAL" access="rx" start="0x00000000" size="0x00080000" startup="1" default="1" Pname="cm0_core0"/>
+        <memory name="SRAM_DUAL"  access="rwx" start="0x80000000" size="0x00020000" uninit="1" default="1" Pname="cm0_core1"/>
+        <debug defaultResetSequence="ResetSystem0" Pname="cm0_core0"/> 
+        <debug defaultResetSequence="ResetSystem1" Pname="cm0_core1"/> 
+        <algorithm name="Device/ARM/Flash/CortexM4Dual.FLM" start="0x000A0000" size="0x00020000" RAMstart="0x000C0000" RAMsize="0x00040000" Pname="cm0_core1"/>
       </device>
       <device Dname="RteTest_ARMCM0_Single">
         <processor Pname="cm0_core1" Dcore="Cortex-M0" DcoreVersion="r0p0" Dfpu="NO_FPU" Dmpu="NO_MPU" Dendian="Configurable" Dclock="10000000"/>
@@ -151,6 +156,9 @@
         RteTest ARM Cortex M3 is a clone description from ARM.CMSIS pack.
       </description>
       <debug svd="Device/ARM/SVD/ARMCM3.svd"/>  <!-- SVD files do not contain any peripheral -->
+      <accessportV1 __apid="2" index="20" HPROT="0x2" SPROT="1"/>
+      <accessportV2 __apid="4" address="0x00400000" HPROT="0xF" SPROT="0"/>
+
       <memory id="IROM1" start="0x00000000" size="0x00040000" startup="1" default="1"/>
       <memory id="IRAM1" start="0x20000000" size="0x00020000" uninit="1" default="1"/>
 
@@ -166,13 +174,23 @@
       <description>
         RteTest ARM Cortex M4 is a clone description from ARM.CMSIS pack.
       </description>
-      <debugconfig default="jtag" clock="40000000"/>
+      <debugconfig default="jtag" clock="40000000" swj="0" dormant="1" sdf="Device/ARM/Debug/ARMCM4.sdf"/>
+      <debugport __dp="0">
+        <jtag tapindex="7"/> 
+      </debugport>
+      <debugport __dp="1">
+        <swd targetsel="8"/>
+      </debugport>
       <debugvars configfile="Device/ARM/Debug/ARMCM4.dbgconf" version="0.2.1" >
         __var DbgMCU_CR      = 0x00000007;   // DBGMCU_CR: DBG_SLEEP, DBG_STOP, DBG_STANDBY
         __var TraceClk_Pin   = 0x00040003;   // PE2
         __var TraceD0_Pin    = 0x00040003;   // PE4
       </debugvars>
       <debug svd="Device/ARM/SVD/ARMCM4.svd"/>  <!-- SVD files do not contain any peripheral -->
+      <accessportV1 __apid="1" index="10"/>
+      <accessportV2 __apid="2" address="0x00200000"/>
+      <accessportV2 __apid="3" address="0x00300000" parent="2"/>
+
       <memory name="FLASH" access="rx" start="0x00000000" size="0x00040000" startup="1" default="1"/>
       <memory name="SRAM"  access="rwx" start="0x20000000" size="0x00020000" uninit="1" default="1"/>
       <algorithm name="Device/ARM/Flash/CortexM4SubFamily.FLM" start="0x00000000" size="0x00040000" default="1"/>
@@ -435,6 +453,13 @@
       </files>
     </component>
 
+    <component Cclass="RteTest" Cgroup="scvd" Cversion="1.1.1" condition="ARMCM3 RteTest">
+    <description>scvd test</description>
+      <files>
+        <file category="other"  name="Components/RteTest.scvd"/>
+      </files>
+    </component>
+
   </components>
 
   <boards>

test/packs/ARM/RteTest_DFP/0.2.0/Components/RteTest.scvd

@@ -0,0 +1,2 @@
+// scvd
+

test/packs/ARM/RteTest_DFP/0.2.0/Device/ARM/Debug/ARMCM4.sdf

@@ -0,0 +1 @@
+// sdf

test/packs/ARM/RteTest_DFP/0.2.0/Device/ARM/Flash/CortexM4Dual.FLM

@@ -0,0 +1 @@
+CortexM4Dual.FLM : not real flash algorithm

tools/projmgr/include/ProjMgrParser.h

@@ -424,15 +424,15 @@ struct CdefaultItem {
  * @brief debugger item containing
  *        name of debug configuration
  *        brief description
- *        debug port (jtag or swd)
+ *        debug protocol (jtag or swd)
  *        debug clock speed
  *        debug configuration file
  *        type filter
 */
 struct DebuggerItem {
   std::string name;
   std::string info;
-  std::string port;
+  std::string protocol;
   std::string clock;
   std::string dbgconf;
   TypeFilter type;

tools/projmgr/include/ProjMgrRunDebug.h

@@ -9,17 +9,23 @@
 
 #include "ProjMgrWorker.h"
 
+ /**
+  * @brief ram type
+ */
+struct RamType {
+  unsigned long long start = 0;
+  unsigned long long size = 0;
+  std::string pname;
+};
+
 /**
   * @brief programming algorithm types
  */
 struct AlgorithmType {
   std::string algorithm;
   unsigned long long start = 0;
   unsigned long long size = 0;
-  unsigned long long ramStart = 0;
-  unsigned long long ramSize = 0;
-  bool bDefault = false;
-  std::string pname;
+  RamType ram;
 };
 
 /**
@@ -32,9 +38,6 @@ struct MemoryType {
   std::string fromPack;
   unsigned long long start = 0;
   unsigned long long size = 0;
-  bool bDefault = false;
-  bool bStartup = false;
-  bool bUninit = false;
   std::string pname;
 };
 
@@ -65,7 +68,7 @@ struct DebugSequencesBlockType {
   std::string execute;
   std::string control_if;
   std::string control_while;
-  std::string timeout;
+  std::optional<unsigned int>timeout;
   bool bAtomic = false;
   std::vector<DebugSequencesBlockType> blocks;
 };
@@ -93,11 +96,62 @@ struct DebugVarsType {
 struct DebuggerType {
   std::string name;
   std::string info;
-  std::string port;
+  std::string protocol;
   unsigned long long clock = 0;
   std::string dbgconf;
 };
 
+/**
+ * @brief punit type
+*/
+struct PunitType {
+  std::optional<unsigned int> punit;
+  std::optional<unsigned long long> address;
+};
+
+/**
+ * @brief processor type
+*/
+struct ProcessorType {
+  std::string pname;
+  std::vector<PunitType> punits;
+  std::optional<unsigned int> apid;
+  std::string resetSequence;
+};
+
+/**
+ * @brief access port type
+*/
+struct AccessPortType {
+  unsigned int apid;
+  std::optional<unsigned int> index;
+  std::optional<unsigned long long> address;
+  std::optional<unsigned int> hprot;
+  std::optional<unsigned int> sprot;
+  std::vector<AccessPortType> accessPorts;
+};
+
+/**
+ * @brief debug port type
+*/
+struct DebugPortType {
+  unsigned int dpid;
+  std::optional<unsigned int> jtagTapIndex;
+  std::optional<unsigned int> swdTargetSel;
+  std::vector<AccessPortType> accessPorts;
+};
+
+/**
+ * @brief debug topology type
+*/
+struct DebugTopologyType {
+  std::vector<DebugPortType> debugPorts;
+  std::vector<ProcessorType> processors;
+  std::optional<bool> swj;
+  std::optional<bool> dormant;
+  std::string sdf;
+};
+
  /**
   * @brief debug run manager types
  */
@@ -117,6 +171,7 @@ struct RunDebugType {
   std::vector<DebuggerType> debuggers;
   DebugVarsType debugVars;
   std::vector<DebugSequencesType> debugSequences;
+  DebugTopologyType debugTopology;
 };
 
 /**
@@ -154,6 +209,9 @@ class ProjMgrRunDebug {
     const RteItem* item, const std::string pname);
   FilesType SetLoadFromOutput(const ContextItem* context, OutputType output, const std::string type);
   std::string GetAccessAttributes(const RteItem* mem);
+  void SetAccessPorts(std::vector<AccessPortType>& parent, const std::map<unsigned int,
+    std::vector<AccessPortType>>& childrenMap);
+  void SetProtNodes(const RteDeviceProperty* item, AccessPortType& ap);
 };
 
 #endif  // PROJMGRRUNDEBUG_H

tools/projmgr/include/ProjMgrUtils.h

@@ -276,9 +276,10 @@ class ProjMgrUtils {
   /**
    * @brief convert ULL to hex string
    * @param unsigned long long number
+   * @param width of hexadecimal string, default 8 digits
    * @return hexadecimal string
   */
-  static const std::string ULLToHex(unsigned long long number);
+  static const std::string ULLToHex(unsigned long long number, int width = 8);
 
   /**
    * @brief get variable name

tools/projmgr/include/ProjMgrYamlParser.h

@@ -14,15 +14,18 @@
   * @brief YAML key definitions
 */
 static constexpr const char* YAML_ACCESS = "access";
+static constexpr const char* YAML_ACCESSPORTS = "accessports";
 static constexpr const char* YAML_ALGORITHM = "algorithm";
 static constexpr const char* YAML_ALIAS = "alias";
-static constexpr const char* YAML_APIS = "apis";
-static constexpr const char* YAML_API = "api";
 static constexpr const char* YAML_ADDPATH = "add-path";
 static constexpr const char* YAML_ADDPATH_ASM = "add-path-asm";
+static constexpr const char* YAML_ADDRESS = "address";
 static constexpr const char* YAML_ALWAYS = "always";
 static constexpr const char* YAML_ARGUMENT = "argument";
 static constexpr const char* YAML_ARGUMENTS = "arguments";
+static constexpr const char* YAML_APID = "apid";
+static constexpr const char* YAML_APIS = "apis";
+static constexpr const char* YAML_API = "api";
 static constexpr const char* YAML_ATOMIC = "atomic";
 static constexpr const char* YAML_ATTR = "attr";
 static constexpr const char* YAML_AUTO = "auto";
@@ -70,12 +73,15 @@ static constexpr const char* YAML_CONTEXT = "context";
 static constexpr const char* YAML_CONTEXTS = "contexts";
 static constexpr const char* YAML_CONTEXT_MAP = "context-map";
 static constexpr const char* YAML_COPY_TO = "copy-to";
+static constexpr const char* YAML_CORE = "core";
 static constexpr const char* YAML_CREATED_BY = "created-by";
 static constexpr const char* YAML_CREATED_FOR = "created-for";
 static constexpr const char* YAML_DEBUG = "debug";
 static constexpr const char* YAML_DEBUG_SEQUENCES = "debug-sequences";
 static constexpr const char* YAML_DEBUG_VARS = "debug-vars";
+static constexpr const char* YAML_DEBUG_TOPOLOGY = "debug-topology";
 static constexpr const char* YAML_DEBUGGER = "debugger";
+static constexpr const char* YAML_DEBUGPORTS = "debugports";
 static constexpr const char* YAML_DBGCONF = "dbgconf";
 static constexpr const char* YAML_DEFAULT = "default";
 static constexpr const char* YAML_DEFINE = "define";
@@ -86,7 +92,9 @@ static constexpr const char* YAML_DESCRIPTION = "description";
 static constexpr const char* YAML_DEVICE = "device";
 static constexpr const char* YAML_DEVICE_BOOKS = "device-books";
 static constexpr const char* YAML_DEVICE_PACK = "device-pack";
+static constexpr const char* YAML_DORMANT = "dormant";
 static constexpr const char* YAML_DOWNLOAD_URL = "download-url";
+static constexpr const char* YAML_DPID = "dpid";
 static constexpr const char* YAML_DSP = "dsp";
 static constexpr const char* YAML_ENDIAN = "endian";
 static constexpr const char* YAML_ENVIRONMENT = "environment";
@@ -110,13 +118,16 @@ static constexpr const char* YAML_GPDSC = "gpdsc";
 static constexpr const char* YAML_GROUP = "group";
 static constexpr const char* YAML_GROUPS = "groups";
 static constexpr const char* YAML_HOST = "host";
+static constexpr const char* YAML_HPROT = "HPROT";
 static constexpr const char* YAML_ID = "id";
 static constexpr const char* YAML_IF = "if";
 static constexpr const char* YAML_IMPLEMENTED_BY = "implemented-by";
 static constexpr const char* YAML_IMPLEMENTS = "implements";
+static constexpr const char* YAML_INDEX = "index";
 static constexpr const char* YAML_INFO = "info";
 static constexpr const char* YAML_INPUT = "input";
 static constexpr const char* YAML_INSTANCES = "instances";
+static constexpr const char* YAML_JTAG = "jtag";
 static constexpr const char* YAML_LANGUAGE = "language";
 static constexpr const char* YAML_LANGUAGE_C = "language-C";
 static constexpr const char* YAML_LANGUAGE_CPP = "language-CPP";
@@ -159,24 +170,28 @@ static constexpr const char* YAML_PACKS_MISSING = "packs-missing";
 static constexpr const char* YAML_PACKS_UNUSED = "packs-unused";
 static constexpr const char* YAML_PATH = "path";
 static constexpr const char* YAML_PNAME = "pname";
-static constexpr const char* YAML_PORT = "port";
+static constexpr const char* YAML_PUNITS = "punits";
+static constexpr const char* YAML_PUNIT = "punit";
+static constexpr const char* YAML_PROCESSORS = "processors";
 static constexpr const char* YAML_PROCESSOR = "processor";
 static constexpr const char* YAML_PROGRAMMING = "programming";
 static constexpr const char* YAML_PROJECT = "project";
 static constexpr const char* YAML_PROJECTS = "projects";
 static constexpr const char* YAML_PROJECT_TYPE = "project-type";
+static constexpr const char* YAML_PROTOCOL = "protocol";
 static constexpr const char* YAML_PROVIDES = "provides";
 static constexpr const char* YAML_RAM_SIZE = "ram-size";
 static constexpr const char* YAML_RAM_START = "ram-start";
 static constexpr const char* YAML_REBUILD = "rebuild";
 static constexpr const char* YAML_REGIONS = "regions";
+static constexpr const char* YAML_RESET_SEQUENCE = "reset-sequence";
 static constexpr const char* YAML_RESOLVED_PACK = "resolved-pack";
 static constexpr const char* YAML_RESOLVED_PACKS = "resolved-packs";
 static constexpr const char* YAML_RTE = "rte";
 static constexpr const char* YAML_RUN = "run";
 static constexpr const char* YAML_SCOPE = "scope";
 static constexpr const char* YAML_SCRIPT = "script";
-static constexpr const char* YAML_SOLUTION = "solution";
+static constexpr const char* YAML_SDF = "sdf";
 static constexpr const char* YAML_SELECT = "select";
 static constexpr const char* YAML_SELECTED_BY = "selected-by";
 static constexpr const char* YAML_SELECTED_BY_PACK = "selected-by-pack";
@@ -187,21 +202,24 @@ static constexpr const char* YAML_SETTINGS = "settings";
 static constexpr const char* YAML_SELECT_COMPILER = "select-compiler";
 static constexpr const char* YAML_SIZE = "size";
 static constexpr const char* YAML_START = "start";
-static constexpr const char* YAML_STARTUP = "startup";
 static constexpr const char* YAML_STATUS = "status";
+static constexpr const char* YAML_SOLUTION = "solution";
+static constexpr const char* YAML_SPROT = "SPROT";
+static constexpr const char* YAML_SWD = "swd";
+static constexpr const char* YAML_SWJ = "swj";
 static constexpr const char* YAML_SWITCH = "switch";
 static constexpr const char* YAML_SYSTEM_DESCRIPTIONS = "system-descriptions";
 static constexpr const char* YAML_SYSTEM_RESOURCES = "system-resources";
+static constexpr const char* YAML_TAPINDEX = "tapindex";
 static constexpr const char* YAML_TARGET_CONFIGURATIONS = "target-configurations";
+static constexpr const char* YAML_TARGETSEL = "targetsel";
 static constexpr const char* YAML_TARGETTYPE = "target-type";
 static constexpr const char* YAML_TARGETTYPES = "target-types";
 static constexpr const char* YAML_TIMEOUT = "timeout";
 static constexpr const char* YAML_TRUSTZONE = "trustzone";
-static constexpr const char* YAML_CORE = "core";
 static constexpr const char* YAML_TITLE = "title";
 static constexpr const char* YAML_TYPE = "type";
 static constexpr const char* YAML_UNDEFINE = "undefine";
-static constexpr const char* YAML_UNINIT = "uninit";
 static constexpr const char* YAML_UPDATE = "update";
 static constexpr const char* YAML_VARIABLES = "variables";
 static constexpr const char* YAML_VARS = "vars";