6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-29 12:50:28 +00:00
Code Issues Projects Releases Wiki Activity

Avoids massive overallocation where sync blocks overlap the index hole.

Browse Source
This commit is contained in:
Thomas Harte 2020-03-24 21:34:33 -04:00
parent af037649c3
commit 894d196b64
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Storage/Disk/DiskImage/Formats/NIB.cpp
View File

@ -12,6 +12,9 @@
#include "../../Track/TrackSerialiser.hpp" #include "../../Track/TrackSerialiser.hpp"
#include "../../Encodings/AppleGCR/Encoder.hpp" #include "../../Encodings/AppleGCR/Encoder.hpp"
#include "../../Encodings/AppleGCR/Encoder.hpp"
#include "../../Encodings/AppleGCR/SegmentParser.hpp"
#include <vector> #include <vector>
using namespace Storage::Disk; using namespace Storage::Disk;
@ -48,7 +51,7 @@ bool NIB::get_is_read_only() {
} }
long NIB::file_offset(Track::Address address) { long NIB::file_offset(Track::Address address) {
return static_cast<long>(address.position.as_int()) * track_length; return long(address.position.as_int()) * track_length;
} }
std::shared_ptr<::Storage::Disk::Track> NIB::get_track_at_position(::Storage::Disk::Track::Address address) { std::shared_ptr<::Storage::Disk::Track> NIB::get_track_at_position(::Storage::Disk::Track::Address address) {
@ -101,16 +104,24 @@ std::shared_ptr<::Storage::Disk::Track> NIB::get_track_at_position(::Storage::Di
// If the track started in a sync block, write sync first. // If the track started in a sync block, write sync first.
if(start_index) { if(start_index) {
segment += Encodings::AppleGCR::six_and_two_sync(static_cast<int>(start_index)); segment += Encodings::AppleGCR::six_and_two_sync(int(start_index));
} }
std::size_t index = start_index; std::size_t index = start_index;
for(const auto location: sync_starts) { for(const auto location: sync_starts) {
// Write data from index to sync_start. // Write data from index to sync_start.
std::vector<uint8_t> data_segment( if(location > index) {
track_data.begin() + static_cast<off_t>(index), // This is the usual case; the only occasion on which it won't be true is
track_data.begin() + static_cast<off_t>(location)); // when the initial sync was detected to carry over the index hole,
segment += PCMSegment(data_segment); // in which case there's nothing to copy.
std::vector<uint8_t> data_segment(
track_data.begin() + off_t(index),
track_data.begin() + off_t(location));
segment += PCMSegment(data_segment);
} else {
printf("");
}
// Add a sync from sync_start to end of 0xffs, if there are // Add a sync from sync_start to end of 0xffs, if there are
// any before the end of data. // any before the end of data.
@ -119,13 +130,15 @@ std::shared_ptr<::Storage::Disk::Track> NIB::get_track_at_position(::Storage::Di
++index; ++index;
if(index - location) if(index - location)
segment += Encodings::AppleGCR::six_and_two_sync(static_cast<int>(index - location)); segment += Encodings::AppleGCR::six_and_two_sync(int(index - location));
} }
// If there's still data remaining on the track, write it out. // If there's still data remaining on the track, write it out. If a sync ran over
// the notional index hole, the loop above will already have completed the track
// with sync, so no need to deal with that case here.
if(index < track_length) { if(index < track_length) {
std::vector<uint8_t> data_segment( std::vector<uint8_t> data_segment(
track_data.begin() + static_cast<off_t>(index), track_data.begin() + off_t(index),
track_data.end()); track_data.end());
segment += PCMSegment(data_segment); segment += PCMSegment(data_segment);
} }
@ -149,7 +162,7 @@ void NIB::set_tracks(const std::map<Track::Address, std::shared_ptr<Track>> &tra
int bit_count = 0; int bit_count = 0;
size_t sync_location = 0, location = 0; size_t sync_location = 0, location = 0;
for(const auto bit: segment.data) { for(const auto bit: segment.data) {
shifter = static_cast<uint8_t>((shifter << 1) | (bit ? 1 : 0)); shifter = uint8_t((shifter << 1) | (bit ? 1 : 0));
++bit_count; ++bit_count;
++location; ++location;
if(shifter & 0x80) { if(shifter & 0x80) {
@ -167,8 +180,8 @@ void NIB::set_tracks(const std::map<Track::Address, std::shared_ptr<Track>> &tra
track.resize(track_length); track.resize(track_length);
} else { } else {
while(track.size() < track_length) { while(track.size() < track_length) {
std::vector<uint8_t> extra_data(static_cast<size_t>(track_length) - track.size(), 0xff); std::vector<uint8_t> extra_data(size_t(track_length) - track.size(), 0xff);
track.insert(track.begin() + static_cast<off_t>(sync_location), extra_data.begin(), extra_data.end()); track.insert(track.begin() + off_t(sync_location), extra_data.begin(), extra_data.end());
} }
} }