SYS buffer modified

Author: EgonOlsen

MOSPEED native compiler.txt

@@ -114,7 +114,7 @@ Make sure that the memory is readable, i.e. that it isn't shadowed by the ROM. D
 If nothing is given, it will follow the actual program's memory. This is also the default.
 
 - /sysbuffer=xxxxx|$yyyy: Sets the start address of the buffer used to execute SYS commands with parameters. 
-Default is 820 for the CBM machines and 1024 for the X16.
+Default is 820 for the CBM machines and 1024 for the X16. If set to 0, the runtime will reserve its own buffer in BASIC memory.
 
 - /alloff=true|false: If true, all optimizations which are enabled by default will be turned off. Default is false.
 

dist/basicv2.jar

@@ -77,13 +77,21 @@ protected void addLabels(List<String> res, String[] labels) {
 	}
 
 	protected void addBasicBuffer(List<String> res, PlatformProvider platform, MemoryConfig memConfig) {
-		if (memConfig.getBasicBufferStart()==-1) {
-			res.add("BASICBUFFER="+platform.getBasicBufferAddress());
+		if (memConfig.getBasicBufferStart() == -1) {
+			res.add("BASICBUFFER=" + platform.getBasicBufferAddress());
 		} else {
-			res.add("BASICBUFFER="+memConfig.getBasicBufferStart());
+			if (memConfig.getBasicBufferStart() != 0) {
+				res.add("BASICBUFFER=" + memConfig.getBasicBufferStart());
+			}
 		}
 	}
 
+	protected void addInternalBasicBuffer(List<String> res, PlatformProvider platform, MemoryConfig memConfig) {
+		if (memConfig.getBasicBufferStart() == 0) {
+			res.add("BASICBUFFER   .ARRAY 256");
+		}
+	}
+
 	protected void addMemoryLocations(List<String> res) {
 		String[] labels = Loader.loadProgram(TransformerX16.class.getResourceAsStream("/rommap/memloc-c64.map"));
 		addLabels(res, labels);
@@ -334,12 +342,12 @@ protected int extractData(CompilerConfig config, PlatformProvider platform, Mach
 		return cnt;
 	}
 
-	protected void addStructures(CompilerConfig config, Machine machine, PlatformProvider platform, List<String> code,
+	protected void addStructures(CompilerConfig config, MemoryConfig memConfig, Machine machine, PlatformProvider platform, List<String> code,
 			List<String> res, List<String> consts, List<String> vars, List<String> mnems, List<String> subs) {
-		addStructures(config, machine, platform, code, res, consts, vars, mnems, subs, null, null);
+		addStructures(config, memConfig, machine, platform, code, res, consts, vars, mnems, subs, null, null);
 	}
 
-	protected void addStructures(CompilerConfig config, Machine machine, PlatformProvider platform, List<String> code,
+	protected void addStructures(CompilerConfig config, MemoryConfig memConfig, Machine machine, PlatformProvider platform, List<String> code,
 			List<String> res, List<String> consts, List<String> vars, List<String> mnems, List<String> subs,
 			List<String> addOns, StringAdder adder) {
 		Map<String, String> name2label = new HashMap<String, String>();
@@ -462,13 +470,15 @@ protected void addStructures(CompilerConfig config, Machine machine, PlatformPro
 		res.add("LASTVARP\t.WORD 0");
 		res.add("HIGHP\t.WORD STRBUF");
 		res.add("STRBUFP\t.WORD STRBUF");
-		res.add("ENDSTRBUF\t.WORD " + this.stringMemoryEnd);
+		res.add("ENDSTRBUF\t.WORD " + this.stringMemoryEnd); 
 		res.add("INPUTQUEUEP\t.BYTE 0");
 		res.add("PROGRAMEND");
+		addInternalBasicBuffer(res, platform, memConfig);
 		res.add("INPUTQUEUE\t.ARRAY $0F");
 		res.add("FPSTACK .ARRAY " + Math.min(256, platform.getStackSize() * 5));
 		res.add("FORSTACK .ARRAY " + Math.min(1024, platform.getForStackSize() * 17));
 		res.add("STRBUF\t.BYTE 0");
+		
 	}
 
 	@Override

src/main/java/com/sixtyfour/cbmnative/mos6502/AbstractTransformer.java

@@ -135,7 +135,7 @@ public List<String> transform(CompilerConfig config, MemoryConfig memConfig, Mac
 		res.add("TSX");
 		res.add("STX SP_SAVE");
 
-		addStructures(config, machine, platform, code, res, consts, vars, mnems, subs);
+		addStructures(config, memConfig, machine, platform, code, res, consts, vars, mnems, subs);
 		return res;
 	}
 

src/main/java/com/sixtyfour/cbmnative/mos6502/c64/Transformer64.java

@@ -139,7 +139,7 @@ public List<String> transform(CompilerConfig config, MemoryConfig memConfig, Mac
 		res.add("TSX");
 		res.add("STX SP_SAVE");
 
-		addStructures(config, machine, platform, code, res, consts, vars, mnems, subs);
+		addStructures(config, memConfig, machine, platform, code, res, consts, vars, mnems, subs);
 		return res;
 	}
 }

src/main/java/com/sixtyfour/cbmnative/mos6502/vic20/Transformer20.java

@@ -84,7 +84,7 @@ public List<String> transform(CompilerConfig config, MemoryConfig memConfig, Mac
 		res.add("TSX");
 		res.add("STX SP_SAVE");
 
-		addStructures(config, machine, platform, code, res, consts, vars, mnems, subs, mapping.getFarCalls(),
+		addStructures(config, memConfig, machine, platform, code, res, consts, vars, mnems, subs, mapping.getFarCalls(),
 				new StringAdder() {
 					@Override
 					public void addStringVars(List<String> strVars) {

src/main/java/com/sixtyfour/cbmnative/mos6502/x16/TransformerX16.java

@@ -537,7 +537,7 @@ private static void printOutHelp() {
 		System.out.println(
 				"/runtimestart=xxxxx|$yyyy - the start address of the runtime's code. If none is given, it follows the program's code.");
 		System.out.println(
-				"/sysbuffer=xxxxx|$yyyy - the start address of the buffer used to execute SYS commands with parameters. Default is 820 for the CBM machines and 1024 for the X16.");
+				"/sysbuffer=xxxxx|$yyyy - the start address of the buffer used to execute SYS commands with parameters. Default is 820 for the CBM machines and 1024 for the X16. If set to 0, the runtime will reserve its own buffer in BASIC memory.");
 		System.out.println("/alloff=true|false - if specified, all optimizations will be turned off");
 		System.out.println(
 				"/vice=<path> - sets a path to the VICE executable. If specified, the compiled prg file will be started in VICE right away.");