mirror of
https://github.com/TomHarte/CLK.git
synced 2024-07-15 15:29:53 +00:00
Merge pull request #1082 from TomHarte/BlitterBugSearch
Partially enable serialised blitter.
This commit is contained in:
Thomas Harte
GitHub
commit
38a509bc20
@ -241,10 +241,25 @@ bool Blitter<record_bus>::advance_dma() {
|
||||
// TODO: eliminate @c complete_immediately and this workaround.
|
||||
// See commentary in Chipset.cpp.
|
||||
if constexpr (complete_immediately) {
|
||||
while(get_status() & 0x4000) {
|
||||
advance_dma<false>();
|
||||
|
||||
// HACK! HACK!! HACK!!!
|
||||
//
|
||||
// This resolves an issue with loading the particular copy of Spindizzy Worlds
|
||||
// I am testing against.
|
||||
//
|
||||
// TODO: DO NOT PUBLISH THIS.
|
||||
//
|
||||
// This is committed solely so that I can continue researching the real, underlying
|
||||
// issue across machines. It would not be acceptable to me to ship this.
|
||||
// (and the printf is another reminder-to-self)
|
||||
if(width_ == 8 && height_ == 32) {
|
||||
printf("Accelerating %d x %d\n", width_, height_);
|
||||
|
||||
while(get_status() & 0x4000) {
|
||||
advance_dma<false>();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
if(line_mode_) {
|
||||
|
||||
@ -15,159 +15,11 @@
|
||||
#include <vector>
|
||||
|
||||
#include "../../ClockReceiver/ClockReceiver.hpp"
|
||||
#include "BlitterSequencer.hpp"
|
||||
#include "DMADevice.hpp"
|
||||
|
||||
namespace Amiga {
|
||||
|
||||
/*!
|
||||
Statefully provides the next access the Blitter should make.
|
||||
|
||||
TODO: determine the actual logic here, rather than
|
||||
relying on tables.
|
||||
*/
|
||||
class BlitterSequencer {
|
||||
public:
|
||||
enum class Channel {
|
||||
/// Tells the caller to calculate and load a new piece of output
|
||||
/// into the output pipeline.
|
||||
///
|
||||
/// If any inputs are enabled then a one-slot output pipeline applies:
|
||||
/// output will rest in the pipeline for one write phase before being written.
|
||||
Write,
|
||||
/// Indicates that a write should occur if anything is in the pipeline, otherwise
|
||||
/// no activity should occur.
|
||||
FlushPipeline,
|
||||
/// The caller should read from channel C.
|
||||
C,
|
||||
/// The caller should read from channel B.
|
||||
B,
|
||||
/// The caller should read from channel A.
|
||||
A,
|
||||
/// Indicates an unused DMA slot.
|
||||
None
|
||||
};
|
||||
|
||||
/// Sets the current control value, which indicates which
|
||||
/// channels are enabled.
|
||||
void set_control(int control) {
|
||||
control_ = control & 0xf;
|
||||
index_ = 0; // TODO: this probably isn't accurate; case caught is a change
|
||||
// of control values during a blit.
|
||||
}
|
||||
|
||||
/// Indicates that blitting should conclude after this step, i.e.
|
||||
/// whatever is being fetched now is part of the final set of input data;
|
||||
/// this is safe to call following a fetch request on any channel.
|
||||
void complete() {
|
||||
next_phase_ =
|
||||
(control_ == 0x9 || control_ == 0xb || control_ == 0xd) ?
|
||||
Phase::PauseAndComplete : Phase::Complete;
|
||||
}
|
||||
|
||||
/// Begins a blit operation.
|
||||
void begin() {
|
||||
phase_ = next_phase_ = Phase::Ongoing;
|
||||
index_ = loop_ = 0;
|
||||
}
|
||||
|
||||
/// Provides the next channel to fetch from, or that a write is required,
|
||||
/// along with a count of complete channel iterations so far completed.
|
||||
std::pair<Channel, int> next() {
|
||||
switch(phase_) {
|
||||
default: break;
|
||||
|
||||
case Phase::Complete:
|
||||
return std::make_pair(Channel::FlushPipeline, loop_);
|
||||
|
||||
case Phase::PauseAndComplete:
|
||||
phase_ = Phase::Complete;
|
||||
return std::make_pair(Channel::None, loop_);
|
||||
}
|
||||
|
||||
Channel next = Channel::None;
|
||||
|
||||
switch(control_) {
|
||||
default: break;
|
||||
|
||||
case 0: next = next_channel(pattern0); break;
|
||||
case 1: next = next_channel(pattern1); break;
|
||||
case 2: next = next_channel(pattern2); break;
|
||||
case 3: next = next_channel(pattern3); break;
|
||||
case 4: next = next_channel(pattern4); break;
|
||||
case 5: next = next_channel(pattern5); break;
|
||||
case 6: next = next_channel(pattern6); break;
|
||||
case 7: next = next_channel(pattern7); break;
|
||||
case 8: next = next_channel(pattern8); break;
|
||||
case 9: next = next_channel(pattern9); break;
|
||||
case 10: next = next_channel(patternA); break;
|
||||
case 11: next = next_channel(patternB); break;
|
||||
case 12: next = next_channel(patternC); break;
|
||||
case 13: next = next_channel(patternD); break;
|
||||
case 14: next = next_channel(patternE); break;
|
||||
case 15: next = next_channel(patternF); break;
|
||||
}
|
||||
|
||||
return std::make_pair(next, loop_);
|
||||
}
|
||||
|
||||
template <int channel> bool channel_enabled() {
|
||||
return control_ & (8 >> channel);
|
||||
}
|
||||
|
||||
private:
|
||||
static constexpr std::array<Channel, 1> pattern0 = { Channel::None };
|
||||
static constexpr std::array<Channel, 2> pattern1 = { Channel::Write, Channel::None };
|
||||
static constexpr std::array<Channel, 2> pattern2 = { Channel::C, Channel::None };
|
||||
static constexpr std::array<Channel, 3> pattern3 = { Channel::C, Channel::Write, Channel::None };
|
||||
static constexpr std::array<Channel, 3> pattern4 = { Channel::B, Channel::None, Channel::None };
|
||||
static constexpr std::array<Channel, 3> pattern5 = { Channel::B, Channel::Write, Channel::None };
|
||||
static constexpr std::array<Channel, 3> pattern6 = { Channel::B, Channel::C, Channel::None };
|
||||
static constexpr std::array<Channel, 4> pattern7 = { Channel::B, Channel::C, Channel::Write, Channel::None };
|
||||
static constexpr std::array<Channel, 2> pattern8 = { Channel::A, Channel::None };
|
||||
static constexpr std::array<Channel, 2> pattern9 = { Channel::A, Channel::Write };
|
||||
static constexpr std::array<Channel, 2> patternA = { Channel::A, Channel::C };
|
||||
static constexpr std::array<Channel, 3> patternB = { Channel::A, Channel::C, Channel::Write };
|
||||
static constexpr std::array<Channel, 3> patternC = { Channel::A, Channel::B, Channel::None };
|
||||
static constexpr std::array<Channel, 3> patternD = { Channel::A, Channel::B, Channel::Write };
|
||||
static constexpr std::array<Channel, 3> patternE = { Channel::A, Channel::B, Channel::C };
|
||||
static constexpr std::array<Channel, 4> patternF = { Channel::A, Channel::B, Channel::C, Channel::Write };
|
||||
template <typename ArrayT> Channel next_channel(const ArrayT &list) {
|
||||
loop_ += index_ / list.size();
|
||||
index_ %= list.size();
|
||||
const Channel result = list[index_];
|
||||
++index_;
|
||||
if(index_ == list.size()) {
|
||||
phase_ = next_phase_;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Current control flags, i.e. which channels are enabled.
|
||||
int control_ = 0;
|
||||
|
||||
// Index into the pattern table for this blit.
|
||||
size_t index_ = 0;
|
||||
|
||||
// Number of times the entire pattern table has been completed.
|
||||
int loop_ = 0;
|
||||
|
||||
enum class Phase {
|
||||
/// Return the next thing in the pattern table and advance.
|
||||
/// If looping from the end of the pattern table to the start,
|
||||
/// set phase_ to next_phase_.
|
||||
Ongoing,
|
||||
/// Return a Channel::None and advancce to phase_ = Phase::Complete.
|
||||
PauseAndComplete,
|
||||
/// Return Channel::Write indefinitely.
|
||||
Complete
|
||||
};
|
||||
|
||||
// Current sequencer pahse.
|
||||
Phase phase_ = Phase::Complete;
|
||||
// Phase to assume at the end of this iteration of the sequence table.
|
||||
Phase next_phase_ = Phase::Complete;
|
||||
};
|
||||
|
||||
/*!
|
||||
If @c record_bus is @c true then all bus interactions will be recorded
|
||||
and can subsequently be retrieved. This is included for testing purposes.
|
||||
@ -176,6 +28,13 @@ template <bool record_bus = false> class Blitter: public DMADevice<4, 4> {
|
||||
public:
|
||||
using DMADevice::DMADevice;
|
||||
|
||||
template <int id, int shift> void set_pointer(uint16_t value) {
|
||||
if(get_status() & 0x4000) {
|
||||
printf(">>>");
|
||||
}
|
||||
DMADevice<4, 4>::set_pointer<id, shift>(value);
|
||||
}
|
||||
|
||||
// Various setters; it's assumed that address decoding is handled externally.
|
||||
//
|
||||
// In all cases where a channel is identified numerically, it's taken that
|
||||
|
||||
167
Machines/Amiga/BlitterSequencer.hpp
Normal file
167
Machines/Amiga/BlitterSequencer.hpp
Normal file
@ -0,0 +1,167 @@
|
||||
//
|
||||
// BlitterSequencer.hpp
|
||||
// Clock Signal
|
||||
//
|
||||
// Created by Thomas Harte on 19/08/2022.
|
||||
// Copyright © 2022 Thomas Harte. All rights reserved.
|
||||
//
|
||||
|
||||
#ifndef BlitterSequencer_hpp
|
||||
#define BlitterSequencer_hpp
|
||||
|
||||
#include <array>
|
||||
|
||||
namespace Amiga {
|
||||
|
||||
/*!
|
||||
Statefully provides the next access the Blitter should make.
|
||||
|
||||
TODO: determine the actual logic here, rather than
|
||||
relying on tables.
|
||||
*/
|
||||
class BlitterSequencer {
|
||||
public:
|
||||
enum class Channel {
|
||||
/// Tells the caller to calculate and load a new piece of output
|
||||
/// into the output pipeline.
|
||||
///
|
||||
/// If any inputs are enabled then a one-slot output pipeline applies:
|
||||
/// output will rest in the pipeline for one write phase before being written.
|
||||
Write,
|
||||
/// Indicates that a write should occur if anything is in the pipeline, otherwise
|
||||
/// no activity should occur.
|
||||
FlushPipeline,
|
||||
/// The caller should read from channel C.
|
||||
C,
|
||||
/// The caller should read from channel B.
|
||||
B,
|
||||
/// The caller should read from channel A.
|
||||
A,
|
||||
/// Indicates an unused DMA slot.
|
||||
None
|
||||
};
|
||||
|
||||
/// Sets the current control value, which indicates which
|
||||
/// channels are enabled.
|
||||
void set_control(int control) {
|
||||
control_ = control & 0xf;
|
||||
index_ = 0; // TODO: this probably isn't accurate; case caught is a change
|
||||
// of control values during a blit.
|
||||
}
|
||||
|
||||
/// Indicates that blitting should conclude after this step, i.e.
|
||||
/// whatever is being fetched now is part of the final set of input data;
|
||||
/// this is safe to call following a fetch request on any channel.
|
||||
void complete() {
|
||||
next_phase_ =
|
||||
(control_ == 0x9 || control_ == 0xb || control_ == 0xd) ?
|
||||
Phase::PauseAndComplete : Phase::Complete;
|
||||
}
|
||||
|
||||
/// Begins a blit operation.
|
||||
void begin() {
|
||||
phase_ = next_phase_ = Phase::Ongoing;
|
||||
index_ = loop_ = 0;
|
||||
}
|
||||
|
||||
/// Provides the next channel to fetch from, or that a write is required,
|
||||
/// along with a count of complete channel iterations so far completed.
|
||||
std::pair<Channel, int> next() {
|
||||
switch(phase_) {
|
||||
default: break;
|
||||
|
||||
case Phase::Complete:
|
||||
return std::make_pair(Channel::FlushPipeline, loop_);
|
||||
|
||||
case Phase::PauseAndComplete:
|
||||
phase_ = Phase::Complete;
|
||||
return std::make_pair(Channel::None, loop_);
|
||||
}
|
||||
|
||||
Channel next = Channel::None;
|
||||
|
||||
switch(control_) {
|
||||
default: break;
|
||||
|
||||
case 0: next = next_channel(pattern0); break;
|
||||
case 1: next = next_channel(pattern1); break;
|
||||
case 2: next = next_channel(pattern2); break;
|
||||
case 3: next = next_channel(pattern3); break;
|
||||
case 4: next = next_channel(pattern4); break;
|
||||
case 5: next = next_channel(pattern5); break;
|
||||
case 6: next = next_channel(pattern6); break;
|
||||
case 7: next = next_channel(pattern7); break;
|
||||
case 8: next = next_channel(pattern8); break;
|
||||
case 9: next = next_channel(pattern9); break;
|
||||
case 10: next = next_channel(patternA); break;
|
||||
case 11: next = next_channel(patternB); break;
|
||||
case 12: next = next_channel(patternC); break;
|
||||
case 13: next = next_channel(patternD); break;
|
||||
case 14: next = next_channel(patternE); break;
|
||||
case 15: next = next_channel(patternF); break;
|
||||
}
|
||||
|
||||
return std::make_pair(next, loop_);
|
||||
}
|
||||
|
||||
template <int channel> bool channel_enabled() {
|
||||
return control_ & (8 >> channel);
|
||||
}
|
||||
|
||||
private:
|
||||
static constexpr std::array<Channel, 1> pattern0 = { Channel::None };
|
||||
static constexpr std::array<Channel, 2> pattern1 = { Channel::Write, Channel::None };
|
||||
static constexpr std::array<Channel, 2> pattern2 = { Channel::C, Channel::None };
|
||||
static constexpr std::array<Channel, 3> pattern3 = { Channel::C, Channel::Write, Channel::None };
|
||||
static constexpr std::array<Channel, 3> pattern4 = { Channel::B, Channel::None, Channel::None };
|
||||
static constexpr std::array<Channel, 3> pattern5 = { Channel::B, Channel::Write, Channel::None };
|
||||
static constexpr std::array<Channel, 3> pattern6 = { Channel::B, Channel::C, Channel::None };
|
||||
static constexpr std::array<Channel, 4> pattern7 = { Channel::B, Channel::C, Channel::Write, Channel::None };
|
||||
static constexpr std::array<Channel, 2> pattern8 = { Channel::A, Channel::None };
|
||||
static constexpr std::array<Channel, 2> pattern9 = { Channel::A, Channel::Write };
|
||||
static constexpr std::array<Channel, 2> patternA = { Channel::A, Channel::C };
|
||||
static constexpr std::array<Channel, 3> patternB = { Channel::A, Channel::C, Channel::Write };
|
||||
static constexpr std::array<Channel, 3> patternC = { Channel::A, Channel::B, Channel::None };
|
||||
static constexpr std::array<Channel, 3> patternD = { Channel::A, Channel::B, Channel::Write };
|
||||
static constexpr std::array<Channel, 3> patternE = { Channel::A, Channel::B, Channel::C };
|
||||
static constexpr std::array<Channel, 4> patternF = { Channel::A, Channel::B, Channel::C, Channel::Write };
|
||||
template <typename ArrayT> Channel next_channel(const ArrayT &list) {
|
||||
loop_ += index_ / list.size();
|
||||
index_ %= list.size();
|
||||
const Channel result = list[index_];
|
||||
++index_;
|
||||
if(index_ == list.size()) {
|
||||
phase_ = next_phase_;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Current control flags, i.e. which channels are enabled.
|
||||
int control_ = 0;
|
||||
|
||||
// Index into the pattern table for this blit.
|
||||
size_t index_ = 0;
|
||||
|
||||
// Number of times the entire pattern table has been completed.
|
||||
int loop_ = 0;
|
||||
|
||||
enum class Phase {
|
||||
/// Return the next thing in the pattern table and advance.
|
||||
/// If looping from the end of the pattern table to the start,
|
||||
/// set phase_ to next_phase_.
|
||||
Ongoing,
|
||||
/// Return a Channel::None and advancce to phase_ = Phase::Complete.
|
||||
PauseAndComplete,
|
||||
/// Return Channel::Write indefinitely.
|
||||
Complete
|
||||
};
|
||||
|
||||
// Current sequencer pahse.
|
||||
Phase phase_ = Phase::Complete;
|
||||
// Phase to assume at the end of this iteration of the sequence table.
|
||||
Phase next_phase_ = Phase::Complete;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif /* BlitterSequencer_hpp */
|
||||
@ -590,7 +590,7 @@ template <int cycle, bool stop_if_cpu> bool Chipset::perform_cycle() {
|
||||
// Blitter and CPU priority is dealt with below.
|
||||
if constexpr (cycle >= 0x00 && cycle < 0x08) {
|
||||
// Memory refresh, four slots per line.
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
if constexpr (cycle >= 0x08 && cycle < 0x0e) {
|
||||
|
||||
@ -1359,6 +1359,7 @@
|
||||
4B4A762F1DB1A3FA007AAE2E /* AY38910.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = AY38910.hpp; sourceTree = "<group>"; };
|
||||
4B4B1A3A200198C900A0F866 /* KonamiSCC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KonamiSCC.cpp; sourceTree = "<group>"; };
|
||||
4B4B1A3B200198C900A0F866 /* KonamiSCC.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = KonamiSCC.hpp; sourceTree = "<group>"; };
|
||||
4B4C81C228B0288B00F84AE9 /* BlitterSequencer.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = BlitterSequencer.hpp; sourceTree = "<group>"; };
|
||||
4B4DC81F1D2C2425003C5BF8 /* Vic20.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vic20.cpp; sourceTree = "<group>"; };
|
||||
4B4DC8201D2C2425003C5BF8 /* Vic20.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Vic20.hpp; sourceTree = "<group>"; };
|
||||
4B4DC8271D2C2470003C5BF8 /* C1540.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = C1540.hpp; sourceTree = "<group>"; };
|
||||
@ -4440,6 +4441,7 @@
|
||||
4B2130E1273A7A0A008A77B4 /* Audio.hpp */,
|
||||
4B7C681D2751A104001671EC /* Bitplanes.hpp */,
|
||||
4B9EC0E026AA260C0060A31F /* Blitter.hpp */,
|
||||
4B4C81C228B0288B00F84AE9 /* BlitterSequencer.hpp */,
|
||||
4B9EC0E526AA4A660060A31F /* Chipset.hpp */,
|
||||
4BC6236B26F4224300F83DFE /* Copper.hpp */,
|
||||
4BC6236A26F178DA00F83DFE /* DMADevice.hpp */,
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
#import <XCTest/XCTest.h>
|
||||
|
||||
#include "Blitter.hpp"
|
||||
#include "BlitterSequencer.hpp"
|
||||
#include "NSData+dataWithContentsOfGZippedFile.h"
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user