Add option to append binary files

Using the `--append-binary=fname.ext` append binary file
at the end of the .TAP or .TZX file. This option can be repeated
several times.

Author: boriel

asmparse.py

@@ -1438,7 +1438,7 @@ def assemble(input_):
     return gl.has_errors
 
 
-def generate_binary(outputfname, format_, progname=''):
+def generate_binary(outputfname, format_, progname='', binary_files=None):
     """ Outputs the memory binary to the
     output filename using one of the given
     formats: tap, tzx or bin
@@ -1449,6 +1449,14 @@ def generate_binary(outputfname, format_, progname=''):
     if gl.has_errors:
         return
 
+    if binary_files is None:
+        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()))
+
     if AUTORUN_ADDR is None:
         AUTORUN_ADDR = org
 
@@ -1476,6 +1484,9 @@ def generate_binary(outputfname, format_, progname=''):
             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':
@@ -1486,6 +1497,9 @@ def generate_binary(outputfname, format_, progname=''):
             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)
 
     else:

zxb.py

@@ -145,7 +145,9 @@ def main(args=None):
                         help='Header-less mode: omit asm prologue and epilogue')
     parser.add_argument('--version', action='version', version='%(prog)s {0}'.format(VERSION))
     parser.add_argument('--parse-only', action='store_true',
-                        help="Only parses to check for syntax and semantic errors")
+                        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)')
 
     options = parser.parse_args(args=args)
 
@@ -201,6 +203,10 @@ def main(args=None):
         parser.error('Option --BASIC and --autorun requires --tzx or tap format')
         return 4
 
+    if options.append_binary and not options.tzx and not options.tap:
+        parser.error('Option --append-binary needs either --tap or --tzx')
+        return 5
+
     OPTIONS.use_loader.value = options.basic
     OPTIONS.autorun.value = options.autorun
 
@@ -330,7 +336,8 @@ def main(args=None):
         output(asm_output, fout)
         asmparse.assemble(fout.getvalue())
         fout.close()
-        asmparse.generate_binary(OPTIONS.outputFileName.value, OPTIONS.output_file_type.value)
+        asmparse.generate_binary(OPTIONS.outputFileName.value, OPTIONS.output_file_type.value,
+                                 binary_files=options.append_binary)
         if gl.has_errors:
             return 5  # Error in assembly