6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-25 03:32:01 +00:00
Code Issues Projects Releases Wiki Activity

The error flag is no longer directly exposed. I also tweaked the Commodore import numbers just a touch. But I think I need proper calibration.

Browse Source
This commit is contained in:
Thomas Harte 2016-09-08 21:09:05 -04:00
parent 1de6097f06
commit 27fedaf892
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
StaticAnalyser/Acorn/Tape.cpp
View File

@ -37,7 +37,7 @@ class Acorn1200BaudTapeParser: public StaticAnalyer::TapeParser<WaveType, Symbol
int c = 8; int c = 8;
if(get_next_bit()) if(get_next_bit())
{ {
_error_flag = true; set_error_flag();
return -1; return -1;
} }
while(c--) while(c--)
@ -46,7 +46,7 @@ class Acorn1200BaudTapeParser: public StaticAnalyer::TapeParser<WaveType, Symbol
} }
if(!get_next_bit()) if(!get_next_bit())
{ {
_error_flag = true; set_error_flag();
return -1; return -1;
} }
add_to_crc((uint8_t)value); add_to_crc((uint8_t)value);

23
StaticAnalyser/Commodore/Tape.cpp
View File

@ -122,6 +122,7 @@ class CommodoreROMTapeParser: public StaticAnalyer::TapeParser<WaveType, SymbolT
std::unique_ptr<Data> get_next_data() std::unique_ptr<Data> get_next_data()
{ {
std::unique_ptr<Data> data(new Data); std::unique_ptr<Data> data(new Data);
reset_error_flag();
// find and proceed beyond lead-in tone to the next landing zone // find and proceed beyond lead-in tone to the next landing zone
proceed_to_symbol(SymbolType::LeadIn); proceed_to_symbol(SymbolType::LeadIn);
@ -216,7 +217,7 @@ class CommodoreROMTapeParser: public StaticAnalyer::TapeParser<WaveType, SymbolT
void expect_byte(uint8_t value) void expect_byte(uint8_t value)
{ {
uint8_t next_byte = get_next_byte(); uint8_t next_byte = get_next_byte();
if(next_byte != value) _error_flag = true; if(next_byte != value) set_error_flag();
} }
uint8_t _parity_byte; uint8_t _parity_byte;
@ -245,7 +246,7 @@ class CommodoreROMTapeParser: public StaticAnalyer::TapeParser<WaveType, SymbolT
while(c--) while(c--)
{ {
SymbolType next_symbol = get_next_symbol(); SymbolType next_symbol = get_next_symbol();
if((next_symbol != SymbolType::One) && (next_symbol != SymbolType::Zero)) _error_flag = true; if((next_symbol != SymbolType::One) && (next_symbol != SymbolType::Zero)) set_error_flag();
byte_plus_parity = (byte_plus_parity >> 1) | (((next_symbol == SymbolType::One) ? 1 : 0) << 8); byte_plus_parity = (byte_plus_parity >> 1) | (((next_symbol == SymbolType::One) ? 1 : 0) << 8);
} }
@ -253,7 +254,8 @@ class CommodoreROMTapeParser: public StaticAnalyer::TapeParser<WaveType, SymbolT
check ^= (check >> 4); check ^= (check >> 4);
check ^= (check >> 2); check ^= (check >> 2);
check ^= (check >> 1); check ^= (check >> 1);
if((check&1) == (byte_plus_parity >> 8)) _error_flag = true; if((check&1) == (byte_plus_parity >> 8))
set_error_flag();
add_parity_byte((uint8_t)byte_plus_parity); add_parity_byte((uint8_t)byte_plus_parity);
return (uint8_t)byte_plus_parity; return (uint8_t)byte_plus_parity;
@ -276,12 +278,17 @@ class CommodoreROMTapeParser: public StaticAnalyer::TapeParser<WaveType, SymbolT
*/ */
void process_pulse(Storage::Tape::Tape::Pulse pulse) void process_pulse(Storage::Tape::Tape::Pulse pulse)
{ {
// The Complete Commodore Inner Space Anthology, P 97, gives half-cycle lengths of:
// short: 182µs => 0.000364s cycle
// medium: 262µs => 0.000524s cycle
// long: 342µs => 0.000684s cycle
bool is_high = pulse.type == Storage::Tape::Tape::Pulse::High; bool is_high = pulse.type == Storage::Tape::Tape::Pulse::High;
if(!is_high && _previous_was_high) if(!is_high && _previous_was_high)
{ {
if(_wave_period >= 0.000592 && _wave_period < 0.000752) push_wave(WaveType::Long); if(_wave_period >= 0.000764) push_wave(WaveType::Unrecognised);
else if(_wave_period >= 0.000432 && _wave_period < 0.000592) push_wave(WaveType::Medium); else if(_wave_period >= 0.000604) push_wave(WaveType::Long);
else if(_wave_period >= 0.000272 && _wave_period < 0.000432) push_wave(WaveType::Short); else if(_wave_period >= 0.000444) push_wave(WaveType::Medium);
else if(_wave_period >= 0.000284) push_wave(WaveType::Short);
else push_wave(WaveType::Unrecognised); else push_wave(WaveType::Unrecognised);
_wave_period = 0.0f; _wave_period = 0.0f;
@ -363,9 +370,10 @@ std::list<File> StaticAnalyser::Commodore::GetFiles(const std::shared_ptr<Storag
new_file.type = File::DataSequence; new_file.type = File::DataSequence;
new_file.data.swap(header->data); new_file.data.swap(header->data);
while(1) while(!parser.is_at_end())
{ {
header = parser.get_next_header(); header = parser.get_next_header();
if(!header) continue;
if(header->type != Header::DataBlock) break; if(header->type != Header::DataBlock) break;
std::copy(header->data.begin(), header->data.end(), std::back_inserter(new_file.data)); std::copy(header->data.begin(), header->data.end(), std::back_inserter(new_file.data));
} }
@ -401,6 +409,5 @@ std::list<File> StaticAnalyser::Commodore::GetFiles(const std::shared_ptr<Storag
} }
} }
return file_list; return file_list;
} }

8
StaticAnalyser/TapeParser.hpp
View File

@ -31,7 +31,6 @@ template <typename WaveType, typename SymbolType> class TapeParser {
bool is_at_end() { return _tape->is_at_end(); } bool is_at_end() { return _tape->is_at_end(); }
protected: protected:
bool _error_flag;
/*! /*!
Adds @c wave to the back of the list of recognised waves and calls @c inspect_waves to check for a new symbol. Adds @c wave to the back of the list of recognised waves and calls @c inspect_waves to check for a new symbol.
@ -82,7 +81,14 @@ template <typename WaveType, typename SymbolType> class TapeParser {
return _next_symbol; return _next_symbol;
} }
void set_error_flag()
{
_error_flag = true;
}
private: private:
bool _error_flag;
/*! /*!
Should be implemented by subclasses. Consumes @c pulse. Is likely either to call @c push_wave Should be implemented by subclasses. Consumes @c pulse. Is likely either to call @c push_wave
or to take no action. or to take no action.