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

Corrects tabs; adds potential output_border optimisation.

Browse Source
This commit is contained in:
Thomas Harte 2019-10-19 21:20:34 -04:00
parent ddae086661
commit 735586f5f8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Machines/AmstradCPC/AmstradCPC.cpp
View File

@ -222,9 +222,9 @@ class CRTCBusHandler {
if(cycles_) { if(cycles_) {
switch(previous_output_mode_) { switch(previous_output_mode_) {
default: default:
case OutputMode::Blank: crt_.output_blank(cycles_ * 16); break; case OutputMode::Blank: crt_.output_blank(cycles_ * 16); break;
case OutputMode::Sync: crt_.output_sync(cycles_ * 16); break; case OutputMode::Sync: crt_.output_sync(cycles_ * 16); break;
case OutputMode::Border: output_border(cycles_); break; case OutputMode::Border: output_border(cycles_); break;
case OutputMode::ColourBurst: crt_.output_default_colour_burst(cycles_ * 16); break; case OutputMode::ColourBurst: crt_.output_default_colour_burst(cycles_ * 16); break;
case OutputMode::Pixels: case OutputMode::Pixels:
crt_.output_data(cycles_ * 16, size_t(cycles_ * 16 / pixel_divider_)); crt_.output_data(cycles_ * 16, size_t(cycles_ * 16 / pixel_divider_));
@ -256,7 +256,8 @@ class CRTCBusHandler {
((state.refresh_address & 0x3000) << 2) ((state.refresh_address & 0x3000) << 2)
); );
// fetch two bytes and translate into pixels // Fetch two bytes and translate into pixels. Guaranteed: the mode can change only at
// hsync, so there's no risk of pixel_pointer_ passing 320 without hitting 320.
switch(mode_) { switch(mode_) {
case 0: case 0:
reinterpret_cast<uint16_t *>(pixel_pointer_)[0] = mode0_output_[ram_[address]]; reinterpret_cast<uint16_t *>(pixel_pointer_)[0] = mode0_output_[ram_[address]];
@ -369,9 +370,14 @@ class CRTCBusHandler {
private: private:
void output_border(int length) { void output_border(int length) {
uint8_t *colour_pointer = static_cast<uint8_t *>(crt_.begin_data(1)); assert(length >= 0);
if(colour_pointer) *colour_pointer = border_; if(border_) {
crt_.output_level(length * 16); uint8_t *const colour_pointer = static_cast<uint8_t *>(crt_.begin_data(1));
if(colour_pointer) *colour_pointer = border_;
crt_.output_level(length * 16);
} else {
crt_.output_blank(length * 16);
}
} }
#define Mode0Colour0(c) ((c & 0x80) >> 7) | ((c & 0x20) >> 3) | ((c & 0x08) >> 2) | ((c & 0x02) << 2) #define Mode0Colour0(c) ((c & 0x80) >> 7) | ((c & 0x20) >> 3) | ((c & 0x08) >> 2) | ((c & 0x02) << 2)