commit 6b207ed

Devine Lu Linvega  ·  2024-02-28 16:53:34 +0000 UTC
parent c7d3a41
Improved stack printing
4 files changed,  +12, -16
+4, -4
 1@@ -12,11 +12,11 @@ all: dest bin/uxnasm bin/uxncli bin/uxn11
 2 dest:
 3 	@ mkdir -p bin
 4 run: all bin/uxnasm bin/uxncli bin/uxn11
 5-	@ ./bin/uxn11 
 6+	@ bin/uxn11 
 7 test: bin/uxnasm bin/uxncli bin/uxn11
 8-	@ ./bin/uxnasm -v && ./bin/uxncli -v && ./bin/uxn11 -v
 9-	@ ./bin/uxnasm etc/opctest.tal bin/opctest.rom
10-	@ ./bin/uxncli bin/opctest.rom
11+	@ bin/uxnasm -v && ./bin/uxncli -v && ./bin/uxn11 -v
12+	@ bin/uxnasm etc/opctest.tal bin/opctest.rom
13+	@ bin/uxncli bin/opctest.rom
14 install: all bin/uxnasm bin/uxncli bin/uxn11
15 	@ cp bin/uxn11 bin/uxnasm bin/uxncli ~/bin/
16 uninstall:
+6, -10
 1@@ -47,14 +47,10 @@ static void
 2 system_print(Stack *s, char *name)
 3 {
 4 	Uint8 i;
 5-	fprintf(stderr, "%s ", name);
 6-	for(i = 0; i < 9; i++) {
 7-		Uint8 pos = s->ptr - 4 + i;
 8-		fprintf(stderr, !pos ? "[%02x]" : i == 4 ? "<%02x>" :
 9-												   " %02x ",
10-			s->dat[pos]);
11-	}
12-	fprintf(stderr, "\n");
13+	fprintf(stderr, "%s ", name, s->ptr);
14+	for(i = s->ptr - 7; i != s->ptr + 1; i++)
15+		fprintf(stderr, "%02x%c", s->dat[i], i == 0 ? '|' : ' ');
16+	fprintf(stderr, "< \n");
17 }
18 
19 int
20@@ -68,8 +64,8 @@ system_error(char *msg, const char *err)
21 void
22 system_inspect(Uxn *u)
23 {
24-	system_print(&u->wst, "wst");
25-	system_print(&u->rst, "rst");
26+	system_print(&u->wst, "WST");
27+	system_print(&u->rst, "RST");
28 }
29 
30 int
+1, -1
1@@ -267,7 +267,7 @@ main(int argc, char **argv)
2 	int i = 1;
3 	char *rom;
4 	if(i != argc && argv[i][0] == '-' && argv[i][1] == 'v') {
5-		fprintf(stdout, "Uxn11 - Varvara Emulator, 22 Feb 2023.\n");
6+		fprintf(stdout, "Uxn11 - Varvara Emulator, 28 Feb 2023.\n");
7 		i++;
8 	}
9 	rom = i == argc ? "boot.rom" : argv[i++];
+1, -1
1@@ -71,7 +71,7 @@ main(int argc, char **argv)
2 		return system_error("usage", "uxncli [-v] file.rom [args..]");
3 	/* Read flags */
4 	if(argv[i][0] == '-' && argv[i][1] == 'v')
5-		return system_version("Uxncli - Console Varvara Emulator", "15 Feb 2024");
6+		return system_version("Uxncli - Console Varvara Emulator", "28 Feb 2024");
7 	if(!system_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), argv[i++]))
8 		return system_error("Init", "Failed to initialize uxn.");
9 	/* Game Loop */