6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-10-01 13:58:20 +00:00
Code Issues Projects Releases Wiki Activity

Hack in vertical scrolling.

Browse Source
This commit is contained in:
Thomas Harte 2023-01-26 21:38:51 -05:00
parent 1bf8406e7e
commit 5d5098acb2
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Components/9918/Implementation/9918.cpp
View File

@ -200,28 +200,32 @@ void TMS9918<personality>::run_for(const HalfCycles cycles) {
// ------------------------ // ------------------------
// Perform memory accesses. // Perform memory accesses.
// ------------------------ // ------------------------
#define fetch(function, clock) { \ #define fetch(function, clock, offset) { \
const int first_window = from_internal<personality, clock>(this->fetch_pointer_.column);\ const int first_window = from_internal<personality, clock>(this->fetch_pointer_.column);\
const int final_window = from_internal<personality, clock>(end_column); \ const int final_window = from_internal<personality, clock>(end_column); \
if(first_window == final_window) break; \ if(first_window == final_window) break; \
if(final_window != clock_rate<personality, clock>()) { \ if(final_window != clock_rate<personality, clock>()) { \
function<true>( \ function<true>( \
this->line_buffers_[this->fetch_pointer_.row], this->fetch_pointer_.row, \ this->line_buffers_[this->fetch_pointer_.row], this->fetch_pointer_.row + offset, \
first_window, final_window); \ first_window, final_window); \
} else { \ } else { \
function<false>( \ function<false>( \
this->line_buffers_[this->fetch_pointer_.row], this->fetch_pointer_.row, \ this->line_buffers_[this->fetch_pointer_.row], this->fetch_pointer_.row + offset, \
first_window, final_window); \ first_window, final_window); \
} \ } \
} }
switch(line_buffer.line_mode) { switch(line_buffer.line_mode) {
case LineMode::Text: fetch(this->template fetch_tms_text, Clock::TMSMemoryWindow); break; case LineMode::Text: fetch(this->template fetch_tms_text, Clock::TMSMemoryWindow, 0); break;
case LineMode::Character: fetch(this->template fetch_tms_character, Clock::TMSMemoryWindow); break; case LineMode::Character: fetch(this->template fetch_tms_character, Clock::TMSMemoryWindow, 0); break;
case LineMode::SMS: fetch(this->template fetch_sms, Clock::TMSMemoryWindow); break; case LineMode::SMS: fetch(this->template fetch_sms, Clock::TMSMemoryWindow, 0); break;
case LineMode::Refresh: fetch(this->template fetch_tms_refresh, Clock::TMSMemoryWindow); break; case LineMode::Refresh: fetch(this->template fetch_tms_refresh, Clock::TMSMemoryWindow, 0); break;
case LineMode::Yamaha: fetch(this->template fetch_yamaha, Clock::Internal); break; case LineMode::Yamaha:
if constexpr (is_yamaha_vdp(personality)) {
fetch(this->template fetch_yamaha, Clock::Internal, Storage<personality>::vertical_offset_);
}
break;
} }
#undef fetch #undef fetch
@ -801,8 +805,7 @@ void Base<personality>::commit_register(int reg, uint8_t value) {
break; break;
case 23: case 23:
LOG("TODO: Yamaha vertical offset; " << PADHEX(2) << +value); Storage<personality>::vertical_offset_ = value;
// i.e. scrolling.
break; break;
case 32: Storage<personality>::command_context_.source.template set<0, false>(value); break; case 32: Storage<personality>::command_context_.source.template set<0, false>(value); break;

2
Components/9918/Implementation/9918Base.hpp
View File

@ -136,6 +136,8 @@ template <Personality personality> struct Storage<personality, std::enable_if_t<
uint8_t mode_ = 0; uint8_t mode_ = 0;
uint8_t vertical_offset_ = 0;
/// Describes an _observable_ memory access event. i.e. anything that it is safe /// Describes an _observable_ memory access event. i.e. anything that it is safe
/// (and convenient) to treat as atomic in between external slots. /// (and convenient) to treat as atomic in between external slots.
struct Event { struct Event {