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

Corrects bug when left_ or right_margin_ = 0.

Browse Source
This commit is contained in:
Thomas Harte 2021-06-24 20:28:50 -04:00
parent 6e616972a5
commit 9230cf1726
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Machines/Enterprise/Nick.cpp
View File

@ -14,18 +14,29 @@ namespace {
uint16_t mapped_colour(uint8_t source) { uint16_t mapped_colour(uint8_t source) {
// On the Enterprise, red and green are 3-bit quantities; blue is a 2-bit quantity. // On the Enterprise, red and green are 3-bit quantities; blue is a 2-bit quantity.
const int red = ((source&0x01) << 2) | ((source&0x08) >> 2) | ((source&0x40) >> 6); int red = ((source&0x01) << 2) | ((source&0x08) >> 2) | ((source&0x40) >> 6);
const int green = ((source&0x02) << 1) | ((source&0x10) >> 3) | ((source&0x80) >> 7); int green = ((source&0x02) << 1) | ((source&0x10) >> 3) | ((source&0x80) >> 7);
const int blue = ((source&0x04) >> 1) | ((source&0x20) >> 5); int blue = ((source&0x04) >> 1) | ((source&0x20) >> 5);
assert(red <= 7);
assert(green <= 7);
assert(blue <= 3);
red = (red << 1) + (red >> 3);
green = (green << 1) + (green >> 3);
blue = (blue << 2) + blue;
assert(red <= 15);
assert(green <= 15);
assert(blue <= 15);
// Duplicate bits where necessary to map to a full 4-bit range per channel. // Duplicate bits where necessary to map to a full 4-bit range per channel.
const uint8_t parts[2] = { const uint8_t parts[2] = {
uint8_t( uint8_t(
(red << 1) + ((red&0x4) >> 3) red
), ),
uint8_t( uint8_t(
(green << 5) + ((green&0x4) << 2) + (green << 4) + blue
(blue << 2) + blue
) )
}; };
return *reinterpret_cast<const uint16_t *>(parts); return *reinterpret_cast<const uint16_t *>(parts);
@ -112,7 +123,15 @@ void Nick::run_for(Cycles duration) {
// //
// This is also when the non-palette line parameters // This is also when the non-palette line parameters
// are loaded, if appropriate. // are loaded, if appropriate.
if(!window) set_output_type(OutputType::Sync); if(!window) {
set_output_type(OutputType::Sync);
// There's no increment to get to 0, it happens when the horizontal_counter_
// is reset. So test for active bit effect manually.
if(!left_margin_) is_sync_or_pixels_ = true;
if(!right_margin_) is_sync_or_pixels_ = false;
}
while(window < 4 && window < end_window) { while(window < 4 && window < end_window) {
if(should_reload_line_parameters_) { if(should_reload_line_parameters_) {
switch(window) { switch(window) {