6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-28 13:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Rejigs segment conjugation to avoid potential accidental empty byte.

Browse Source
This commit is contained in:
Thomas Harte 2018-05-13 22:30:44 -04:00
parent 0055efb720
commit 7996040f35
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Storage/Disk/Track/PCMSegment.cpp
View File

@ -53,15 +53,11 @@ PCMSegment &PCMSegment::operator +=(const PCMSegment &rhs) {
std::size_t first_byte = number_of_bits >> 3;
int shift = number_of_bits&7;
data[first_byte] |= rhs.data[0] >> shift;
for(std::size_t target = first_byte+1; target < (data.size()-1); ++target) {
data[target] =
static_cast<uint8_t>(
(rhs.data[target - first_byte - 1] << (8 - shift)) |
(rhs.data[target - first_byte] >> shift)
);
for(std::size_t source = 0; source < rhs.data.size(); ++source) {
data[first_byte + source] |= rhs.data[source] >> shift;
if(source*8 + static_cast<std::size_t>(shift) < rhs.number_of_bits)
data[first_byte + source + 1] = static_cast<uint8_t>(rhs.data[source] << (8-shift));
}
data.back() = static_cast<uint8_t>(rhs.data.back() << (8 - shift));
number_of_bits = target_number_of_bits;
} else {