Update V1 logging to better match V2 for direct comparison

v1/Makefile

@@ -24,12 +24,13 @@ LD = $(CC)
 RFLAGS += -O3 -s
 RFLAGS += -DSTANDALONE
 DFLAGS += -g
-#DFLAGS += -DDEBUG_MAPPER
+DFLAGS += -DDEBUG_MAPPER
 #DFLAGS += -DDEBUG_RENDER
-#DFLAGS += -DDEBUG_PPU -DDEBUG_VRAM -DDEBUG_OAM
+#DFLAGS += -DDEBUG_PPU
+DFLAGS += -DDEBUG_VRAM -DDEBUG_OAM
 #DFLAGS += -DDEBUG_APU
 #DFLAGS += -DDEBUG_INPUT
-#DFLAGS += -DE6502_DEBUG
+DFLAGS += -DE6502_DEBUG
 CFLAGS += -DE6502_ILLEGAL
 CFLAGS += $(PFLAGS) -Wall -Werror -Wshadow -Wunused -I./ -Isrc/
 CFLAGS += -Iinc/$(PLATFORM)/SDL2

v1/src/map/mmc1.c

@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define MAPPER_NAME "MMC1"
 #include "map.h"
 
 

v1/src/mapper.h

@@ -4,7 +4,10 @@
 #include <stdint.h>
 
 #ifdef DEBUG_MAPPER
-#define MAP_LOG(fmt, ...) printf("MAP: " fmt "\n" __VA_OPT__(,) __VA_ARGS__)
+#ifndef MAPPER_NAME
+#define MAPPER_NAME "MAP"
+#endif
+#define MAP_LOG(fmt, ...) printf("D: " MAPPER_NAME ": " fmt "\n" __VA_OPT__(,) __VA_ARGS__)
 #else
 #define MAP_LOG(...) do {} while (0)
 #endif

v1/src/ppu.c

@@ -133,14 +133,14 @@ void nes_ppu_write(nes_ppu* ppu, uint16_t addr, uint8_t val) {
         ppu->latch = !ppu->latch;
 
     } else if (ppu_reg_addr == addr) {
-        VRAM_LOG("PPU: ADDR %02x\n", val);
+//        VRAM_LOG("PPU: ADDR %02x\n", val);
 
         if (ppu->latch) {
             ppu->t &= 0xFF00U;
             ppu->t |= val;
 
             ppu->addr = (ppu->t & 0x3FFFU);
-            VRAM_LOG("PPU: VRAM ADDR %04x\n", ppu->addr);
+            VRAM_LOG("I: Core: PPU: ADDR %04X\n", ppu->addr);
 
             nes_ppu_internal_copy_x(ppu);
             nes_ppu_internal_copy_y(ppu);
@@ -178,6 +178,7 @@ void nes_ppu_write(nes_ppu* ppu, uint16_t addr, uint8_t val) {
                 vram_addr &= (nes_ppu_mem_vram_size - 1);
             }
 #ifdef DEBUG_VRAM
+#if 0
             {
                 int page = vram_addr >> 10;
                 int loc = vram_addr & 0x3FFU;
@@ -191,13 +192,15 @@ void nes_ppu_write(nes_ppu* ppu, uint16_t addr, uint8_t val) {
                            loc - 960, val);
                 }
             }
+#else
+            VRAM_LOG("I: Core: PPU W %04X < %02X\n", ppu->addr, val);
+#endif
 #endif // DEBUG_VRAM
-//            printf("PPU: VRAM %04x < %02x\n", vram_addr, val);
             nes_vram_write(ppu->mapper, ppu->map_data,
                            vram_addr, val);
 
         } else {
-//            PPU_LOG("PPU: CHR MEM WRITE %04x > %02x\n", ppu->addr, val);
+            VRAM_LOG("I: Core: PPU W %04X < %02X\n", ppu->addr, val);
             nes_chr_write(ppu->mapper, ppu->map_data,
                           ppu->addr, val);
         }