Updated tools for managing the ESP32 toolchains

Author: sysprogs

generators/esp32/PeripheralRegisterParser.cs

@@ -141,7 +141,7 @@ public static HardwareRegisterSet[] ParsePeripheralRegisters(string socDir)
 
             Regex rgiTimesNumber = new Regex(@"^[ (\t]*i[ \t)]*\*[ \t]*[ \t(]*0x([0-9a-fA-F]+)[ \t)]*$");
 
-            foreach (var match in File.ReadAllLines(Path.Combine(socDir, $@"include\soc\soc.h")).Select(line => rgBaseDefinition.Match(line)).Where(m => m.Success))
+            foreach (var match in File.ReadAllLines(Path.Combine(socDir, $@"include\soc\reg_base.h")).Select(line => rgBaseDefinition.Match(line)).Where(m => m.Success))
                 registerSets[match.Groups[1].Value] = new ConstructedRegisterSet
                 {
                     Name = match.Groups[1].Value,

tools/ESP32ToolchainUpdater/ESP32ToolchainUpdater.csproj

@@ -12,6 +12,7 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+	<LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -43,6 +44,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MemoryMapUpdater.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

tools/ESP32ToolchainUpdater/MemoryMapUpdater.cs

@@ -0,0 +1,74 @@
+using BSPEngine;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace ESP32ToolchainUpdater
+{
+    internal class MemoryMapUpdater
+    {
+        struct MemoryExtents
+        {
+            public uint Start, Length;
+            public uint End => Start + Length;
+
+            public override string ToString() => $"{Start:x8}..{End:x8}";
+        }
+
+        static string MapMemoryName(string nameFromBSP) => nameFromBSP switch
+        {
+            "DATA_FLASH" => "drom0_0_seg",
+            "INSTR_FLASH" => "iram0_2_seg",
+            "INSTR_RAM" => "iram0_0_seg",
+            "DATA_RAM" => "dram0_0_seg",
+
+            "FLASH" => "irom_seg",
+            "RAM" => "iram0_0_seg",
+            "LPRAM" => "lp_reserved_seg",
+        };
+
+        public static void UpdateMemoryMap(string bspXML, string deviceName, string mapFile)
+        {
+            Dictionary<string, MemoryExtents> memories = null;
+            var rgMem = new Regex("([id]r[ao]m[^ \t]+|lp_reserved_seg)[ \t]+0x([0-9a-f]+)[ \t]+0x([0-9a-f]+)(.*)$");
+            foreach(var line in File.ReadAllLines(mapFile))
+            {
+                if (line == "Memory Configuration")
+                    memories = new Dictionary<string, MemoryExtents>();
+                else if (line == "Linker script and memory map")
+                    break;
+                else if (memories != null)
+                {
+                    var m = rgMem.Match(line);
+                    if (m.Success)
+                    {
+                        var extents = new MemoryExtents { Start = uint.Parse(m.Groups[2].Value, NumberStyles.HexNumber), Length = uint.Parse(m.Groups[3].Value, NumberStyles.HexNumber) };
+                        uint padding = extents.Start & 0xFFFFU;
+
+                        extents.Start -= padding;
+                        extents.Length += padding;
+
+                        memories[m.Groups[1].Value] = extents;
+                    }
+                }
+            }
+
+            var bsp = XmlTools.LoadObject<BoardSupportPackage>(bspXML);
+            var dev = bsp.SupportedMCUs.FirstOrDefault(m => m.ID == deviceName) ?? throw new Exception("Unknown MCU:" + deviceName);
+            foreach(var mem in dev.MemoryMap.Memories)
+            {
+                var extents = memories[MapMemoryName(mem.Name)];
+                mem.Address = extents.Start;
+                mem.Size = extents.Length;
+            }
+
+            XmlTools.SaveObject(bsp, bspXML);
+        }
+    }
+}

tools/ESP32ToolchainUpdater/Program.cs

@@ -47,6 +47,11 @@ static void Main(string[] args)
                 throw new Exception("Usage: ESP32ToolchainUpdater <old toolchain dir> <new toolchain dir>");
 
             string oldDir = Path.GetFullPath(args[0]), newDir = Path.GetFullPath(args[1]);
+            var bspXML = Path.Combine(newDir, @"esp32-bsp\BSP.xml");
+
+            //MemoryMapUpdater.UpdateMemoryMap(bspXML, "ESP32C6", @"E:\projects\temp\EmbeddedProject7\build\VisualGDB\Debug\blink.map");
+            //MemoryMapUpdater.UpdateMemoryMap(bspXML, "ESP32C3", @"E:\projects\temp\EmbeddedProject5\build\VisualGDB\Debug\blink.map");
+            return;
 
             var oldToolchain = XmlTools.LoadObject<Toolchain>(Path.Combine(oldDir, "toolchain.xml"));
             var newToolchain = XmlTools.LoadObject<Toolchain>(Path.Combine(newDir, "toolchain.xml"));
@@ -94,12 +99,12 @@ static void Main(string[] args)
             newToolchain.BinaryDirectory = Path.GetDirectoryName(newToolchainExesByName["xtensa-esp32-elf-gcc.exe"][0]);
 
             newToolchain.GCCVersion = QueryToolVersion(Path.Combine(newDir, newToolchain.BinaryDirectory, "xtensa-esp32-elf-gcc.exe"));
-            newToolchain.GDBVersion = QueryToolVersion(Path.Combine(newDir, newToolchain.BinaryDirectory, "xtensa-esp32-elf-gdb.exe"));
+            newToolchain.GDBVersion = QueryToolVersion(Path.Combine(newDir, newToolchainExesByName["xtensa-esp32-elf-gdb.exe"].First()));
             newToolchain.BinutilsVersion = QueryToolVersion(Path.Combine(newDir, newToolchain.BinaryDirectory, "xtensa-esp32-elf-as.exe"));
 
             XmlTools.SaveObject(newToolchain, Path.Combine(newDir, "toolchain.xml"));
 
-            var bsp = XmlTools.LoadObject<BoardSupportPackage>(Path.Combine(newDir, @"esp32-bsp\BSP.xml"));
+            var bsp = XmlTools.LoadObject<BoardSupportPackage>(bspXML);
             foreach (var mcu in bsp.SupportedMCUs)
             {
                 var v = mcu.AdditionalSystemVars.FirstOrDefault(kv => kv.Key == "com.sysprogs.visualgdb.gdb_override");