6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-21 21:33:54 +00:00
Code Issues Projects Releases Wiki Activity

Edge towards proper serialisation.

Browse Source
This commit is contained in:
Thomas Harte 2024-09-06 21:01:30 -04:00
parent 88248d7062
commit f10702b3ca
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Machines/Acorn/Electron/Video.cpp
View File

@ -283,15 +283,17 @@ uint8_t VideoOutput::run_for(const Cycles cycles) {
// Determine current output item. // Determine current output item.
OutputStage stage; OutputStage stage;
int screen_pitch = screen_pitch_;
if(vsync_int || hsync_int) { if(vsync_int || hsync_int) {
stage = OutputStage::Sync; stage = OutputStage::Sync;
} else if(in_blank()) { } else if(in_blank()) {
stage = OutputStage::Blank; stage = OutputStage::Blank;
} else { } else {
stage = OutputStage::Pixels; stage = OutputStage::Pixels;
screen_pitch = (mode_40 ? 320 : 640) / static_cast<int>(mode_bpp);
} }
if(stage != output_) { if(stage != output_ || screen_pitch != screen_pitch_) {
switch(output_) { switch(output_) {
case OutputStage::Sync: crt_.output_sync(output_length_); break; case OutputStage::Sync: crt_.output_sync(output_length_); break;
case OutputStage::Blank: crt_.output_blank(output_length_); break; case OutputStage::Blank: crt_.output_blank(output_length_); break;
@ -308,24 +310,41 @@ uint8_t VideoOutput::run_for(const Cycles cycles) {
} }
output_length_ = 0; output_length_ = 0;
output_ = stage; output_ = stage;
screen_pitch_ = screen_pitch;
if(stage == OutputStage::Pixels) { if(stage == OutputStage::Pixels) {
initial_output_target_ = current_output_target_ = crt_.begin_data(640);//crt_.begin_data(mode_40 ? 320 : 640); initial_output_target_ = current_output_target_ = crt_.begin_data(static_cast<size_t>(screen_pitch_));
} }
} }
++output_length_; ++output_length_;
if(output_ == OutputStage::Pixels && (!mode_40 || h_count & 8) && current_output_target_) { if(output_ == OutputStage::Pixels && (!mode_40 || h_count & 8) && current_output_target_) {
const uint8_t data = ram_[byte_addr | char_row]; const uint8_t data = ram_[byte_addr | char_row];
current_output_target_[0] = (data & 0x80) ? 0xff : 0x00; switch(mode_bpp) {
current_output_target_[1] = (data & 0x40) ? 0xff : 0x00; case Bpp::One:
current_output_target_[2] = (data & 0x20) ? 0xff : 0x00; current_output_target_[0] = (data & 0x80) ? 0xff : 0x00;
current_output_target_[3] = (data & 0x10) ? 0xff : 0x00; current_output_target_[1] = (data & 0x40) ? 0xff : 0x00;
current_output_target_[4] = (data & 0x08) ? 0xff : 0x00; current_output_target_[2] = (data & 0x20) ? 0xff : 0x00;
current_output_target_[5] = (data & 0x04) ? 0xff : 0x00; current_output_target_[3] = (data & 0x10) ? 0xff : 0x00;
current_output_target_[6] = (data & 0x02) ? 0xff : 0x00; current_output_target_[4] = (data & 0x08) ? 0xff : 0x00;
current_output_target_[7] = (data & 0x01) ? 0xff : 0x00; current_output_target_[5] = (data & 0x04) ? 0xff : 0x00;
current_output_target_ += 8; current_output_target_[6] = (data & 0x02) ? 0xff : 0x00;
current_output_target_[7] = (data & 0x01) ? 0xff : 0x00;
current_output_target_ += 8;
break;
case Bpp::Two:
current_output_target_[0] = (data & 0x80) ? 0xff : 0x00;
current_output_target_[1] = (data & 0x20) ? 0xff : 0x00;
current_output_target_[2] = (data & 0x08) ? 0xff : 0x00;
current_output_target_[3] = (data & 0x02) ? 0xff : 0x00;
current_output_target_ += 4;
break;
case Bpp::Four:
current_output_target_[0] = (data & 0x80) ? 0xff : 0x00;
current_output_target_[1] = (data & 0x08) ? 0xff : 0x00;
current_output_target_ += 2;
break;
}
} }
// Increment the byte address across the line. // Increment the byte address across the line.

3
Machines/Acorn/Electron/Video.hpp
View File

@ -85,6 +85,7 @@ class VideoOutput {
}; };
OutputStage output_; OutputStage output_;
int output_length_ = 0; int output_length_ = 0;
int screen_pitch_ = 0;
uint8_t *current_output_target_ = nullptr; uint8_t *current_output_target_ = nullptr;
uint8_t *initial_output_target_ = nullptr; uint8_t *initial_output_target_ = nullptr;
@ -102,7 +103,7 @@ class VideoOutput {
bool mode_40 = true; bool mode_40 = true;
bool mode_text = false; bool mode_text = false;
enum class Bpp { enum class Bpp {
One, Two, Four One = 1, Two = 2, Four = 4
} mode_bpp = Bpp::One; } mode_bpp = Bpp::One;
// Frame position. // Frame position.