1 files changed, 29 insertions, 12 deletions

diff --git a/src/main.c b/src/main.c
index 8d0eba8..ecfa57b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,6 +37,8 @@
 #define CONTROL_METHODS CONTROL_CONTROLLER,CONTROL_MOUSE,CONTROL_KEYBOARD
 #endif
 
+#define PROF_ENABLE 1
+
 #ifdef PROF_ENABLE
 #if PROF_ENABLE == 0
 #define TEXT_ENABLE 1
@@ -51,22 +53,38 @@
 #ifndef PROF_SHOW_Y
 #define PROF_SHOW_Y 0
 #endif
+// #define PROF_SHOW() \
+//     do { \
+//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y));\
+//         txt_printf("INPUT: %lu    ", input_cycles);\
+//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+1);\
+//         txt_printf("EVAL:  %lu    ", eval_cycles);\
+//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+2);\
+//         txt_printf("FLIP:  %lu    ", flip_cycles);\
+//         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+3);\
+//         txt_printf("MIX:   %lu    ", mix_cycles);\
+//     } while (0)
 #define PROF_SHOW() \
     do { \
         txt_position((PROF_SHOW_X), (PROF_SHOW_Y));\
-        txt_printf("INPUT: %lu    ", input_cycles);\
+        txt_printf("PIX:   %lu    ", ppu_pixel_cycles);\
         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+1);\
-        txt_printf("EVAL:  %lu    ", eval_cycles);\
+        txt_printf("2BPP:  %lu    ", ppu_chr_cycles);\
         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+2);\
-        txt_printf("FLIP:  %lu    ", flip_cycles);\
+        txt_printf("1BPP:  %lu    ", ppu_icn_cycles);\
         txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+3);\
-        txt_printf("MIX:   %lu    ", mix_cycles);\
+        txt_printf("FLIP:  %lu    ", flip_cycles);\
     } while (0)
 #define PROF_INIT() \
-    u32 flip_cycles = 0;\
-    u32 eval_cycles = 0;\
-    u32 input_cycles = 0;\
-    u32 mix_cycles = 0;
+    static u32 ppu_pixel_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;
+
+    PROF_INIT();
 #else
 #define PROF(F,VAR) (F)
 #define PROF_SHOW()
@@ -131,7 +149,7 @@ screen_deo(u8 *ram, u8 *d, u8 port) {
             u8 layer = d[0xe] & 0x40;
             PEKDEV(x, 0x8);
             PEKDEV(y, 0xa);
-            ppu_pixel(layer ? ppu.fg : ppu.bg, x, y, d[0xe] & 0x3);
+            PROF(ppu_pixel(layer ? ppu.fg : ppu.bg, x, y, d[0xe] & 0x3), ppu_pixel_cycles);
             if(d[0x6] & 0x01) POKDEV(0x8, x + 1); /* auto x+1 */
             if(d[0x6] & 0x02) POKDEV(0xa, y + 1); /* auto y+1 */
             break;
@@ -155,9 +173,9 @@ screen_deo(u8 *ram, u8 *d, u8 port) {
             for(size_t i = 0; i <= n; i++) {
                 u8 *sprite = &ram[addr];
                 if (twobpp) {
-                    ppu_2bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy);
+                    PROF(ppu_2bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy), ppu_chr_cycles);
                 } else {
-                    ppu_1bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy);
+                    PROF(ppu_1bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy), ppu_icn_cycles);
                 }
                 addr += (d[0x6] & 0x04) << (1 + twobpp);
             }
@@ -564,7 +582,6 @@ main(void) {
 
     // Main loop.
     uxn_eval(&u, PAGE_PROGRAM);
-    PROF_INIT();
     u8 frame_counter = 0;
     while(true) {
         bios_vblank_wait();