From 9293bcbc8858228d063851841fe4bf35e8bbe2b6 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Wed, 21 Apr 2021 18:49:18 -0400 Subject: [PATCH 1/2] Exclude the ROM from contention on 48kb and 128kb models. --- Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp index 30686b1f5..c7ce231ca 100644 --- a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp +++ b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp @@ -717,9 +717,9 @@ template class ConcreteMachine: void set_memory(int bank, uint8_t source) { if constexpr (model >= Model::Plus2a) { - is_contended_[bank] = (source >= 4 && source < 8); + is_contended_[bank] = source >= 4 && source < 8; } else { - is_contended_[bank] = source & 1; + is_contended_[bank] = source < 0x80 && source & 1; } pages_[bank] = source; From bdb1b7e77c1adebce22e27ae3f5418ac1f641ef7 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Wed, 21 Apr 2021 18:49:39 -0400 Subject: [PATCH 2/2] Reinstate the +2 as the default Spectrum. --- Analyser/Static/ZXSpectrum/Target.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Analyser/Static/ZXSpectrum/Target.hpp b/Analyser/Static/ZXSpectrum/Target.hpp index 4996d21fa..76eada20e 100644 --- a/Analyser/Static/ZXSpectrum/Target.hpp +++ b/Analyser/Static/ZXSpectrum/Target.hpp @@ -27,7 +27,7 @@ struct Target: public ::Analyser::Static::Target, public Reflection::StructImpl< Plus3, ); - Model model = Model::Plus2a; + Model model = Model::Plus2; bool should_hold_enter = false; Target(): Analyser::Static::Target(Machine::ZXSpectrum) {