Mercurial > repos > blastem
diff nor.c @ 2499:d74d3998482c
Make some progress on compiling full emulator with new 68K core
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Tue, 30 Apr 2024 00:02:14 -0700 |
| parents | 1f745318f10a |
| children |
line wrap: on
line diff
--- a/nor.c Mon Apr 29 22:57:49 2024 -0700 +++ b/nor.c Tue Apr 30 00:02:14 2024 -0700 @@ -69,7 +69,7 @@ address = address >> 1; } - nor_run(state, m68k, m68k->current_cycle); + nor_run(state, m68k, m68k->cycles); switch (state->mode) { case NOR_NORMAL: @@ -142,14 +142,14 @@ address = address >> 1; } - nor_run(state, m68k, m68k->current_cycle); + nor_run(state, m68k, m68k->cycles); switch (state->cmd_state) { case NOR_CMD_IDLE: if (value == 0xAA && (address & (state->size - 1)) == state->cmd_address1) { state->cmd_state = NOR_CMD_AA; } else { - nor_write_byte(state, address, value, m68k->current_cycle); + nor_write_byte(state, address, value, m68k->cycles); state->cmd_state = NOR_CMD_IDLE; } break; @@ -157,8 +157,8 @@ if (value == 0x55 && (address & (state->size - 1)) == state->cmd_address2) { state->cmd_state = NOR_CMD_55; } else { - nor_write_byte(state, state->cmd_address1, 0xAA, m68k->current_cycle); - nor_write_byte(state, address, value, m68k->current_cycle); + nor_write_byte(state, state->cmd_address1, 0xAA, m68k->cycles); + nor_write_byte(state, address, value, m68k->cycles); state->cmd_state = NOR_CMD_IDLE; } break; @@ -200,9 +200,9 @@ } } } else { - nor_write_byte(state, state->cmd_address1, 0xAA, m68k->current_cycle); - nor_write_byte(state, state->cmd_address2, 0x55, m68k->current_cycle); - nor_write_byte(state, address, value, m68k->current_cycle); + nor_write_byte(state, state->cmd_address1, 0xAA, m68k->cycles); + nor_write_byte(state, state->cmd_address2, 0x55, m68k->cycles); + nor_write_byte(state, address, value, m68k->cycles); } state->cmd_state = NOR_CMD_IDLE; break;