From f2ce646d8d02063ea65dbe1881a8f299326e20be Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 13 Mar 2022 12:47:48 -0400 Subject: [PATCH] Undo 8-cycle-if-met WAIT. --- Machines/Amiga/Copper.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Machines/Amiga/Copper.cpp b/Machines/Amiga/Copper.cpp index 5c2fabe2e..d53c0beb1 100644 --- a/Machines/Amiga/Copper.cpp +++ b/Machines/Amiga/Copper.cpp @@ -124,13 +124,11 @@ bool Copper::advance_dma(uint16_t position, uint16_t blitter_status) { // Got to here => this is a WAIT or a SKIP. - const bool raster_is_satisfied = satisfies_raster(position, blitter_status, instruction_); - if(!(instruction_[1] & 1)) { - // A WAIT. Empirically, I don't think this waits at all if the test is - // already satisfied. - state_ = raster_is_satisfied ? State::FetchFirstWord : State::Waiting; - if(raster_is_satisfied) LOG("Will wait from " << PADHEX(4) << position); + // A WAIT. The wait-for-start-of-next PAL wait of + // $FFDF,$FFFE seems to suggest evaluation will happen + // in the next cycle rather than this one. + state_ = State::Waiting; break; }