1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-07 23:29:06 +00:00

Merge pull request #925 from TomHarte/ZXROMSpeed

Corrects timing error in Spectrum 48kb and 128kb ROM accesses.
This commit is contained in:
Thomas Harte 2021-04-21 18:54:16 -04:00 committed by GitHub
commit 30a1a53c97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -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) {

View File

@ -717,9 +717,9 @@ template<Model model> 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;