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

Fixed a timing regression in the CB opcodes

Browse Source
This commit is contained in:
Lior Halphon 2018-03-27 20:21:24 +03:00
parent 7671648fca
commit f5493e023d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Core/z80_cpu.c
View File

@ -523,9 +523,8 @@ static void set_src_value(GB_gameboy_t *gb, uint8_t opcode, uint8_t value)
gb->registers[GB_REGISTER_AF] |= value << 8; gb->registers[GB_REGISTER_AF] |= value << 8;
} }
else { else {
GB_advance_cycles(gb, 1);
GB_write_memory(gb, gb->registers[GB_REGISTER_HL], value); GB_write_memory(gb, gb->registers[GB_REGISTER_HL], value);
GB_advance_cycles(gb, 4); GB_advance_cycles(gb, 5);
} }
} }
else { else {
@ -1227,8 +1226,8 @@ static void sra_r(GB_gameboy_t *gb, uint8_t opcode)
{ {
uint8_t bit7; uint8_t bit7;
uint8_t value; uint8_t value;
GB_advance_cycles(gb, 3); GB_advance_cycles(gb, 4);
value = get_src_value(gb, opcode, 4); value = get_src_value(gb, opcode, 3);
bit7 = value & 0x80; bit7 = value & 0x80;
gb->registers[GB_REGISTER_AF] &= 0xFF00; gb->registers[GB_REGISTER_AF] &= 0xFF00;
if (value & 1) { if (value & 1) {
@ -1244,8 +1243,8 @@ static void sra_r(GB_gameboy_t *gb, uint8_t opcode)
static void srl_r(GB_gameboy_t *gb, uint8_t opcode) static void srl_r(GB_gameboy_t *gb, uint8_t opcode)
{ {
uint8_t value; uint8_t value;
GB_advance_cycles(gb, 3); GB_advance_cycles(gb, 4);
value = get_src_value(gb, opcode, 4); value = get_src_value(gb, opcode, 3);
gb->registers[GB_REGISTER_AF] &= 0xFF00; gb->registers[GB_REGISTER_AF] &= 0xFF00;
set_src_value(gb, opcode, (value >> 1)); set_src_value(gb, opcode, (value >> 1));
if (value & 1) { if (value & 1) {
@ -1259,8 +1258,8 @@ static void srl_r(GB_gameboy_t *gb, uint8_t opcode)
static void swap_r(GB_gameboy_t *gb, uint8_t opcode) static void swap_r(GB_gameboy_t *gb, uint8_t opcode)
{ {
uint8_t value; uint8_t value;
GB_advance_cycles(gb, 3); GB_advance_cycles(gb, 4);
value = get_src_value(gb, opcode, 4); value = get_src_value(gb, opcode, 3);
gb->registers[GB_REGISTER_AF] &= 0xFF00; gb->registers[GB_REGISTER_AF] &= 0xFF00;
set_src_value(gb, opcode, (value >> 4) | (value << 4)); set_src_value(gb, opcode, (value >> 4) | (value << 4));
if (!value) { if (!value) {