6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-25 18:30:07 +00:00
Code Issues Projects Releases Wiki Activity

Advance to the next breaking point.

Browse Source
This commit is contained in:
Thomas Harte 2023-02-04 11:43:06 -05:00
parent ab595f5e8d
commit a892523c09
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,8 +204,12 @@ template <Personality personality> struct Storage<personality, std::enable_if_t<
enum class CommandStep {
None,
ReadPixel,
ReadSourcePixel,
ReadDestinationPixel,
WritePixel,
ReadSourceByte,
WriteByte,
};
CommandStep next_command_step_ = CommandStep::None;
@ -225,13 +229,21 @@ template <Personality personality> struct Storage<personality, std::enable_if_t<
minimum_command_column_ = current_column + command_->cycles;
switch(command_->access) {
case Command::AccessType::PlotPoint:
next_command_step_ = CommandStep::ReadPixel;
case Command::AccessType::CopyPoint:
next_command_step_ = CommandStep::ReadSourcePixel;
break;
case Command::AccessType::PlotPoint:
next_command_step_ = CommandStep::ReadDestinationPixel;
break;
case Command::AccessType::WaitForColourReceipt:
// i.e. nothing to do until a colour is received.
next_command_step_ = CommandStep::None;
break;
case Command::AccessType::CopyByte:
next_command_step_ = CommandStep::ReadSourceByte;
break;
case Command::AccessType::WriteByte:
next_command_step_ = CommandStep::WriteByte;
break;
@ -713,7 +725,17 @@ template <Personality personality> struct Base: public Storage<personality> {
case CommandStep::None:
break;
case CommandStep::ReadPixel:
case CommandStep::ReadSourcePixel:
// TODO: the read as below, but to an appropriate piece of temporary colour
// storage; per the manual the colour register is unchanged, so I can't just
// put it there.
// Storage<personality>::command_latch_ = ram_[command_address(context.source)];
Storage<personality>::minimum_command_column_ = access_column + 32;
Storage<personality>::next_command_step_ = CommandStep::ReadDestinationPixel;
break;
case CommandStep::ReadDestinationPixel:
Storage<personality>::command_latch_ = ram_[command_address(context.destination)];
Storage<personality>::minimum_command_column_ = access_column + 24;
@ -755,6 +777,14 @@ template <Personality personality> struct Base: public Storage<personality> {
Storage<personality>::update_command_step(access_column);
} break;
case CommandStep::ReadSourceByte:
// TODO: the read as below, and store somewhere for future write.
// Storage<personality>::command_latch_ = ram_[command_address(context.source)];
Storage<personality>::minimum_command_column_ = access_column + 24;
Storage<personality>::next_command_step_ = CommandStep::WriteByte;
break;
case CommandStep::WriteByte:
ram_[command_address(context.destination)] = context.colour;
Storage<personality>::command_->advance(pixels_per_byte(this->underlying_mode_));