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

Pulled the strands together provisionally to complete Commodore ROM-format tape parsing. Things are going to get complicated if or when I need to tackle turbo loaders.

Browse Source
This commit is contained in:
Thomas Harte 2016-09-07 07:34:48 -04:00
parent d66516fd62
commit 6522a9a6c2
2 changed files with 67 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
StaticAnalyser/Commodore/Tape.cpp
View File

@ -24,9 +24,9 @@ enum class SymbolType {
struct Header {
enum {
RelocatableProgram,
DataBlock,
NonRelocatableProgram,
SequenceHeader,
DataSequenceHeader,
DataBlock,
EndOfTape,
Unknown
} type;
@ -78,7 +78,7 @@ class CommodoreROMTapeParser: public StaticAnalyer::TapeParser<WaveType, SymbolT
case 0x01: header->type = Header::RelocatableProgram; break;
case 0x02: header->type = Header::DataBlock; break;
case 0x03: header->type = Header::NonRelocatableProgram; break;
case 0x04: header->type = Header::SequenceHeader; break;
case 0x04: header->type = Header::DataSequenceHeader; break;
case 0x05: header->type = Header::EndOfTape; break;
}
@ -339,10 +339,66 @@ class CommodoreROMTapeParser: public StaticAnalyer::TapeParser<WaveType, SymbolT
std::list<File> StaticAnalyser::Commodore::GetFiles(const std::shared_ptr<Storage::Tape::Tape> &tape)
{
CommodoreROMTapeParser parser(tape);
std::unique_ptr<Header> header = parser.get_next_header();
std::unique_ptr<Data> data = parser.get_next_data();
parser.spin();
std::list<File> file_list;
std::unique_ptr<Header> header = parser.get_next_header();
while(!parser.is_at_end())
{
if(!header)
{
header = parser.get_next_header();
continue;
}
switch(header->type)
{
case Header::DataSequenceHeader:
{
File new_file;
new_file.name = header->name;
new_file.raw_name = header->raw_name;
new_file.starting_address = header->starting_address;
new_file.ending_address = header->ending_address;
new_file.type = File::DataSequence;
new_file.data.swap(header->data);
while(1)
{
header = parser.get_next_header();
if(header->type != Header::DataBlock) break;
std::copy(header->data.begin(), header->data.end(), std::back_inserter(new_file.data));
}
file_list.push_back(new_file);
}
break;
case Header::RelocatableProgram:
case Header::NonRelocatableProgram:
{
std::unique_ptr<Data> data = parser.get_next_data();
File new_file;
new_file.name = header->name;
new_file.raw_name = header->raw_name;
new_file.starting_address = header->starting_address;
new_file.ending_address = header->ending_address;
new_file.data.swap(data->data);
new_file.type = (header->type == Header::RelocatableProgram) ? File::RelocatableProgram : File::NonRelocatableProgram;
file_list.push_back(new_file);
header = parser.get_next_header();
}
break;
default:
header = parser.get_next_header();
break;
}
}
return file_list;
}

7
StaticAnalyser/Commodore/Tape.hpp
View File

@ -21,9 +21,10 @@ struct File {
uint16_t starting_address;
uint16_t ending_address;
enum {
Program,
Stream
} Type;
RelocatableProgram,
NonRelocatableProgram,
DataSequence,
} type;
std::vector<uint8_t> data;
};