6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-16 21:28:28 +00:00
Code Issues Projects Releases Wiki Activity

Started attempting to clarify instance variable usage.

Browse Source
This commit is contained in:
Thomas Harte
2016-03-12 23:19:10 -05:00
parent 4462bb92f8
commit 21ca1ef86b
2 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Storage/Tape/Formats/TapeUEF.cpp
View File

@@ -176,7 +176,12 @@ void Storage::UEF::find_next_tape_chunk()
switch(_chunk_id) switch(_chunk_id)
{ {
case 0x0100: case 0x0102: // implicit and explicit bit patterns case 0x0100: // implicit bit pattern
_implicit_data_chunk.position = 0;
return;
case 0x0102: // explicit bit patterns
_explicit_data_chunk.position = 0;
return; return;
case 0x0112: // integer gap case 0x0112: // integer gap
@@ -233,8 +238,8 @@ bool Storage::UEF::chunk_is_finished()
{ {
switch(_chunk_id) switch(_chunk_id)
{ {
case 0x0100: return (_chunk_position / 10) == _chunk_length; case 0x0100: return (_implicit_data_chunk.position / 10) == _chunk_length;
case 0x0102: return (_chunk_position / 8) == _chunk_length; case 0x0102: return (_explicit_data_chunk.position / 8) == _chunk_length;
case 0x0114: case 0x0114:
case 0x0110: return _chunk_position == _chunk_duration.length; case 0x0110: return _chunk_position == _chunk_duration.length;
@@ -251,16 +256,24 @@ bool Storage::UEF::get_next_bit()
{ {
case 0x0100: case 0x0100:
{ {
uint32_t bit_position = _chunk_position%10; uint32_t bit_position = _implicit_data_chunk.position%10;
_chunk_position++; _implicit_data_chunk.position++;
if(!bit_position) if(!bit_position) _implicit_data_chunk.current_byte = (uint8_t)gzgetc(_file);
{
_current_byte = (uint8_t)gzgetc(_file);
}
if(bit_position == 0) return false; if(bit_position == 0) return false;
if(bit_position == 9) return true; if(bit_position == 9) return true;
bool result = (_current_byte&1) ? true : false; bool result = (_implicit_data_chunk.current_byte&1) ? true : false;
_current_byte >>= 1; _implicit_data_chunk.current_byte >>= 1;
return result;
}
break;
case 0x0102:
{
uint32_t bit_position = _explicit_data_chunk.position%8;
_explicit_data_chunk.position++;
if(!bit_position) _explicit_data_chunk.current_byte = (uint8_t)gzgetc(_file);
bool result = (_explicit_data_chunk.current_byte&1) ? true : false;
_explicit_data_chunk.current_byte >>= 1;
return result; return result;
} }
break; break;
@@ -268,7 +281,6 @@ bool Storage::UEF::get_next_bit()
// TODO: 0x0104, 0x0111 // TODO: 0x0104, 0x0111
case 0x0114: case 0x0114:
case 0x0102:
{ {
uint32_t bit_position = _chunk_position%8; uint32_t bit_position = _chunk_position%8;
_chunk_position++; _chunk_position++;

12
Storage/Tape/Formats/TapeUEF.hpp
View File

@@ -35,6 +35,18 @@ class UEF : public Tape {
uint16_t _chunk_id; uint16_t _chunk_id;
uint32_t _chunk_length; uint32_t _chunk_length;
union {
struct {
uint8_t current_byte;
uint32_t position;
} _implicit_data_chunk;
struct {
uint8_t current_byte;
uint32_t position;
} _explicit_data_chunk;
};
uint8_t _current_byte; uint8_t _current_byte;
uint32_t _chunk_position; uint32_t _chunk_position;