6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-25 01:32:55 +00:00
Code Issues Projects Releases Wiki Activity

Apply modulos at end of final line.

Browse Source 
Possibly I need to rethink the sequence logic?
This commit is contained in:
Thomas Harte 2022-07-30 21:35:26 -04:00
parent 4fb9dec381
commit 511ec5a736
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Machines/Amiga/Blitter.cpp
View File

@ -220,6 +220,13 @@ uint16_t Blitter::get_status() {
// //
// Table 6-2: Typical Blitter Cycle Sequence // Table 6-2: Typical Blitter Cycle Sequence
void Blitter::add_modulos() {
pointer_[0] += modulos_[0] * channel_enables_[0] * direction_;
pointer_[1] += modulos_[1] * channel_enables_[1] * direction_;
pointer_[2] += modulos_[2] * channel_enables_[2] * direction_;
pointer_[3] += modulos_[3] * channel_enables_[3] * direction_;
}
bool Blitter::advance_dma() { bool Blitter::advance_dma() {
if(!height_) return false; if(!height_) return false;
@ -358,12 +365,10 @@ bool Blitter::advance_dma() {
transient_a_mask_ = x_ ? 0xffff : a_mask_[0]; transient_a_mask_ = x_ ? 0xffff : a_mask_[0];
// Check whether an entire row was completed in the previous iteration. // Check whether an entire row was completed in the previous iteration.
// If so then add modulos. // If so then add modulos. Though this won't capture the move off the
// final line, so that's handled elsewhere.
if(!x_ && y_) { if(!x_ && y_) {
pointer_[0] += modulos_[0] * channel_enables_[0] * direction_; add_modulos();
pointer_[1] += modulos_[1] * channel_enables_[1] * direction_;
pointer_[2] += modulos_[2] * channel_enables_[2] * direction_;
pointer_[3] += modulos_[3] * channel_enables_[3] * direction_;
} }
++x_; ++x_;
@ -393,6 +398,7 @@ bool Blitter::advance_dma() {
pointer_[2] += direction_; pointer_[2] += direction_;
return true; return true;
case Channel::FlushPipeline: case Channel::FlushPipeline:
add_modulos();
posit_interrupt(InterruptFlag::Blitter); posit_interrupt(InterruptFlag::Blitter);
height_ = 0; height_ = 0;
busy_ = false; busy_ = false;

2
Machines/Amiga/Blitter.hpp
View File

@ -217,6 +217,8 @@ class Blitter: public DMADevice<4, 4> {
uint16_t transient_a_mask_; uint16_t transient_a_mask_;
bool busy_ = false; bool busy_ = false;
int loop_index_ = -1; int loop_index_ = -1;
void add_modulos();
}; };
} }