commit 70dd8e7
Devine Lu Linvega
·
2024-11-11 19:14:16 +0000 UTC
parent 3238607
(uxncli) Removed argc variable
4 files changed,
+10,
-11
M
makefile
+3,
-1
1@@ -16,7 +16,9 @@ run: all bin/uxnasm bin/uxncli bin/uxn11
2 debug: bin/uxnasm-debug bin/uxncli-debug bin/uxn11-debug
3 @ bin/uxncli-debug bin/opctest.rom
4 test: all
5- @ bin/uxnasm -v && ./bin/uxncli -v && ./bin/uxn11 -v
6+ @ bin/uxncli && bin/uxncli -v
7+ @ bin/uxn11 -v
8+ @ bin/uxnasm -v
9 @ bin/uxnasm etc/opctest.tal bin/opctest.rom
10 @ bin/uxncli bin/opctest.rom
11 install: all
+4,
-5
1@@ -45,17 +45,17 @@ WITH REGARD TO THIS SOFTWARE.
2 int
3 uxn_eval(Uint16 pc)
4 {
5- int step, a, b, c, x[2], y[2], z[2];
6+ int a, b, c, x[2], y[2], z[2];
7 if(!pc || uxn.dev[0x0f]) return 0;
8- for(step = STEP_LIMIT; step; step--) {
9+ for(;;) {
10 switch(uxn.ram[pc++]) {
11 /* BRK */ case 0x00: return 1;
12 /* JCI */ case 0x20: if(DEC(wst)) { JMI break; } pc += 2; break;
13 /* JMI */ case 0x40: JMI break;
14 /* JSI */ case 0x60: c = pc + 2; INC(rst) = c >> 8; INC(rst) = c; JMI break;
15- /* LI2 */ case 0xa0: INC(wst) = uxn.ram[pc++]; /* fall through */
16+ /* LI2 */ case 0xa0: INC(wst) = uxn.ram[pc++]; /* fall-through */
17 /* LIT */ case 0x80: INC(wst) = uxn.ram[pc++]; break;
18- /* L2r */ case 0xe0: INC(rst) = uxn.ram[pc++]; /* fall through */
19+ /* L2r */ case 0xe0: INC(rst) = uxn.ram[pc++]; /* fall-through */
20 /* LIr */ case 0xc0: INC(rst) = uxn.ram[pc++]; break;
21 /* INC */ OPC(0x01, POx(a), PUx(a + 1))
22 /* POP */ OPC(0x02, REM, {})
23@@ -90,5 +90,4 @@ uxn_eval(Uint16 pc)
24 /* SFT */ OPC(0x1f, PO1(a) POx(b),PUx(b >> (a & 0xf) << (a >> 4)))
25 }
26 }
27- return 0;
28 }
+0,
-1
1@@ -16,7 +16,6 @@ WITH REGARD TO THIS SOFTWARE.
2
3 /* clang-format on */
4
5-#define STEP_LIMIT 0x800000
6 #define PAGE_PROGRAM 0x0100
7
8 typedef unsigned char Uint8;
+3,
-4
1@@ -60,15 +60,14 @@ emu_run(void)
2 int
3 main(int argc, char **argv)
4 {
5- int i = 1;
6 if(argc > 1 && argv[1][0] == '-' && argv[1][1] == 'v')
7 fprintf(stdout, "Uxn11(cli) - Varvara Emulator, 11 Nov 2024.\n");
8- else if(argc == 1 || !system_boot(ram, argv[i++]))
9+ else if(argc == 1 || !system_boot(ram, argv[1]))
10 return !fprintf(stdout, "usage: %s [-v] file.rom [args..]\n", argv[0]);
11 else {
12- uxn.dev[0x17] = argc - i;
13+ uxn.dev[0x17] = argc - 2;
14 if(uxn_eval(PAGE_PROGRAM) && PEEK2(uxn.dev + 0x10))
15- console_listen(i, argc, argv), emu_run();
16+ console_listen(2, argc, argv), emu_run();
17 }
18 return uxn.dev[0x0f] & 0x7f;
19 }