Merge pull request #2371 from dhalbert/ld-cleanup

Parameterize flash storage layout for atmel-samd and nrf

2 files changed, 75 insertions, 6 deletions

diff --git a/tools/build_memory_info.py b/tools/build_memory_info.py
index a8f84bbb6..f61b843ce 100644
--- a/tools/build_memory_info.py
+++ b/tools/build_memory_info.py
@@ -41,6 +41,8 @@ data = 0
 bss = 0
 # stdin is the linker output.
 for line in sys.stdin:
+    # Uncomment to see linker output.
+    # print(line)
     line = line.strip()
     if not line.startswith("text"):
         text, data, bss = map(int, line.split()[:3])
@@ -50,7 +52,7 @@ regions = {}
 with open(sys.argv[1], "r") as f:
     for line in f:
         line = line.strip()
-        if line.startswith(("FLASH", "RAM")):
+        if line.startswith(("FLASH_FIRMWARE", "FLASH", "RAM")):
             regions[line.split()[0]] = line.split("=")[-1]
 
 for region in regions:
@@ -59,12 +61,19 @@ for region in regions:
         space = space.split("/*")[0]
     space = K_PATTERN.sub(K_REPLACE, space)
     space = M_PATTERN.sub(M_REPLACE, space)
-    regions[region] = eval(space)
+    regions[region] = int(eval(space))
 
-free_flash = regions["FLASH"] - text - data
-free_ram = regions["RAM"] - data - bss
-print(free_flash, "bytes free in flash out of", regions["FLASH"], "bytes (", regions["FLASH"] / 1024, "kb ).")
-print(free_ram, "bytes free in ram for stack out of", regions["RAM"], "bytes (", regions["RAM"] / 1024, "kb ).")
+# TODO Remove check for both FLASH_FIRMWARE and FLASH after all ports are converted to use FLASH_FIRMWARE.
+try:
+    firmware_region = regions["FLASH_FIRMWARE"]
+except KeyError:
+    firmware_region = regions["FLASH"]
+ram_region = regions["RAM"]
+
+free_flash = firmware_region - text - data
+free_ram = ram_region - data - bss
+print("{} bytes free in flash firmware space out of {} bytes ({}kB).".format(free_flash, firmware_region, firmware_region / 1024))
+print("{} bytes free in ram for heap out of {} bytes ({}kB).".format(free_ram, ram_region, ram_region / 1024))
 print()
 
 # Check that we have free flash space. GCC doesn't fail when the text + data
diff --git a/tools/gen_ld_files.py b/tools/gen_ld_files.py
new file mode 100755
index 000000000..c2ac812bc
--- /dev/null
+++ b/tools/gen_ld_files.py
@@ -0,0 +1,60 @@
+#! /usr/bin/env python3
+import argparse
+
+import os
+import os.path
+import sys
+import re
+from string import Template
+
+parser = argparse.ArgumentParser(description='Apply #define values to .template.ld file.')
+parser.add_argument('template_files', metavar='TEMPLATE_FILE', type=argparse.FileType('r'),
+                    nargs='+', help="template filename: <something>.template.ld")
+parser.add_argument('--defines', type=argparse.FileType('r'), required=True)
+parser.add_argument('--out_dir', required=True)
+
+args = parser.parse_args()
+
+defines = {}
+
+#
+REMOVE_UL_RE = re.compile('([0-9]+)UL')
+def remove_UL(s):
+    return REMOVE_UL_RE.sub(r'\1', s)
+
+# We skip all lines before
+# // START_LD_DEFINES
+# Then we look for lines like this:
+# /*NAME_OF_VALUE=*/ NAME_OF_VALUE;
+VALUE_LINE_RE = re.compile(r'^/\*\s*(\w+)\s*=\*/\s*(.*);\s*$')
+
+start_processing = False
+for line in args.defines:
+    line = line.strip()
+    if line == '// START_LD_DEFINES':
+        start_processing = True
+        continue
+    if start_processing:
+        match = VALUE_LINE_RE.match(line)
+        if match:
+            name = match.group(1)
+            value = match.group(2).strip()
+            defines[name] = remove_UL(value)
+
+fail = False
+
+for template_file in args.template_files:
+    ld_template_basename = os.path.basename(template_file.name)
+    ld_pathname = os.path.join(args.out_dir, ld_template_basename.replace('.template.ld', '.ld'))
+    with open(ld_pathname, 'w') as output:
+        for k,v in defines.items():
+            print('/*', k, '=', v, '*/', file=output)
+        print(file=output)
+        try:
+            output.write(Template(template_file.read()).substitute(defines))
+        except KeyError as e:
+            print("ERROR: {}: No #define for '{}'".format(ld_pathname, e.args[0]), file=sys.stderr)
+            fail = True
+
+if fail:
+    sys.exit(1)