1 files changed, 57 insertions, 47 deletions

diff --git a/src/main.c b/src/main.c
index ba835ff..2f9d023 100644
--- a/src/main.c
+++ b/src/main.c
@@ -80,19 +80,21 @@
 #define PROF_SHOW() \
     do { \
         txt_position((PROF_SHOW_X), (PROF_SHOW_Y));\
-        txt_printf("1BPP:  %lu    2BPP:  %lu", ppu_icn_cycles, ppu_chr_cycles);\
+        txt_printf("1BPP: %.8lu\n2BPP: %.8lu\nFILL: %.8lu", ppu_icn_cycles, ppu_chr_cycles, ppu_fill_cycles);\
     } while (0)
+
 static u32 ppu_pixel_cycles = 0;
+static u32 ppu_fill_cycles = 0;
 static u32 ppu_chr_cycles = 0;
 static u32 ppu_icn_cycles = 0;
 static u32 flip_cycles = 0;
 static u32 eval_cycles = 0;
 static u32 input_cycles = 0;
 static u32 mix_cycles = 0;
+
 #else
 #define PROF(F,VAR) (F)
 #define PROF_SHOW()
-#define PROF_INIT()
 #endif
 
 static time_t seconds = 0;
@@ -149,21 +151,23 @@ void
 screen_deo(u8 *ram, u8 *d, u8 port) {
     switch(port) {
         case 0xe: {
-            u16 x, y;
-            u8 *layer = (d[0xe] & 0x40) ? ppu.fg : ppu.bg;
-            x = PEEK2(d + 0x8);
-            y = PEEK2(d + 0xa);
-            if(d[0xe] & 0x80) {
-                screen_fill(layer,
-                        (d[0xe] & 0x10) ? 0 : x,
-                        (d[0xe] & 0x20) ? 0 : y,
-                        (d[0xe] & 0x10) ? x : SCREEN_WIDTH,
-                        (d[0xe] & 0x20) ? y : SCREEN_HEIGHT,
-                        (d[0xe] & 0x03));
+            u8 ctrl = d[0xe];
+            u8 color = ctrl & 0x3;
+            u16 x0 = PEEK2(d + 0x8);
+            u16 y0 = PEEK2(d + 0xa);
+            u8 *layer = (ctrl & 0x40) ? ppu.fg : ppu.bg;
+            if(ctrl & 0x80) {
+                u16 x1 = SCREEN_WIDTH - 1;
+                u16 y1 = SCREEN_HEIGHT - 1;
+                if(ctrl & 0x10) x1 = x0, x0 = 0;
+                if(ctrl & 0x20) y1 = y0, y0 = 0;
+                PROF(screen_fill(layer, x0, y0, x1, y1, color), ppu_fill_cycles);
             } else {
-                PROF(ppu_pixel(layer, x, y, d[0xe] & 0x3), ppu_pixel_cycles);
-                if(d[0x6] & 0x01) POKE2(d + 0x8, x + 1); /* auto x+1 */
-                if(d[0x6] & 0x02) POKE2(d + 0xa, y + 1); /* auto y+1 */
+                u16 width = SCREEN_WIDTH;
+                u16 height = SCREEN_HEIGHT;
+                PROF(ppu_pixel(layer, x0, y0, color), ppu_pixel_cycles);
+                if(d[0x6] & 0x1) POKE2(d + 0x8, x0 + 1); /* auto x+1 */
+                if(d[0x6] & 0x2) POKE2(d + 0xa, y0 + 1); /* auto y+1 */
             }
             break;
         }
@@ -328,25 +332,30 @@ console_deo(u8 *d, u8 port) {
 
 static void
 system_cmd(u8 *ram, u16 addr) {
-        // if(ram[addr] == 0x01) {
-        //      u16 i, length = PEEK2(ram + addr + 1);
-        //      u16 a_page = PEEK2(ram + addr + 1 + 2);
-        //      u16 a_addr = PEEK2(ram + addr + 1 + 4);
-        //      u16 b_addr = PEEK2(ram + addr + 1 + 8);
-        //      u8 *rom = uxn_rom;
-        //      for(i = 0; i < length; i++) {
-        //          switch (a_page % RAM_PAGES) {
-        //              case 0: { rom = uxn_rom;   } break;
-        //              case 1: { rom = uxn_rom_2; } break;
-        //              case 2: { rom = uxn_rom_3; } break;
-        //              case 3: { rom = uxn_rom_4; } break;
-        //              case 4: { rom = uxn_rom_5; } break;
-        //              case 5: { rom = uxn_rom_6; } break;
-        //              case 6: { rom = uxn_rom_7; } break;
-        //          }
-        //          ram[(u16)(b_addr + i)] = rom[(u16)(a_addr + i)];
+    if(ram[addr] == 0x01) {
+        // NOTE: Handle rom paging on a case by case basis if a rom has to be
+        // split in multiple chunks. The GBA compiler doesn't like allocating
+        // big arrays, but it's fine if we split it into chunks of 64KB, for
+        // example.
+        //
+        // u16 i, length = PEEK2(ram + addr + 1);
+        // u16 a_page = PEEK2(ram + addr + 1 + 2);
+        // u16 a_addr = PEEK2(ram + addr + 1 + 4);
+        // u16 b_addr = PEEK2(ram + addr + 1 + 8);
+        // u8 *rom = uxn_rom;
+        // for(i = 0; i < length; i++) {
+        //     switch (a_page % RAM_PAGES) {
+        //         case 0: { rom = uxn_rom;   } break;
+        //         case 1: { rom = uxn_rom_2; } break;
+        //         case 2: { rom = uxn_rom_3; } break;
+        //         case 3: { rom = uxn_rom_4; } break;
+        //         case 4: { rom = uxn_rom_5; } break;
+        //         case 5: { rom = uxn_rom_6; } break;
+        //         case 6: { rom = uxn_rom_7; } break;
+        //     }
+        //     ram[(u16)(b_addr + i)] = rom[(u16)(a_addr + i)];
         // }
-        // }
+    }
 }
 
 void
@@ -378,19 +387,20 @@ void
 uxn_deo(Uxn *u, u8 addr) {
         u8 p = addr & 0x0f, d = addr & 0xf0;
         switch(d) {
-        case 0x00:
-                system_deo(u, &u->dev[d], p);
-        if(p > 0x7 && p < 0xe)
-            putcolors(&u->dev[0x8]);
-                break;
-        case 0x10: console_deo(&u->dev[d], p); break;
-        case 0x20: screen_deo(u->ram, &u->dev[d], p); break;
-        case 0x30: audio_deo(0, &u->dev[d], p, u); break;
-        case 0x40: audio_deo(1, &u->dev[d], p, u); break;
-        case 0x50: audio_deo(2, &u->dev[d], p, u); break;
-        case 0x60: audio_deo(3, &u->dev[d], p, u); break;
-        case 0xa0: file_deo(0, u->ram, &u->dev[d], p); break;
-        case 0xb0: file_deo(1, u->ram, &u->dev[d], p); break;
+        case 0x00:
+            system_deo(u, &u->dev[d], p);
+            if(p > 0x7 && p < 0xe) {
+                putcolors(&u->dev[0x8]);
+            }
+            break;
+        case 0x10: console_deo(&u->dev[d], p); break;
+        case 0x20: screen_deo(u->ram, &u->dev[d], p); break;
+        case 0x30: audio_deo(0, &u->dev[d], p, u); break;
+        case 0x40: audio_deo(1, &u->dev[d], p, u); break;
+        case 0x50: audio_deo(2, &u->dev[d], p, u); break;
+        case 0x60: audio_deo(3, &u->dev[d], p, u); break;
+        case 0xa0: file_deo(0, u->ram, &u->dev[d], p); break;
+        case 0xb0: file_deo(1, u->ram, &u->dev[d], p); break;
         }
 }