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

Recasts the [M]FM parser in terms of the new factoring.

Browse Source 
Temporarily breaks SSD writing support.
This commit is contained in:
Thomas Harte 2017-09-29 20:08:36 -04:00
parent fe3cc5c57c
commit 698ffca51b
7 changed files with 60 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
StaticAnalyser/Acorn/Disk.cpp
View File

@ -19,8 +19,8 @@ std::unique_ptr<Catalogue> StaticAnalyser::Acorn::GetDFSCatalogue(const std::sha
std::unique_ptr<Catalogue> catalogue(new Catalogue); std::unique_ptr<Catalogue> catalogue(new Catalogue);
Storage::Encodings::MFM::Parser parser(false, disk); Storage::Encodings::MFM::Parser parser(false, disk);
std::shared_ptr<Storage::Encodings::MFM::Sector> names = parser.get_sector(0, 0, 0); Storage::Encodings::MFM::Sector *names = parser.get_sector(0, 0, 0);
std::shared_ptr<Storage::Encodings::MFM::Sector> details = parser.get_sector(0, 0, 1); Storage::Encodings::MFM::Sector *details = parser.get_sector(0, 0, 1);
if(!names || !details) return nullptr; if(!names || !details) return nullptr;
if(names->data.size() != 256 || details->data.size() != 256) return nullptr; if(names->data.size() != 256 || details->data.size() != 256) return nullptr;
@ -61,7 +61,7 @@ std::unique_ptr<Catalogue> StaticAnalyser::Acorn::GetDFSCatalogue(const std::sha
uint8_t track = (uint8_t)(start_sector / 10); uint8_t track = (uint8_t)(start_sector / 10);
start_sector++; start_sector++;
std::shared_ptr<Storage::Encodings::MFM::Sector> next_sector = parser.get_sector(0, track, sector); Storage::Encodings::MFM::Sector *next_sector = parser.get_sector(0, track, sector);
if(!next_sector) break; if(!next_sector) break;
long length_from_sector = std::min(data_length, 256l); long length_from_sector = std::min(data_length, 256l);
@ -77,13 +77,13 @@ std::unique_ptr<Catalogue> StaticAnalyser::Acorn::GetADFSCatalogue(const std::sh
std::unique_ptr<Catalogue> catalogue(new Catalogue); std::unique_ptr<Catalogue> catalogue(new Catalogue);
Storage::Encodings::MFM::Parser parser(true, disk); Storage::Encodings::MFM::Parser parser(true, disk);
std::shared_ptr<Storage::Encodings::MFM::Sector> free_space_map_second_half = parser.get_sector(0, 0, 1); Storage::Encodings::MFM::Sector *free_space_map_second_half = parser.get_sector(0, 0, 1);
if(!free_space_map_second_half) return nullptr; if(!free_space_map_second_half) return nullptr;
std::vector<uint8_t> root_directory; std::vector<uint8_t> root_directory;
root_directory.reserve(5 * 256); root_directory.reserve(5 * 256);
for(uint8_t c = 2; c < 7; c++) { for(uint8_t c = 2; c < 7; c++) {
std::shared_ptr<Storage::Encodings::MFM::Sector> sector = parser.get_sector(0, 0, c); Storage::Encodings::MFM::Sector *sector = parser.get_sector(0, 0, c);
if(!sector) return nullptr; if(!sector) return nullptr;
root_directory.insert(root_directory.end(), sector->data.begin(), sector->data.end()); root_directory.insert(root_directory.end(), sector->data.begin(), sector->data.end());
} }

2
StaticAnalyser/AmstradCPC/StaticAnalyser.cpp
View File

@ -152,7 +152,7 @@ static void InspectCatalogue(
static bool CheckBootSector(const std::shared_ptr<Storage::Disk::Disk> &disk, StaticAnalyser::Target &target) { static bool CheckBootSector(const std::shared_ptr<Storage::Disk::Disk> &disk, StaticAnalyser::Target &target) {
Storage::Encodings::MFM::Parser parser(true, disk); Storage::Encodings::MFM::Parser parser(true, disk);
std::shared_ptr<Storage::Encodings::MFM::Sector> boot_sector = parser.get_sector(0, 0, 0x41); Storage::Encodings::MFM::Sector *boot_sector = parser.get_sector(0, 0, 0x41);
if(boot_sector != nullptr) { if(boot_sector != nullptr) {
// Check that the first 64 bytes of the sector aren't identical; if they are then probably // Check that the first 64 bytes of the sector aren't identical; if they are then probably
// this disk was formatted and the filler byte never replaced. // this disk was formatted and the filler byte never replaced.

6
Storage/Disk/DiskImage/Formats/SSD.cpp
View File

@ -80,10 +80,10 @@ std::shared_ptr<Track> SSD::get_track_at_position(unsigned int head, unsigned in
} }
void SSD::set_track_at_position(unsigned int head, unsigned int position, const std::shared_ptr<Track> &track) { void SSD::set_track_at_position(unsigned int head, unsigned int position, const std::shared_ptr<Track> &track) {
std::vector<uint8_t> data; /* std::vector<uint8_t> data;
Storage::Encodings::MFM::Parser parser(false, track); Storage::Encodings::MFM::Parser parser(false, track);
for(unsigned int c = 0; c < 10; c++) { for(unsigned int c = 0; c < 10; c++) {
std::shared_ptr<Storage::Encodings::MFM::Sector> sector = parser.get_sector(0, (uint8_t)position, (uint8_t)c); Storage::Encodings::MFM::Sector *sector = parser.get_sector(0, (uint8_t)position, (uint8_t)c);
if(sector) { if(sector) {
data.insert(data.end(), sector->data.begin(), sector->data.end()); data.insert(data.end(), sector->data.begin(), sector->data.end());
} else { } else {
@ -98,5 +98,5 @@ void SSD::set_track_at_position(unsigned int head, unsigned int position, const
std::lock_guard<std::mutex> lock_guard(file_access_mutex_); std::lock_guard<std::mutex> lock_guard(file_access_mutex_);
ensure_file_is_at_least_length(file_offset); ensure_file_is_at_least_length(file_offset);
fseek(file_, file_offset, SEEK_SET); fseek(file_, file_offset, SEEK_SET);
fwrite(data.data(), 1, data.size(), file_); fwrite(data.data(), 1, data.size(), file_);*/
} }

222
Storage/Disk/Encodings/MFM/Parser.cpp
View File

@ -9,218 +9,50 @@
#include "Parser.hpp" #include "Parser.hpp"
#include "Constants.hpp" #include "Constants.hpp"
#include "../../DiskImage/DiskImage.hpp" #include "../../Track/TrackSerialiser.hpp"
#include "../../SingleTrackDisk/SingleTrackDisk.hpp" #include "SegmentParser.hpp"
using namespace Storage::Encodings::MFM; using namespace Storage::Encodings::MFM;
Parser::Parser(bool is_mfm) :
Storage::Disk::Controller(4000000),
crc_generator_(0x1021, 0xffff),
shift_register_(0), is_mfm_(is_mfm),
track_(0), head_(0) {
Storage::Time bit_length;
bit_length.length = 1;
bit_length.clock_rate = is_mfm ? 500000 : 250000; // i.e. 250 kbps (including clocks)
set_expected_bit_length(bit_length);
drive_.reset(new Storage::Disk::Drive(4000000, 300, 2));
set_drive(drive_);
drive_->set_motor_on(true);
}
Parser::Parser(bool is_mfm, const std::shared_ptr<Storage::Disk::Disk> &disk) : Parser::Parser(bool is_mfm, const std::shared_ptr<Storage::Disk::Disk> &disk) :
Parser(is_mfm) { is_mfm_(is_mfm), disk_(disk) {}
drive_->set_disk(disk);
void Parser::install_sectors_from_track(const Storage::Disk::Track::Address &address) {
if(sectors_by_address_by_track_.find(address) != sectors_by_address_by_track_.end()) {
return;
} }
Parser::Parser(bool is_mfm, const std::shared_ptr<Storage::Disk::Track> &track) : std::shared_ptr<Storage::Disk::Track> track = disk_->get_track_at_position((unsigned int)address.head, (unsigned int)address.position);
Parser(is_mfm) { if(!track) {
drive_->set_disk(std::make_shared<Disk::DiskImageHolder<Disk::SingleTrackDiskImage>>(track)); return;
} }
void Parser::seek_to_track(uint8_t track) { std::map<size_t, Sector> sectors = sectors_from_segment(
int difference = (int)track - (int)track_; Storage::Disk::track_serialisation(*track, is_mfm_ ? MFMBitLength : FMBitLength),
track_ = track; is_mfm_);
if(difference) { std::map<int, Storage::Encodings::MFM::Sector> sectors_by_id;
int direction = difference < 0 ? -1 : 1; for(auto &sector : sectors) {
difference *= direction; sectors_by_id.insert(std::make_pair(sector.second.address.sector, std::move(sector.second)));
for(int c = 0; c < difference; c++) drive_->step(direction);
} }
sectors_by_address_by_track_.insert(std::make_pair(address, std::move(sectors_by_id)));
} }
std::shared_ptr<Sector> Parser::get_sector(uint8_t head, uint8_t track, uint8_t sector) { Sector *Parser::get_sector(int head, int track, uint8_t sector) {
// Switch head and track if necessary. Disk::Track::Address address;
if(head_ != head) { address.position = track;
drive_->set_head(head); address.head = head;
} install_sectors_from_track(address);
seek_to_track(track);
int track_index = get_index(head, track, 0);
// Populate the sector cache if it's not already populated by asking for sectors unless and until auto sectors = sectors_by_address_by_track_.find(address);
// one is returned that has already been seen. if(sectors == sectors_by_address_by_track_.end()) {
if(decoded_tracks_.find(track_index) == decoded_tracks_.end()) {
std::shared_ptr<Sector> first_sector = get_next_sector();
std::set<uint8_t> visited_sectors;
if(first_sector) {
while(1) {
std::shared_ptr<Sector> next_sector = get_next_sector();
if(next_sector) {
if(visited_sectors.find(next_sector->address.sector) != visited_sectors.end()) {
break;
}
visited_sectors.insert(next_sector->address.sector);
}
}
}
decoded_tracks_.insert(track_index);
}
// Check cache for sector.
int index = get_index(head, track, sector);
auto cached_sector = sectors_by_index_.find(index);
if(cached_sector != sectors_by_index_.end()) {
return cached_sector->second;
}
// If it wasn't found, it doesn't exist.
return nullptr; return nullptr;
} }
void Parser::process_input_bit(int value) { auto stored_sector = sectors->second.find(sector);
shift_register_ = ((shift_register_ << 1) | (unsigned int)value) & 0xffff; if(stored_sector == sectors->second.end()) {
bit_count_++;
}
void Parser::process_index_hole() {
index_count_++;
}
uint8_t Parser::get_byte_for_shift_value(uint16_t value) {
return (uint8_t)(
((value&0x0001) >> 0) |
((value&0x0004) >> 1) |
((value&0x0010) >> 2) |
((value&0x0040) >> 3) |
((value&0x0100) >> 4) |
((value&0x0400) >> 5) |
((value&0x1000) >> 6) |
((value&0x4000) >> 7));
}
uint8_t Parser::get_next_byte() {
bit_count_ = 0;
// Archetypal MFM is 500,000 bps given that the drive has an RPM of 300. Clock rate was
// specified at 4,000,000. So that's an idealised 8 cycles per bit, Jump ahead 14
// times that...
run_for(Cycles(14 * 8));
// ... and proceed at half-idealised-bit intervals to get the next bit. Then proceed very gingerly indeed.
while(bit_count_ < 15) run_for(Cycles(4));
while(bit_count_ < 16) run_for(Cycles(2));
uint8_t byte = get_byte_for_shift_value((uint16_t)shift_register_);
crc_generator_.add(byte);
return byte;
}
std::shared_ptr<Sector> Parser::get_next_sector() {
std::shared_ptr<Sector> sector(new Sector);
index_count_ = 0;
while(index_count_ < 2) {
// look for an ID address mark
bool id_found = false;
while(!id_found) {
run_for(Cycles(1));
if(is_mfm_) {
while(shift_register_ == MFMSync) {
uint8_t mark = get_next_byte();
if(mark == IDAddressByte) {
crc_generator_.set_value(MFMPostSyncCRCValue);
id_found = true;
break;
}
}
} else {
if(shift_register_ == FMIDAddressMark) {
crc_generator_.reset();
id_found = true;
}
}
if(index_count_ >= 2) return nullptr;
}
crc_generator_.add(IDAddressByte);
sector->address.track = get_next_byte();
sector->address.side = get_next_byte();
sector->address.sector = get_next_byte();
sector->size = get_next_byte();
uint16_t header_crc = crc_generator_.get_value();
if((header_crc >> 8) != get_next_byte()) sector->has_header_crc_error = true;
if((header_crc & 0xff) != get_next_byte()) sector->has_header_crc_error = true;
// look for data mark
bool data_found = false;
while(!data_found) {
run_for(Cycles(1));
if(is_mfm_) {
while(shift_register_ == MFMSync) {
uint8_t mark = get_next_byte();
if(mark == DataAddressByte) {
crc_generator_.set_value(MFMPostSyncCRCValue);
data_found = true;
break;
}
if(mark == IDAddressByte) return nullptr;
}
} else {
if(shift_register_ == FMDataAddressMark) {
crc_generator_.reset();
data_found = true;
}
if(shift_register_ == FMIDAddressMark) return nullptr;
}
if(index_count_ >= 2) return nullptr;
}
crc_generator_.add(DataAddressByte);
size_t data_size = (size_t)(128 << sector->size);
sector->data.reserve(data_size);
for(size_t c = 0; c < data_size; c++) {
sector->data.push_back(get_next_byte());
}
uint16_t data_crc = crc_generator_.get_value();
if((data_crc >> 8) != get_next_byte()) sector->has_data_crc_error = true;
if((data_crc & 0xff) != get_next_byte()) sector->has_data_crc_error = true;
// Put this sector into the cache.
int index = get_index(head_, track_, sector->address.sector);
sectors_by_index_[index] = sector;
return sector;
}
return nullptr; return nullptr;
} }
std::shared_ptr<Sector> Parser::get_sector(uint8_t sector) { return &stored_sector->second;
std::shared_ptr<Sector> first_sector;
index_count_ = 0;
while(!first_sector && index_count_ < 2) first_sector = get_next_sector();
if(!first_sector) return nullptr;
if(first_sector->address.sector == sector) return first_sector;
while(1) {
std::shared_ptr<Sector> next_sector = get_next_sector();
if(!next_sector) continue;
if(next_sector->address.sector == first_sector->address.sector) return nullptr;
if(next_sector->address.sector == sector) return next_sector;
}
}
int Parser::get_index(uint8_t head, uint8_t track, uint8_t sector) {
return head | (track << 8) | (sector << 16);
} }

41
Storage/Disk/Encodings/MFM/Parser.hpp
View File

@ -10,49 +10,34 @@
#define Parser_hpp #define Parser_hpp
#include "Sector.hpp" #include "Sector.hpp"
#include "../../Controller/DiskController.hpp" #include "../../Track/Track.hpp"
#include "../../../../NumberTheory/CRC.hpp" #include "../../Drive.hpp"
namespace Storage { namespace Storage {
namespace Encodings { namespace Encodings {
namespace MFM { namespace MFM {
class Parser: public Storage::Disk::Controller { /*!
Provides a mechanism for collecting sectors from a disk.
*/
class Parser {
public: public:
Parser(bool is_mfm, const std::shared_ptr<Storage::Disk::Disk> &disk); Parser(bool is_mfm, const std::shared_ptr<Storage::Disk::Disk> &disk);
Parser(bool is_mfm, const std::shared_ptr<Storage::Disk::Track> &track);
/*! /*!
Attempts to read the sector located at @c track and @c sector. Seeks to the physical track at @c head and @c track. Searches on it for a sector
with logical address @c sector.
@returns a sector if one was found; @c nullptr otherwise. @returns a sector if one was found; @c nullptr otherwise.
*/ */
std::shared_ptr<Storage::Encodings::MFM::Sector> get_sector(uint8_t head, uint8_t track, uint8_t sector); Storage::Encodings::MFM::Sector *get_sector(int head, int track, uint8_t sector);
private: private:
Parser(bool is_mfm); std::shared_ptr<Storage::Disk::Disk> disk_;
bool is_mfm_ = true;
std::shared_ptr<Storage::Disk::Drive> drive_; void install_sectors_from_track(const Storage::Disk::Track::Address &address);
unsigned int shift_register_; std::map<Storage::Disk::Track::Address, std::map<int, Storage::Encodings::MFM::Sector>> sectors_by_address_by_track_;
int index_count_;
uint8_t track_, head_;
int bit_count_;
NumberTheory::CRC16 crc_generator_;
bool is_mfm_;
void seek_to_track(uint8_t track);
void process_input_bit(int value);
void process_index_hole();
uint8_t get_next_byte();
uint8_t get_byte_for_shift_value(uint16_t value);
std::shared_ptr<Storage::Encodings::MFM::Sector> get_next_sector();
std::shared_ptr<Storage::Encodings::MFM::Sector> get_sector(uint8_t sector);
std::map<int, std::shared_ptr<Storage::Encodings::MFM::Sector>> sectors_by_index_;
std::set<int> decoded_tracks_;
int get_index(uint8_t head, uint8_t track, uint8_t sector);
}; };
} }

4
Storage/Disk/Parsers/CPM.cpp
View File

@ -26,7 +26,7 @@ std::unique_ptr<Storage::Disk::CPM::Catalogue> Storage::Disk::CPM::GetCatalogue(
if(catalogue_allocation_bitmap & 0x8000) { if(catalogue_allocation_bitmap & 0x8000) {
size_t size_read = 0; size_t size_read = 0;
do { do {
std::shared_ptr<Storage::Encodings::MFM::Sector> sector_contents = parser.get_sector(0, (uint8_t)track, (uint8_t)(parameters.first_sector + sector)); Storage::Encodings::MFM::Sector *sector_contents = parser.get_sector(0, (uint8_t)track, (uint8_t)(parameters.first_sector + sector));
if(!sector_contents) { if(!sector_contents) {
return nullptr; return nullptr;
} }
@ -105,7 +105,7 @@ std::unique_ptr<Storage::Disk::CPM::Catalogue> Storage::Disk::CPM::GetCatalogue(
track = first_sector / parameters.sectors_per_track; track = first_sector / parameters.sectors_per_track;
for(int s = 0; s < sectors_per_block && record < number_of_records; s++) { for(int s = 0; s < sectors_per_block && record < number_of_records; s++) {
std::shared_ptr<Storage::Encodings::MFM::Sector> sector_contents = parser.get_sector(0, (uint8_t)track, (uint8_t)(parameters.first_sector + sector)); Storage::Encodings::MFM::Sector *sector_contents = parser.get_sector(0, (uint8_t)track, (uint8_t)(parameters.first_sector + sector));
if(!sector_contents) break; if(!sector_contents) break;
sector++; sector++;
if(sector == parameters.sectors_per_track) { if(sector == parameters.sectors_per_track) {

6
Storage/Disk/Track/Track.hpp
View File

@ -31,6 +31,12 @@ class Track {
bool operator < (const Address &rhs) const { bool operator < (const Address &rhs) const {
return (head < rhs.head) || (position < rhs.position); return (head < rhs.head) || (position < rhs.position);
} }
// Address(const Address &rhs) noexcept : head(rhs.head), position(rhs.position) {}
// const Address &operator =(const Address &rhs) {
// head = rhs.head;
// position = rhs.position;
// return *this;
// }
}; };
/*! /*!