Add option --append-headless-binary

This option is like --append-binary but with headless ones.
A headless binary does not have a head in the tape file (hence
loads faster).

Author: boriel

asmparse.py

@@ -26,6 +26,7 @@
 from api import global_ as gl
 import api.utils
 import zxbpp
+import outfmt
 
 LEXER = asmlex.Lexer()
 
@@ -1438,7 +1439,7 @@ def assemble(input_):
     return gl.has_errors
 
 
-def generate_binary(outputfname, format_, progname='', binary_files=None):
+def generate_binary(outputfname, format_, progname='', binary_files=None, headless_binary_files=None):
     """ Outputs the memory binary to the
     output filename using one of the given
     formats: tap, tzx or bin
@@ -1452,11 +1453,19 @@ def generate_binary(outputfname, format_, progname='', binary_files=None):
     if binary_files is None:
         binary_files = []
 
+    if headless_binary_files is None:
+        headless_binary_files = []
+
     bin_blocks = []
     for fname in binary_files:
         with api.utils.open_file(fname) as f:
             bin_blocks.append((os.path.basename(fname), f.read()))
 
+    headless_bin_blocks = []
+    for fname in headless_binary_files:
+        with api.utils.open_file(fname) as f:
+            headless_bin_blocks.append(f.read())
+
     if AUTORUN_ADDR is None:
         AUTORUN_ADDR = org
 
@@ -1476,29 +1485,17 @@ def generate_binary(outputfname, format_, progname='', binary_files=None):
         else:
             program.add_line([['REM'], ['RANDOMIZE', program.token('USR'), AUTORUN_ADDR]])
 
-    if format_ == 'tzx':
-        import outfmt
-        t = outfmt.TZX()
-
-        if OPTIONS.use_loader.value:
-            t.save_program('loader', program.bytes, line=1)  # Put line 0 to protect against MERGE
-
-        t.save_code(progname, org, binary)
-        for name, block in bin_blocks:
-            t.save_code(name, 0, block)
-
-        t.dump(outputfname)
-
-    elif format_ == 'tap':
-        import outfmt
-        t = outfmt.TAP()
+    if format_ in ('tap', 'tzx'):
+        t = {'tap': outfmt.TAP, 'tzx': outfmt.TZX}[format_]()
 
         if OPTIONS.use_loader.value:
             t.save_program('loader', program.bytes, line=1)  # Put line 0 to protect against MERGE
 
         t.save_code(progname, org, binary)
         for name, block in bin_blocks:
             t.save_code(name, 0, block)
+        for block in headless_bin_blocks:
+            t.standard_block(block)
 
         t.dump(outputfname)
 

zxb.py

@@ -147,7 +147,9 @@ def main(args=None):
     parser.add_argument('--parse-only', action='store_true',
                         help='Only parses to check for syntax and semantic errors')
     parser.add_argument('--append-binary', default=[], action='append',
-                        help='Appends binary to tap file (only works with -t ot -T)')
+                        help='Appends binary to tape file (only works with -t or -T)')
+    parser.add_argument('--append-headless-binary', default=[], action='append',
+                        help='Appends binary to tape file (only works with -t or -T)')
 
     options = parser.parse_args(args=args)
 
@@ -337,7 +339,8 @@ def main(args=None):
         asmparse.assemble(fout.getvalue())
         fout.close()
         asmparse.generate_binary(OPTIONS.outputFileName.value, OPTIONS.output_file_type.value,
-                                 binary_files=options.append_binary)
+                                 binary_files=options.append_binary,
+                                 headless_binary_files=options.append_headless_binary)
         if gl.has_errors:
             return 5  # Error in assembly