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

Stabilises display, albeit that top border mode now appears to be off.

Browse Source
This commit is contained in:
Thomas Harte 2021-06-15 21:31:07 -04:00
parent 6a7eb832cc
commit 6c9dacbe89
1 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
Machines/Enterprise/Nick.cpp
View File

@ -105,6 +105,18 @@ void Nick::run_for(HalfCycles duration) {
++fetch_spot; ++fetch_spot;
} }
// Special: set mode as soon as it's known. It'll be needed at the end of HSYNC.
if(!window) {
mode_ = Mode((line_parameters_[1] >> 1)&7);
if(mode_ == Mode::Vsync) {
state_ = State::Blank;
} else {
// The first ten windows are occupied by the horizontal sync and
// colour burst; if left signalled before then, begin in pixels.
state_ = left_margin_ > 10 ? State::Border : State::Pixels;
}
}
// If all parameters have been loaded, set appropriate fields. // If all parameters have been loaded, set appropriate fields.
if(fetch_spot == 8) { if(fetch_spot == 8) {
should_reload_line_parameters_ = false; should_reload_line_parameters_ = false;
@ -117,21 +129,13 @@ void Nick::run_for(HalfCycles duration) {
line_data_pointer_[1] = uint16_t(line_parameters_[6] | (line_parameters_[7] << 8)); line_data_pointer_[1] = uint16_t(line_parameters_[6] | (line_parameters_[7] << 8));
// Set the output mode and margin. // Set the output mode and margin.
mode_ = Mode((line_parameters_[1] >> 1)&7);
left_margin_ = line_parameters_[2] & 0x3f; left_margin_ = line_parameters_[2] & 0x3f;
right_margin_ = line_parameters_[3] & 0x3f; right_margin_ = line_parameters_[3] & 0x3f;
if(mode_ == Mode::Vsync) {
state_ = State::Blank;
} else {
// The first ten windows are occupied by the horizontal sync and
// colour burst; if left signalled before then, begin in pixels.
state_ = left_margin_ > 10 ? State::Border : State::Pixels;
}
} }
} }
// HSYNC is signalled for four windows at the start of the line. // HSYNC is signalled for four windows at the start of the line.
// I currently belive this happens regardless of Vsync mode.
if(window < 4 && end_window >= 4) { if(window < 4 && end_window >= 4) {
crt_.output_sync(4); crt_.output_sync(4);
window = 4; window = 4;
@ -139,20 +143,22 @@ void Nick::run_for(HalfCycles duration) {
// Deal with vsync mode out here. // Deal with vsync mode out here.
if(mode_ == Mode::Vsync) { if(mode_ == Mode::Vsync) {
while(window < end_window) { if(window >= 4) {
int next_event = end_window; while(window < end_window) {
if(window < left_margin_) next_event = std::min(next_event, left_margin_); int next_event = end_window;
if(window < right_margin_) next_event = std::min(next_event, right_margin_); if(window < left_margin_) next_event = std::min(next_event, left_margin_);
if(window < right_margin_) next_event = std::min(next_event, right_margin_);
if(state_ == State::Blank) { if(state_ == State::Blank) {
crt_.output_blank(next_event - window); crt_.output_blank(next_event - window);
} else { } else {
crt_.output_sync(next_event - window); crt_.output_sync(next_event - window);
}
window = next_event;
if(window == left_margin_) state_ = State::Sync;
if(window == right_margin_) state_ = State::Blank;
} }
window = next_event;
if(window == left_margin_) state_ = State::Sync;
if(window == right_margin_) state_ = State::Blank;
} }
} else { } else {
// If present then the colour burst is output for the period from // If present then the colour burst is output for the period from
@ -163,31 +169,33 @@ void Nick::run_for(HalfCycles duration) {
window = 10; window = 10;
} }
while(window < end_window) { if(window >= 10) {
int next_event = end_window; while(window < end_window) {
if(window < left_margin_) next_event = std::min(next_event, left_margin_); int next_event = end_window;
if(window < right_margin_) next_event = std::min(next_event, right_margin_); if(window < left_margin_) next_event = std::min(next_event, left_margin_);
if(window < right_margin_) next_event = std::min(next_event, right_margin_);
if(state_ == State::Border) { if(state_ == State::Border) {
border_duration_ += next_event - window; border_duration_ += next_event - window;
} else { } else {
// TODO: something proper here. // TODO: something proper here.
uint16_t *const colour_pointer = reinterpret_cast<uint16_t *>(crt_.begin_data(1)); uint16_t *const colour_pointer = reinterpret_cast<uint16_t *>(crt_.begin_data(1));
if(colour_pointer) *colour_pointer = 0xfff; if(colour_pointer) *colour_pointer = 0xfff;
crt_.output_level(next_event - window); crt_.output_level(next_event - window);
} }
window = next_event; window = next_event;
if(window == left_margin_) { if(window == left_margin_) {
flush_border(); flush_border();
state_ = State::Pixels; state_ = State::Pixels;
// TODO: probably allocate some pixels here? // TODO: probably allocate some pixels here?
} }
if(window == right_margin_) { if(window == right_margin_) {
state_ = State::Border; state_ = State::Border;
// TODO: probably output pixels here? // TODO: probably output pixels here?
}
} }
} }