diff options
| -rw-r--r-- | mapper_0007.c | 3 | ||||
| -rw-r--r-- | mknes.c | 17 | ||||
| -rw-r--r-- | ppu.c | 48 |
3 files changed, 42 insertions, 26 deletions
diff --git a/mapper_0007.c b/mapper_0007.c index c1ad7fa..fdb6dbb 100644 --- a/mapper_0007.c +++ b/mapper_0007.c @@ -1,3 +1,6 @@ + + + static void mapper_0007_init(struct nes_state *state) { state->map.m0007.prg_ptr = state->prg_rom; state->map.m0007.mirroring = 0; @@ -13,6 +13,14 @@ #define WINDOW_WIDTH 320 * 3 #define WINDOW_HEIGHT 240 * 3 +#define PRG_ROM_SIZE (512 * 1024) +#define CHR_ROM_SIZE (512 * 1024) +#define PIXELS_SIZE (256 * 240) +#define RAM_SIZE 0x800 +#define SRAM_SIZE 0x2000 +#define CIRAM_SIZE 0x1000 +#define CHR_RAM_SIZE 0x4000 + #define LIKELY(x) __builtin_expect(!!(x), 1) #define UNLIKELY(x) __builtin_expect(!!(x), 0) @@ -98,15 +106,6 @@ struct nes_state nstate; static uint32_t frames; - -#define PRG_ROM_SIZE (512 * 1024) -#define CHR_ROM_SIZE (512 * 1024) -#define PIXELS_SIZE (256 * 240) -#define RAM_SIZE 0x800 -#define SRAM_SIZE 0x2000 -#define CIRAM_SIZE 0x1000 -#define CHR_RAM_SIZE 0x4000 - static struct nes_state *allocate_nes_state(void) { struct nes_state *state = (struct nes_state*)calloc(1, sizeof(struct nes_state)); if(!state) return 0; @@ -1,14 +1,24 @@ static uint8_t __attribute__((aligned(64))) ppu_bitreverse_lut[256] = { -# define R2(n) n, n + 2*64, n + 1*64, n + 3*64 -# define R4(n) R2(n), R2(n + 2*16), R2(n + 1*16), R2(n + 3*16) -# define R6(n) R4(n), R4(n + 2*4 ), R4(n + 1*4 ), R4(n + 3*4 ) - R6(0), R6(2), R6(1), R6(3) + 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, + 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, + 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, + 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, + 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, + 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, + 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, + 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, + 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, + 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, + 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, + 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, + 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, + 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, + 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, + 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff }; -#undef R2 -#undef R4 -#undef R6 + static void ppu_reset(struct nes_state *state) { struct ppu_state *restrict ppu = &state->ppu; @@ -111,13 +121,16 @@ static inline void ppu_render_pixel(struct nes_state *state) { uint8_t sp_prio = 0; uint8_t sp_zero = 0; - uint8_t bg_mask = (ppu->reg_mask & 0x08) ? 0xff : 0x00; - uint8_t sp_mask = (ppu->reg_mask & 0x10) ? 0xff : 0x00; + // uint8_t bg_mask = (ppu->reg_mask & 0x08) ? 0xff : 0x00; + // uint8_t sp_mask = (ppu->reg_mask & 0x10) ? 0xff : 0x00; - // uint8_t left_mask = (x >= 8) ? 0xff : 0x00; - // bg_mask &= ((ppu->reg_mask & 0x02) ? 0xff : 0x00) | left_mask; - // sp_mask &= ((ppu->reg_mask & 0x04) ? 0xff : 0x00) | left_mask; + uint8_t show_bg = ppu->reg_mask & 0x08; + uint8_t show_sprites = ppu->reg_mask & 0x10; + uint8_t left_bg = ppu->reg_mask & 0x02; + uint8_t left_sp = ppu->reg_mask & 0x04; + uint8_t bg_mask = (show_bg && (left_bg || x >= 8)) ? 0xff : 0x00; + uint8_t sp_mask = (show_sprites && (left_sp || x >= 8)) ? 0xff : 0x00; // Background uint8_t p0 = !!(ppu->bg_shift_pattern_low & bit); @@ -126,6 +139,7 @@ static inline void ppu_render_pixel(struct nes_state *state) { uint8_t a1 = !!(ppu->bg_shift_attrib_high & bit); bg_pixel = ((p1 << 1) | p0) & bg_mask; + bg_palette = ((a1 << 1) | a0) & bg_mask; // Sprite @@ -163,11 +177,11 @@ static inline void ppu_render_pixel(struct nes_state *state) { state->pixels[y * 256 + x] = ppu->palette[palette_index]; // NOTE(peter): Add color_emphasis bits (expand palette to 8x). } + __attribute__((hot, flatten)) static void ppu_tick(struct nes_state *state) { struct ppu_state *restrict ppu = &state->ppu; - uint32_t dot = ppu->dot; uint32_t scanline = ppu->scanline; uint8_t rendering = (ppu->reg_mask & 0x18); @@ -250,12 +264,12 @@ static void ppu_tick(struct nes_state *state) { } break; case 0: { - ppu->bg_shift_pattern_low = (ppu->bg_shift_pattern_low & 0xff00) | ppu->bg_next_tile_lsb; - ppu->bg_shift_pattern_high = (ppu->bg_shift_pattern_high & 0xff00) | ppu->bg_next_tile_msb; + ppu->bg_shift_pattern_low = (ppu->bg_shift_pattern_low) | ppu->bg_next_tile_lsb; + ppu->bg_shift_pattern_high = (ppu->bg_shift_pattern_high) | ppu->bg_next_tile_msb; uint8_t a = ppu->bg_next_tile_attrib; - ppu->bg_shift_attrib_low = (ppu->bg_shift_attrib_low & 0xff00) | ((a & 1) ? 0xff : 0x00); - ppu->bg_shift_attrib_high = (ppu->bg_shift_attrib_high & 0xff00) | ((a & 2) ? 0xff : 0x00); + ppu->bg_shift_attrib_low = (ppu->bg_shift_attrib_low) | ((a & 1) ? 0xff : 0x00); + ppu->bg_shift_attrib_high = (ppu->bg_shift_attrib_high) | ((a & 2) ? 0xff : 0x00); if((ppu->vram_addr & 0x001f) == 31) { ppu->vram_addr &= ~0x001f; |