Changeset 94c05b89 in mainline for tools/mkarray.py

Timestamp:

2017-07-12T15:02:49Z (8 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5772aa1

Parents:

f3504c1

Message:

use the .incbin directive instead of marshalling the data manually
(this is the fastest and also the most resource-conservative method)

File:

• tools/mkarray.py (modified) (7 diffs)

tools/mkarray.py

@@ -77 +77 @@
         src_cnt = 0
         
+        archive = zipfile.ZipFile("%s.zip" % dest, "w", zipfile.ZIP_STORED)
+        
         for src in sys.argv[5:]:
                 basename = os.path.basename(src)
@@ -92 +94 @@
                 if compress:
                         src_data = deflate(src_data)
+                        src_fname = os.path.basename("%s.deflate" % src)
+                        archive.writestr(src_fname, src_data)
+                else:
+                        src_fname = src
                 
                 if sys.version_info < (3,):
@@ -105 +111 @@
                 data_ctx.append(".size %s, %u" % (symbol, length_out))
                 data_ctx.append("%s:" % symbol)
-                data_ctx.append("\t.byte 0x" + ', 0x'.join(chunks(binascii.b2a_hex(src_data), 2)) + "\n")
+                data_ctx.append("\t.incbin \"%s\"\n" % src_fname)
                 
                 desc_field = []
@@ -112 +118 @@
                 desc_field.append("\t\t.addr = (void *) %s," % symbol)
                 desc_field.append("\t\t.size = %u," % length_out)
-                desc_field.append("\t\t.inflated = %u" % length)
+                desc_field.append("\t\t.inflated = %u," % length)
+                
+                if compress:
+                        desc_field.append("\t\t.compressed = true")
+                else:
+                        desc_field.append("\t\t.compressed = false")
+                
                 desc_field.append("\t}")
                 
@@ -120 +132 @@
                 
                 src_cnt += 1
-        
-        archive = zipfile.ZipFile("%s.zip" % dest, "w", zipfile.ZIP_STORED)
         
         data = ''
@@ -131 +141 @@
         data += "#define %sS_H_\n\n" % label.upper()
         data += "#include <stddef.h>\n"
-        data += "#include <stdint.h>\n\n"
+        data += "#include <stdint.h>\n"
+        data += "#include <stdbool.h>\n\n"
         data += "#define %sS  %u\n\n" % (label.upper(), src_cnt)
         data += "typedef struct {\n"
@@ -138 +149 @@
         data += "\tsize_t size;\n"
         data += "\tsize_t inflated;\n"
+        data += "\tbool compressed;\n"
         data += "} %s_t;\n\n" % label
         data += "extern %s_t %ss[];\n\n" % (label, label)