6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-01 14:29:51 +00:00
Code Issues Projects Releases Wiki Activity

Produces a static white box, at least.

Browse Source
This commit is contained in:
Thomas Harte 2021-07-26 18:51:01 -04:00
parent 7894b50321
commit 3832acf6e3
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Machines/Amiga/Chipset.cpp
View File

@ -52,8 +52,6 @@ Chipset::Changes Chipset::run_for(HalfCycles length) {
int line_pixels = std::min(pixels_remaining, line_length_ - x_); int line_pixels = std::min(pixels_remaining, line_length_ - x_);
pixels_remaining -= line_pixels; pixels_remaining -= line_pixels;
// TODO: what is correct output between current position and x_ + line_pixels?
// Hardware stop is at 0x18; // Hardware stop is at 0x18;
// 12/64 * 227 = 42.5625 // 12/64 * 227 = 42.5625
// //
@ -69,7 +67,6 @@ Chipset::Changes Chipset::run_for(HalfCycles length) {
// 3 cycles blank; // 3 cycles blank;
// 9 cycles colour burst; // 9 cycles colour burst;
// 7 cycles blank. // 7 cycles blank.
constexpr int blank1 = 7; constexpr int blank1 = 7;
constexpr int sync = 17 + blank1; constexpr int sync = 17 + blank1;
constexpr int blank2 = 3 + sync; constexpr int blank2 = 3 + sync;
@ -77,32 +74,44 @@ Chipset::Changes Chipset::run_for(HalfCycles length) {
constexpr int blank3 = 7 + burst; constexpr int blank3 = 7 + burst;
static_assert(blank3 == 43); static_assert(blank3 == 43);
const int final_x = x_ + line_pixels;
// Output the correct sequence of blanks, syncs and burst atomically.
#define LINK(location, action, length) \ #define LINK(location, action, length) \
if(x_ < (location) && final_x >= (location)) { \ if(x_ < (location) && final_x >= (location)) { \
crt_.action((length) * 4); \ crt_.action((length) * 4); \
} }
LINK(blank1, output_blank, blank1); const int final_x = x_ + line_pixels;
LINK(sync, output_sync, sync - blank1); if(y_ < vertical_blank_height_) {
LINK(blank2, output_sync, blank2 - sync); // Put three lines of sync at the centre of the vertical blank period.
LINK(burst, output_default_colour_burst, burst - blank2); // TODO: only if colour enabled. // TODO: offset by half a line if interlaced.
LINK(blank3, output_sync, blank3 - burst);
#undef LINK const int midline = vertical_blank_height_ >> 1;
if(y_ < midline - 1 || y_ > midline + 1) {
// Output generic white to fill the rest of the line. LINK(blank1, output_blank, blank1);
if(final_x > blank3) { LINK(sync, output_sync, sync - blank1);
const int start_x = std::max(blank3, x_); LINK(line_length_, output_blank, line_length_ - sync);
} else {
uint16_t *const pixels = reinterpret_cast<uint16_t *>(crt_.begin_data(2)); LINK(blank1, output_sync, blank1);
if(pixels) { LINK(sync, output_blank, sync - blank1);
*pixels = 0xffff; LINK(line_length_, output_sync, line_length_ - sync);
}
} else {
// Output the correct sequence of blanks, syncs and burst atomically.
LINK(blank1, output_blank, blank1);
LINK(sync, output_sync, sync - blank1);
LINK(blank2, output_blank, blank2 - sync);
LINK(burst, output_default_colour_burst, burst - blank2); // TODO: only if colour enabled.
LINK(blank3, output_blank, blank3 - burst);
// Output generic white to fill the rest of the line.
if(final_x > blank3) {
const int start_x = std::max(blank3, x_);
uint16_t *const pixels = reinterpret_cast<uint16_t *>(crt_.begin_data(2));
if(pixels) {
*pixels = 0xffff;
}
crt_.output_data((final_x - start_x) * 4, 1);
} }
crt_.output_data((final_x - start_x) * 4, 1);
} }
// Advance intraline counter and possibly ripple upwards into // Advance intraline counter and possibly ripple upwards into
@ -123,7 +132,7 @@ Chipset::Changes Chipset::run_for(HalfCycles length) {
} }
} }
} }
#undef LINK
changes.interrupt_level = interrupt_level_; changes.interrupt_level = interrupt_level_;
return changes; return changes;

1
Machines/Amiga/Chipset.hpp
View File

@ -79,6 +79,7 @@ class Chipset {
int x_ = 0, y_ = 0; int x_ = 0, y_ = 0;
int line_length_ = 227; int line_length_ = 227;
int frame_height_ = 312; int frame_height_ = 312;
int vertical_blank_height_ = 29;
uint16_t display_window_start_[2] = {0, 0}; uint16_t display_window_start_[2] = {0, 0};
uint16_t display_window_stop_[2] = {0, 0}; uint16_t display_window_stop_[2] = {0, 0};