Add final_address argument to make_sav

Author: purplesyringa

docs.md

@@ -224,17 +224,17 @@ Output resulting file to `filename`, or to compilable-file-without-mac-extension
 
 Output resulting file with binary header to `filename`, or to compilable-file-without-mac-extension + `.bin` if filename is not passed.
 
-### `make_sav [/filename/]`
+### `make_sav [/filename/ [, final_address]]`
 
 Output resulting file with `.sav` header to `filename`, or to compilable-file-without-mac-extension + `.sav` if filename is not passed.
 
-### `make_turbo_wav [/filename/ [/title/]]`
+### `make_turbo_wav [/filename/ [, /title/]]`
 
 Output resulting file in turbo wav format (see [this zx-pk.ru topic](https://zx-pk.ru/threads/30390-zagruzka-s-iphone-na-bk-0010-v-8-raz-bystree.html)) to `filename`, or to compilable-file-without-mac-extension + `.wav` if filename is not passed. If `title` is passed as well, it's the name of the file read by BK.
 
 **If the filename equals `~speaker`, the file is played via speakers. Notice that this might not work correctly on Linux: you might get a segfault. `python3.6` from Ubuntu Bionic works for sure.**
 
-### `make_wav [/filename/ [/title/]]`
+### `make_wav [/filename/ [, /title/]]`
 
 Output resulting file in classic wav format (see [this zx-pk.ru topic](https://zx-pk.ru/threads/30298-zagruzka-s-magnitofona-na-bk-0011%28m%29.html)) to `filename`, or to compilable-file-without-mac-extension + `.wav` if filename is not passed. If `title` is passed as well, it's the name of the file read by BK.
 

pdpy11/__main__.py

@@ -87,13 +87,15 @@
 	print("""                                resulting filename.                             """)
 	print("""make_bk0010_rom ["..."] /       Same as --bin. If string is passed, this is the """)
 	print("""make_bin ["..."]                resulting filename.                             """)
-	print("""make_sav ["..."]                Same as --sav. If string is passed, this is the """)
-	print("""                                resulting filename.                             """)
-	print("""make_turbo_wav ["..." ["..."]]  Same as --turbo-wav. If a string is passed, this""")
+	print("""make_sav ["..."[, ...]]         Same as --sav. If string is passed, this is the """)
+	print("""                                resulting filename. If an additional argument   """)
+	print("""                                is passed, it is the final address used by the  """)
+	print("""                                program.                                        """)
+	print("""make_turbo_wav ["..."[, "..."]] Same as --turbo-wav. If a string is passed, this""")
 	print("""                                is the resulting filename. If two strings are   """)
 	print("""                                passed, the first one is the real filename and  """)
 	print("""                                the second one is BK filename.                  """)
-	print("""make_wav ["..." ["..."]]        Same as --wav. If a string is passed, this is   """)
+	print("""make_wav ["..."[, "..."]]       Same as --wav. If a string is passed, this is   """)
 	print("""                                the resulting filename. If two strings are      """)
 	print("""                                passed, the first one is the real filename and  """)
 	print("""                                the second one is BK filename.                  """)
@@ -307,9 +309,9 @@
 if project is not None:
 	# Project mode
 	lstname = project
-	for ext, file, output, link_address in compiler.buildProject():
+	for ext, file, args, output, link_address in compiler.buildProject():
 		with open_device(file, "wb") as f:
-			f.write(encodeBinRawSavWav(ext, output, link_address))
+			f.write(encodeBinRawSavWav(ext, args, output, link_address))
 else:
 	# Single file mode
 	lstname = files[0]
@@ -321,14 +323,14 @@
 
 	out_files = compiler.link()
 
-	for ext, file in out_files:
+	for ext, file, args in out_files:
 		with open_device(file, "wb") as f:
-			f.write(encodeBinRawSavWav(ext, compiler.output, compiler.link_address))
+			f.write(encodeBinRawSavWav(ext, args, compiler.output, compiler.link_address))
 
 	if len(out_files) == 0:
 		# No output file
 		with open_device(output, "wb") as f:
-			f.write(encodeBinRawSavWav(output_format or "bin", compiler.output, compiler.link_address))
+			f.write(encodeBinRawSavWav(output_format or "bin", (), compiler.output, compiler.link_address))
 
 if do_lst:
 	with open(lstname + ".lst", "w") as f:

pdpy11/compiler/compiler.py

@@ -122,14 +122,14 @@ def buildProject(self):
 			self.addFile(file)
 
 			# Save all writes
-			for ext, name in self.build:
+			for ext, name, args in self.build:
 				try:
 					link_address = Deferred(self.link_address, int)(self)
 					print("    Output: {name} ({ext} format) from {link}".format(name=name, ext=ext, link=util.octal(link_address)))
 				except:
 					print("    Output: {name} ({ext} format) from {link}".format(name=name, ext=ext, link=repr(self.link_address)))
 
-				self.all_build.append((ext, name, self.writes, self.link_address))
+				self.all_build.append((ext, name, args, self.writes, self.link_address))
 
 		print("Linking")
 		return self.link()
@@ -170,7 +170,7 @@ def link(self):
 
 		if self.project is not None:
 			all_build = []
-			for ext, file, writes, link_address in self.all_build:
+			for ext, file, args, writes, link_address in self.all_build:
 				array = []
 				for addr, value in writes:
 					value = Deferred(value, any)(self)
@@ -185,7 +185,7 @@ def link(self):
 						array[addr + i] = value1
 
 				link_address = Deferred(link_address, int)(self)
-				all_build.append((ext, file, array[link_address:], link_address))
+				all_build.append((ext, file, tuple(Deferred(arg)(self) for arg in args), array[link_address:], link_address))
 
 			return all_build
 		else:
@@ -204,7 +204,7 @@ def link(self):
 
 			self.link_address = Deferred(self.link_address, int)(self)
 			self.output = array[self.link_address:]
-			return self.build
+			return [(ext, name, tuple(Deferred(arg)(self) for arg in args)) for ext, name, args in self.build]
 
 	def compileFile(self, file, code):
 		parser = Parser(file, code, syntax=self.syntax)
@@ -307,7 +307,7 @@ def stringToCharlist(string):
 						arg = arg[:-4]
 				else:
 					arg = os.path.join(os.path.dirname(parser.file), arg)
-				self.build.append(("raw", arg))
+				self.build.append(("raw", arg, ()))
 		elif command == ".MAKE_BIN":
 			if parser.file == self.include_root:
 				if arg is None:
@@ -317,17 +317,18 @@ def stringToCharlist(string):
 					arg += ".bin"
 				else:
 					arg = os.path.join(os.path.dirname(parser.file), arg)
-				self.build.append(("bin", arg))
+				self.build.append(("bin", arg, ()))
 		elif command == ".MAKE_SAV":
 			if parser.file == self.include_root:
-				if arg is None:
-					arg = parser.file
-					if arg.lower().endswith(".mac"):
-						arg = arg[:-4]
-					arg += ".sav"
+				filename, final_address = arg
+				if filename is None:
+					filename = parser.file
+					if filename.lower().endswith(".mac"):
+						filename = filename[:-4]
+					filename += ".sav"
 				else:
-					arg = os.path.join(os.path.dirname(parser.file), arg)
-				self.build.append(("sav", arg))
+					filename = os.path.join(os.path.dirname(parser.file), filename)
+				self.build.append(("sav", filename, (final_address,) if final_address is not None else ()))
 		elif command == ".MAKE_TURBO_WAV" or command == ".MAKE_WAV":
 			if parser.file == self.include_root:
 				real_filename, bk_filename = arg
@@ -342,8 +343,8 @@ def stringToCharlist(string):
 					bk_filename = os.path.basename(real_filename)
 					if bk_filename.endswith(".wav"):
 						bk_filename = bk_filename[:-4]
-				pref = "turbo-wav:" if command == ".MAKE_TURBO_WAV" else "wav:"
-				self.build.append((pref + bk_filename, real_filename))
+				format = "turbo-wav" if command == ".MAKE_TURBO_WAV" else "wav"
+				self.build.append((format, real_filename, (bk_filename,)))
 		elif command == ".CONVERT1251TOKOI8R":
 			pass
 		elif command == ".DECIMALNUMBERS":

pdpy11/compiler/parser.py

@@ -329,7 +329,12 @@ def handleMakeBin(self):
 
 	def handleMakeSav(self):
 		with Transaction(self, maybe=False, stage=".MAKE_SAV"):
-			return ".MAKE_SAV", self.needString(maybe=True)
+			filename = self.needString(maybe=True)
+			if filename is not None and self.needPunct(",", maybe=True):
+				final_address = self.needExpression()
+			else:
+				final_address = None
+			return ".MAKE_SAV", (filename, final_address)
 
 	def handleMakeTurboWav(self):
 		with Transaction(self, maybe=False, stage=".MAKE_TURBO_WAV"):

pdpy11/compiler/util.py

@@ -5,7 +5,7 @@
 from .turbowav import encodeTurboWav
 from .wav import encodeWav
 
-def encodeBinRawSavWav(output_format, raw, link_address):
+def encodeBinRawSavWav(output_format, args, raw, link_address):
 	if output_format == "bin":
 		raw = [
 			link_address & 0xFF,
@@ -14,8 +14,9 @@ def encodeBinRawSavWav(output_format, raw, link_address):
 			len(raw) >> 8
 		] + raw
 	elif output_format == "sav":
+		final_address = args[0] if len(args) >= 1 else link_address + len(raw)
 		block_start = link_address // 512
-		block_end = (link_address + len(raw) + 511) // 512
+		block_end = (final_address + 511) // 512
 		raw = [0] * 32 + [
 			link_address & 0xFF,
 			link_address >> 8,
@@ -25,8 +26,8 @@ def encodeBinRawSavWav(output_format, raw, link_address):
 			0,
 			0,
 			0,
-			(link_address + len(raw)) & 0xFF,
-			(link_address + len(raw)) >> 8
+			final_address & 0xFF,
+			final_address >> 8
 		] + [0] * 198 + [
 			sum(((block_start <= ((7 - j) + i * 8) < block_end) << j for j in range(8)))
 			for i in range(16)