From 349b9ce5023b32da2bbd00938b826415fd83863b Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Thu, 15 Apr 2021 21:13:06 -0400 Subject: [PATCH] Don't post contended accesses other than on the +2a/+3. Those machines have an actual latch for this stuff, the others don't. --- Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp index dd82ab0ac..d4e289c2a 100644 --- a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp +++ b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp @@ -323,8 +323,10 @@ template class ConcreteMachine: case PartialMachineCycle::Read: *cycle.value = read_pointers_[address >> 14][address]; - if(is_contended_[address >> 14]) { - video_->set_last_contended_area_access(*cycle.value); + if constexpr (model >= Model::Plus2a) { + if(is_contended_[address >> 14]) { + video_->set_last_contended_area_access(*cycle.value); + } } break; @@ -336,9 +338,11 @@ template class ConcreteMachine: write_pointers_[address >> 14][address] = *cycle.value; - // Fill the floating bus buffer if this write is within the contended area. - if(is_contended_[address >> 14]) { - video_->set_last_contended_area_access(*cycle.value); + if constexpr (model >= Model::Plus2a) { + // Fill the floating bus buffer if this write is within the contended area. + if(is_contended_[address >> 14]) { + video_->set_last_contended_area_access(*cycle.value); + } } break;