uxn org stuff

Author: MESYETI

source/app.d

@@ -78,7 +78,6 @@ int main(string[] args) {
 
 	string          file;
 	string          outFile = "out";
-	ulong           org = 0xFFFF;
 	bool            orgSet;
 	string[]        includeDirs;
 	bool            optimise;
@@ -137,7 +136,7 @@ int main(string[] args) {
 					}
 
 					try {
-						org = args[i].to!ulong(16);
+						backend.org = args[i].to!ulong(16);
 					}
 					catch (ConvException) {
 						stderr.writeln("--org parameter must be hexadecimal");
@@ -377,7 +376,6 @@ int main(string[] args) {
 
 	auto compiler                   = new Compiler();
 	compiler.backend                = backend;
-	compiler.backend.org            = org;
 	compiler.backend.orgSet         = orgSet;
 	compiler.backend.useDebug       = doDebug;
 	compiler.backend.exportSymbols  = exportSymbols;

source/backends/uxn.d

@@ -33,6 +33,7 @@ class BackendUXN : CompilerBackend {
 	string           assembler = "uxnasm";
 
 	this() {
+		org    = 0x100;
 		output = new Output();
 
 		addrSize = 2;
@@ -163,7 +164,7 @@ class BackendUXN : CompilerBackend {
 
 	override void Init() {
 		output ~= "|0 @vsp $2 @arraySrc $2 @arrayDest $2 @temp $2\n";
-		output ~= "|100\n";
+		output ~= format("|%x\n", org);
 		output ~= "@on-reset\n";
 		output ~= "    #ffff .vsp STZ2\n";
 		output ~= "    init\n";

source/codeRemover.d

@@ -25,7 +25,7 @@ class CodeRemover {
 			"uxn_program_init",
 			"uxn_program_end",
 			"__uxn_program_init",
-			"__uxn_program_end",
+			"__uxn_program_exit",
 			"__x86_64_exception",
 			"__rm86_exception",
 			"__uxn_exception",