6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00
Code Issues Projects Releases Wiki Activity

Switches to an is-in-video test that allows for video memory being paged twice.

Browse Source 
This is trivially possible even in plain 128kb mode.
This commit is contained in:
Thomas Harte 2021-03-22 15:46:02 -04:00
parent 8dbc7649aa
commit a26716919c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
View File

@ -169,7 +169,7 @@ template<Model model> class ConcreteMachine:
case PartialMachineCycle::Write: case PartialMachineCycle::Write:
// Flush video if this access modifies screen contents. // Flush video if this access modifies screen contents.
if(address >= video_base_ && address < video_base_ + 6912) { if(is_video_[address >> 14] && (address & 0x3fff) < 6912) {
video_.flush(); video_.flush();
} }
write_pointers_[address >> 14][address] = *cycle.value; write_pointers_[address >> 14][address] = *cycle.value;
@ -386,7 +386,7 @@ template<Model model> class ConcreteMachine:
uint8_t *write_pointers_[4]; uint8_t *write_pointers_[4];
uint8_t pages_[4]; uint8_t pages_[4];
bool is_contended_[4]; bool is_contended_[4];
int video_base_ = 0x4000; bool is_video_[4];
uint8_t port1ffd_ = 0; uint8_t port1ffd_ = 0;
uint8_t port7ffd_ = 0; uint8_t port7ffd_ = 0;
@ -459,12 +459,10 @@ template<Model model> class ConcreteMachine:
void update_video_base() { void update_video_base() {
const uint8_t video_page = (port7ffd_ & 0x08) ? 7 : 5; const uint8_t video_page = (port7ffd_ & 0x08) ? 7 : 5;
video_base_ = 0x1'0000; // i.e. not in memory. is_video_[0] = pages_[0] == video_page;
is_video_[1] = pages_[1] == video_page;
if(pages_[0] == video_page) video_base_ = 0x0000; is_video_[2] = pages_[2] == video_page;
else if(pages_[1] == video_page) video_base_ = 0x4000; is_video_[3] = pages_[3] == video_page;
else if(pages_[2] == video_page) video_base_ = 0x8000;
else if(pages_[3] == video_page) video_base_ = 0xc000;
} }
// MARK: - Audio. // MARK: - Audio.