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

That's PSET, not POINT.

Browse Source
This commit is contained in:
Thomas Harte 2023-01-26 22:02:40 -05:00
parent 515fa22bfe
commit 9a65fffe16
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -843,20 +843,17 @@ void Base<personality>::commit_register(int reg, uint8_t value) {
// b0–b3: LO0–LO3 (???)
// b4–b7: CM0-CM3 (???)
#define Begin(x) Storage<personality>::command_ = std::make_unique<Commands::x>(Storage<personality>::command_context_);
switch(value >> 4) {
// All codes not listed below are invalid; just abandon
// whatever's going on, if anything.
default: Storage<personality>::command_ = nullptr;
case 0b0000: break; // TODO: stop.
case 0b0100:
Storage<personality>::command_ = std::make_unique<Commands::Point>(Storage<personality>::command_context_);
break;
case 0b0101: break; // TODO: pset.
case 0b0100: break; // TODO: point.
case 0b0101: Begin(PointSet); break;
case 0b0110: break; // TODO: srch.
case 0b0111:
Storage<personality>::command_ = std::make_unique<Commands::Line>(Storage<personality>::command_context_);
break;
case 0b0111: Begin(Line); break;
case 0b1000: break; // TODO: lmmv.
case 0b1001: break; // TODO: lmmm.
@ -868,6 +865,7 @@ void Base<personality>::commit_register(int reg, uint8_t value) {
case 0b1110: break; // TODO: ymmm.
case 0b1111: break; // TODO: hmmc.
}
#undef Begin
// Seed timing information if a command was found.
if(Storage<personality>::command_) {
@ -884,7 +882,7 @@ void Base<personality>::commit_register(int reg, uint8_t value) {
packed_colour |= packed_colour << 4;
while(!Storage<personality>::command_->done()) {
const int address =
const unsigned int address =
(Storage<personality>::command_->location.v[0] >> 2) +
(Storage<personality>::command_->location.v[1] << 7);

20
Components/9918/Implementation/YamahaCommands.hpp
View File

@ -63,14 +63,14 @@ struct Command {
virtual bool done() = 0;
/// Repopulates the fields above with the next action to take.
virtual void advance() {}
virtual void advance() = 0;
};
// MARK: - Line drawing.
namespace Commands {
/// Implements the line command, which is plain-old Bresenham.
/// Implements the LINE command, which is plain-old Bresenham.
///
/// Per Grauw timing is:
///
@ -125,17 +125,27 @@ struct Line: public Command {
Vector major_, minor_;
};
struct Point: public Command {
/// Implements the PSET command, which plots a single pixel.
///
/// No timings are documented, so this'll output as quickly as possible.
struct PointSet: public Command {
public:
Point(CommandContext &context) : Command(context) {
PointSet(CommandContext &context) : Command(context) {
cycles = 0;
access = AccessType::PlotPoint;
location = context.destination;
}
bool done() final {
return true;
return done_;
}
void advance() final {
done_ = true;
}
private:
bool done_ = false;
};
}