Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Verified some timings on a DMG. Fixed palette write conflict timing (Although the fix kind of implies time traveling). Closes #65

Browse Source
This commit is contained in:
Lior Halphon 2018-05-16 00:59:11 +03:00
parent 562b43a7c5
commit 249acb04cc
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Core/z80_cpu.c
View File

@ -28,21 +28,19 @@ static const GB_conflict_t cgb_conflict_map[0x80] = {
static const GB_conflict_t dmg_conflict_map[0x80] = { static const GB_conflict_t dmg_conflict_map[0x80] = {
[GB_IO_IF] = GB_CONFLICT_WRITE_CPU, [GB_IO_IF] = GB_CONFLICT_WRITE_CPU,
[GB_IO_LYC] = GB_CONFLICT_READ_OLD, [GB_IO_LYC] = GB_CONFLICT_READ_OLD,
[GB_IO_LCDC] = GB_CONFLICT_READ_NEW,
[GB_IO_SCY] = GB_CONFLICT_READ_NEW,
[GB_IO_STAT] = GB_CONFLICT_READ_NEW,
/* Todo: these are GB_CONFLICT_READ_NEW on MGB/SGB2 */ /* Todo: these are GB_CONFLICT_READ_NEW on MGB/SGB2 */
[GB_IO_BGP] = GB_CONFLICT_READ_OR, [GB_IO_BGP] = GB_CONFLICT_READ_OR,
[GB_IO_OBP0] = GB_CONFLICT_READ_OR, [GB_IO_OBP0] = GB_CONFLICT_READ_OR,
[GB_IO_OBP1] = GB_CONFLICT_READ_OR, [GB_IO_OBP1] = GB_CONFLICT_READ_OR,
/* Todo: These were verified on an SGB2 */
[GB_IO_LCDC] = GB_CONFLICT_READ_NEW,
[GB_IO_STAT] = GB_CONFLICT_READ_NEW,
[GB_IO_SCY] = GB_CONFLICT_READ_NEW,
[GB_IO_SCX] = GB_CONFLICT_READ_NEW,
/* Todo: these were not verified at all */ /* Todo: these were not verified at all */
[GB_IO_WY] = GB_CONFLICT_READ_NEW, [GB_IO_WY] = GB_CONFLICT_READ_NEW,
[GB_IO_WX] = GB_CONFLICT_READ_NEW, [GB_IO_WX] = GB_CONFLICT_READ_NEW,
[GB_IO_SCX] = GB_CONFLICT_READ_NEW,
}; };
static uint8_t cycle_read(GB_gameboy_t *gb, uint16_t addr) static uint8_t cycle_read(GB_gameboy_t *gb, uint16_t addr)
@ -87,12 +85,12 @@ static void cycle_write(GB_gameboy_t *gb, uint16_t addr, uint8_t value)
return; return;
case GB_CONFLICT_READ_OR: { case GB_CONFLICT_READ_OR: {
GB_advance_cycles(gb, gb->pending_cycles - 1); GB_advance_cycles(gb, gb->pending_cycles - 2);
uint8_t old_value = GB_read_memory(gb, addr); uint8_t old_value = GB_read_memory(gb, addr);
GB_write_memory(gb, addr, value | old_value); GB_write_memory(gb, addr, value | old_value);
GB_advance_cycles(gb, 1); GB_advance_cycles(gb, 1);
GB_write_memory(gb, addr, value); GB_write_memory(gb, addr, value);
gb->pending_cycles = 4; gb->pending_cycles = 5;
return; return;
case GB_CONFLICT_WRITE_CPU: case GB_CONFLICT_WRITE_CPU: