[rtemodel] Adjust default heap in regions file according to total RAM

Open-CMSIS-Pack · Sep 2, 2024 · ca01c9d · ca01c9d
1 parent 804b635
commit ca01c9d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/libs/rtemodel/src/RteTarget.cpp b/libs/rtemodel/src/RteTarget.cpp
@@ -1778,10 +1778,12 @@ std::string RteTarget::GenerateRegionsHeaderContent() const
   }
   vector<RteItem*> memRO;
   vector<RteItem*> memRW;
+  unsigned int totalRW = 0;
   auto& deviceMems = device->GetEffectiveProperties("memory", GetProcessorName());
   for (auto mem : deviceMems) {
     if (mem->IsWriteAccess()) {
       memRW.push_back(mem);
+      totalRW += stoul(mem->GetAttribute("size"), nullptr, 16);
     } else {
       memRO.push_back(mem);
     }
@@ -1794,6 +1796,7 @@ std::string RteTarget::GenerateRegionsHeaderContent() const
     for( auto mem : board->GetMemories(boardMemCollection)) {
       if (mem->IsWriteAccess()) {
         memRW.push_back(mem);
+        totalRW += stoul(mem->GetAttribute("size"), nullptr, 16);
       } else {
         memRO.push_back(mem);
       }
@@ -1837,7 +1840,7 @@ std::string RteTarget::GenerateRegionsHeaderContent() const
   oss << "//   <o0> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>" << RteUtils::LF_STRING;
   oss << "//   <o1> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>" << RteUtils::LF_STRING;
   oss << "#define __STACK_SIZE 0x00000200" << RteUtils::LF_STRING;
-  oss << "#define __HEAP_SIZE 0x00000000" << RteUtils::LF_STRING;
+  oss << "#define __HEAP_SIZE " << (totalRW >= 6144 ? "0x00000C00" : "0x00000000") << RteUtils::LF_STRING;
   oss << "// </h>" << RteUtils::LF_STRING;
 
   return oss.str();

diff --git a/test/projects/RteTestM4/regions_RteTest_ARMCM4_FP_ref.h b/test/projects/RteTestM4/regions_RteTest_ARMCM4_FP_ref.h
@@ -54,7 +54,7 @@
 //   <o0> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 //   <o1> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 #define __STACK_SIZE 0x00000200
-#define __HEAP_SIZE 0x00000000
+#define __HEAP_SIZE 0x00000C00
 // </h>
 
 

diff --git a/test/projects/RteTestM4/regions_RteTest_CM4_board_ref.h b/test/projects/RteTestM4/regions_RteTest_CM4_board_ref.h
@@ -89,7 +89,7 @@
 //   <o0> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 //   <o1> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 #define __STACK_SIZE 0x00000200
-#define __HEAP_SIZE 0x00000000
+#define __HEAP_SIZE 0x00000C00
 // </h>
 
 

diff --git a/...projmgr/test/data/TestSolution/LinkerOptions/ref/regions_RteTest-Test-board_With.Memory.h b/...projmgr/test/data/TestSolution/LinkerOptions/ref/regions_RteTest-Test-board_With.Memory.h
@@ -89,7 +89,7 @@
 //   <o0> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 //   <o1> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 #define __STACK_SIZE 0x00000200
-#define __HEAP_SIZE 0x00000000
+#define __HEAP_SIZE 0x00000C00
 // </h>
 
 

diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/regions_RteTest_ARMCM3.h b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/regions_RteTest_ARMCM3.h
@@ -54,7 +54,7 @@
 //   <o0> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 //   <o1> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 #define __STACK_SIZE 0x00000200
-#define __HEAP_SIZE 0x00000000
+#define __HEAP_SIZE 0x00000C00
 // </h>