Updated expansion port example

projects/examples/devices/system.expansion.tal

@@ -1,26 +1,56 @@
-( usage: uxncli system.expansion.rom )
-
-|00 @System &catch $2 &expansion $2 &pad $2 &metadata $2 &r $2 &g $2 &b $2 &debug $1 &halt $1
-|10 @Console &vector $2 &read $1 &pad $4 &type $1 &write $1 &error $1
-
-|0100
+|00 @System &vector $2 &expansion $2 &wst $1 &rst $1 &metadata $2 &r $2 &g $2 &b $2 &debug $1 &state $1
+|100
 
 @on-reset ( -> )
-	;cmd .System/expansion DEO2
-	;dst <print-str>
+	;buf <pstr>
+	#2018 DEO
+	;buf <pstr>
+	#0a18 DEO
+	( | copy left )
+	;buf #0006 ADD2 ;mmu-cpyl/a STA2
+	;buf #0003 ADD2 ;mmu-cpyl/b STA2
+	;mmu-cpyl .System/expansion DEO2
+	;buf <pstr>
+	#2018 DEO
+	;res1 <pstr>
+	#0a18 DEO
+	( | copy right )
+	;buf #0003 ADD2 ;mmu-cpyr/a STA2
+	;buf #0009 ADD2 ;mmu-cpyr/b STA2
+	;mmu-cpyr .System/expansion DEO2
+	;buf <pstr>
+	#2018 DEO
+	;res2 <pstr>
+	#0a18 DEO
+	( | copy left )
+	;buf #0009 ADD2 ;mmu-cpyl/a STA2
+	;buf #0006 ADD2 ;mmu-cpyl/b STA2
+	;mmu-cpyl .System/expansion DEO2
+	;buf <pstr>
+	#2018 DEO
+	;res3 <pstr>
+	#0a18 DEO
+	( | memset )
+	;buf #0003 ADD2 ;mmu-fill/a STA2
+	;mmu-fill .System/expansion DEO2
+	;buf <pstr>
+	#2018 DEO
+	;res4 <pstr>
+	#0a18 DEO
 	BRK
 
-@cmd
-	[ 01 000c 0000 =src 0000 =dst ]
-
-@src
-	"Hello 20 "World $1
-
-@dst $c
-
-@<print-str> ( str* -- )
-	&w ( -- )
-		LDAk #18 DEO
-		INC2 LDAk ?&w
+@<pstr> ( str* -- )
+	LDAk #18 DEO
+	INC2 LDAk ?<pstr>
 	POP2 JMP2r
 
+@buf  [ "......[hello]..... $1 ]
+@res1 [ "...[hello]o]...... $1 ]
+@res2 [ "...[hello[hello].. $1 ]
+@res3 [ "...[he[hello]lo].. $1 ]
+@res4 [ "...-------------.. $1 ]
+
+@mmu-fill [ 00 000d 0000 &a $2 2d ]
+@mmu-cpyl [ 01 0007 0000 &a $2 0000 &b $2 ]
+@mmu-cpyr [ 02 0007 0000 &a $2 0000 &b $2 ]
+

src/devices/system.c

@@ -109,15 +109,29 @@ system_deo(Uxn *u, Uint8 *d, Uint8 port)
 	case 0x3:
 		ram = u->ram;
 		addr = PEEK2(d + 2);
-		if(ram[addr] == 0x1) {
-			Uint8 *cmd_addr = ram + addr + 1;
-			Uint16 i, length = PEEK2(cmd_addr);
-			Uint16 a_page = PEEK2(cmd_addr + 2), a_addr = PEEK2(cmd_addr + 4);
-			Uint16 b_page = PEEK2(cmd_addr + 6), b_addr = PEEK2(cmd_addr + 8);
-			int src = (a_page % RAM_PAGES) << 0x10, dst = (b_page % RAM_PAGES) << 0x10;
+		if(ram[addr] == 0x0) {
+			Uint8 value = ram[addr + 7];
+			Uint16 i, length = PEEK2(ram + addr + 1);
+			Uint16 dst_page = PEEK2(ram + addr + 3), dst_addr = PEEK2(ram + addr + 5);
+			int dst = (dst_page % RAM_PAGES) * 0x10000;
+			for(i = 0; i < length; i++)
+				ram[dst + (Uint16)(dst_addr + i)] = value;
+		} else if(ram[addr] == 0x1) {
+			Uint16 i, length = PEEK2(ram + addr + 1);
+			Uint16 a_page = PEEK2(ram + addr + 3), a_addr = PEEK2(ram + addr + 5);
+			Uint16 b_page = PEEK2(ram + addr + 7), b_addr = PEEK2(ram + addr + 9);
+			int src = (a_page % RAM_PAGES) * 0x10000, dst = (b_page % RAM_PAGES) * 0x10000;
 			for(i = 0; i < length; i++)
 				ram[dst + (Uint16)(b_addr + i)] = ram[src + (Uint16)(a_addr + i)];
-		}
+		} else if(ram[addr] == 0x2) {
+			Uint16 i, length = PEEK2(ram + addr + 1);
+			Uint16 a_page = PEEK2(ram + addr + 3), a_addr = PEEK2(ram + addr + 5);
+			Uint16 b_page = PEEK2(ram + addr + 7), b_addr = PEEK2(ram + addr + 9);
+			int src = (a_page % RAM_PAGES) * 0x10000, dst = (b_page % RAM_PAGES) * 0x10000;
+			for(i = length - 1; i != 0xffff; i--)
+				ram[dst + (Uint16)(b_addr + i)] = ram[src + (Uint16)(a_addr + i)];
+		} else
+			fprintf(stderr, "Unknown Expansion Command 0x%02x\n", ram[addr]);
 		break;
 	case 0x4:
 		u->wst.ptr = d[4];

src/uxncli.c

@@ -51,7 +51,7 @@ main(int argc, char **argv)
 	if(i == argc)
 		return system_error("usage:", "uxncli [-v] file.rom [args..]");
 	if(argv[i][0] == '-' && argv[i][1] == 'v')
-		return system_error("Uxncli - Varvara Emulator(CLI)", "4 Mar 2024.");
+		return system_error("Uxncli - Varvara Emulator(CLI)", "18 Mar 2024.");
 	if(!system_init(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), argv[i++]))
 		return system_error("Init", "Failed to initialize uxn.");
 	/* eval */

src/uxnemu.c

@@ -501,7 +501,7 @@ main(int argc, char **argv)
 	/* flags */
 	if(argc > 1 && argv[i][0] == '-') {
 		if(!strcmp(argv[i], "-v"))
-			return system_error("Uxnemu - Varvara Emulator(GUI)", "4 Mar 2024.");
+			return system_error("Uxnemu - Varvara Emulator(GUI)", "18 Mar 2024.");
 		else if(!strcmp(argv[i], "-2x"))
 			set_zoom(2, 0);
 		else if(!strcmp(argv[i], "-3x"))