commit 6ee8ce5

Devine Lu Linvega  ·  2025-05-17 19:33:41 +0000 UTC
parent 3bd6bb7
Removed redundant arithmetic
2 files changed,  +5, -5
+2, -2
 1@@ -154,7 +154,7 @@ system_load(char *rom_path)
 2 	if(f) {
 3 		int i = 0, l = fread(ram + 0x100, 0x10000 - 0x100, 1, f);
 4 		while(l && ++i < RAM_PAGES)
 5-			l = fread(ram + 0x100 + 0x10000 * i - 0x100, 0x10000, 1, f);
 6+			l = fread(ram + i * 0x10000, 0x10000, 1, f);
 7 		fclose(f);
 8 	}
 9 	return !!f;
10@@ -1219,7 +1219,7 @@ main(int argc, char **argv)
11 {
12 	int i = 1;
13 	if(argc == 2 && argv[1][0] == '-' && argv[1][1] == 'v')
14-		return !fprintf(stdout, "Uxn11 - Varvara Emulator, 13 May 2025.\n");
15+		return !fprintf(stdout, "Uxn11 - Varvara Emulator, 17 May 2025.\n");
16 	else if(argc == 1)
17 		return !fprintf(stdout, "usage: %s [-v] file.rom [args..]\n", argv[0]);
18 	else if(!display_init())
+3, -3
 1@@ -143,7 +143,7 @@ system_load(char *rom_path)
 2 	if(f) {
 3 		int i = 0, l = fread(ram + 0x100, 0x10000 - 0x100, 1, f);
 4 		while(l && ++i < RAM_PAGES)
 5-			l = fread(ram + 0x100 + 0x10000 * i - 0x100, 0x10000, 1, f);
 6+			l = fread(ram + i * 0x10000, 0x10000, 1, f);
 7 		fclose(f);
 8 	}
 9 	return !!f;
10@@ -152,7 +152,7 @@ system_load(char *rom_path)
11 static int
12 system_boot(char *rom_path, int has_args)
13 {
14-	ram = (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8));
15+	ram = (Uint8 *)calloc(RAM_PAGES * 0x10000, sizeof(Uint8));
16 	system_boot_path = rom_path;
17 	dev[0x17] = has_args;
18 	return system_load(rom_path);
19@@ -693,7 +693,7 @@ main(int argc, char **argv)
20 {
21 	int i = 1;
22 	if(argc == 2 && argv[1][0] == '-' && argv[1][1] == 'v')
23-		return !fprintf(stdout, "Uxn11 - Varvara Emulator(cli), 16 May 2025.\n");
24+		return !fprintf(stdout, "Uxn11 - Varvara Emulator(cli), 17 May 2025.\n");
25 	else if(argc == 1)
26 		return !fprintf(stdout, "usage: %s [-v] file.rom [args..]\n", argv[0]);
27 	else if(!system_boot(argv[i++], argc > 2))