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

Post pixel clock.

Browse Source
This commit is contained in:
Thomas Harte 2024-09-08 20:57:43 -04:00
parent 75db0018bc
commit 0efe649ca5
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,15 +16,15 @@ using namespace Electron;
VideoOutput::VideoOutput(const uint8_t *memory) : VideoOutput::VideoOutput(const uint8_t *memory) :
ram_(memory), ram_(memory),
crt_(128, crt_(h_total,
1, 1,
Outputs::Display::Type::PAL50, Outputs::Display::Type::PAL50,
Outputs::Display::InputDataType::Red1Green1Blue1) { Outputs::Display::InputDataType::Red1Green1Blue1) {
crt_.set_visible_area(crt_.get_rect_for_area( crt_.set_visible_area(crt_.get_rect_for_area(
312 - vsync_end, 312 - vsync_end,
256, 256,
(h_total - hsync_end) >> 3, h_total - hsync_end,
80, 80 * 8,
4.0f / 3.0f 4.0f / 3.0f
)); ));
} }
@ -56,8 +56,8 @@ uint8_t VideoOutput::run_for(const Cycles cycles) {
// reverse-engineering of the Electron ULA. It should therefore be as accurate to the // reverse-engineering of the Electron ULA. It should therefore be as accurate to the
// original hardware as my comprehension of VHDL and adaptation into sequential code allows. // original hardware as my comprehension of VHDL and adaptation into sequential code allows.
// Horizontal and vertical counter updates. // Horizontal and vertical counter updates; code below should act
const bool is_v_end = v_count_ == v_total(); const bool is_v_end = this->is_v_end();
h_count_ += 8; h_count_ += 8;
if(h_count_ == h_total) { if(h_count_ == h_total) {
h_count_ = 0; h_count_ = 0;
@ -161,7 +161,7 @@ uint8_t VideoOutput::run_for(const Cycles cycles) {
initial_output_target_ = current_output_target_ = crt_.begin_data(static_cast<size_t>(screen_pitch_)); initial_output_target_ = current_output_target_ = crt_.begin_data(static_cast<size_t>(screen_pitch_));
} }
} }
++output_length_; output_length_ += 8;
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_];

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

@ -171,5 +171,10 @@ class VideoOutput {
bool in_blank() const { bool in_blank() const {
return h_count_ >= h_active || (mode_text_ && v_count_ >= v_active_txt) || (!mode_text_ && v_count_ >= v_active_gph) || char_row_ >= 8; return h_count_ >= h_active || (mode_text_ && v_count_ >= v_active_txt) || (!mode_text_ && v_count_ >= v_active_gph) || char_row_ >= 8;
}}; }
bool is_v_end() const {
return v_count_ == v_total();
}
};
} }