6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-19 07:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Rejigged to eliminate semi-duplication of the is-a-file test.

Browse Source
This commit is contained in:
Thomas Harte 2017-06-08 21:52:13 -04:00
parent b07af2660d
commit 256ba4028b
3 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Storage/Data/ZX8081.cpp
View File

@ -33,6 +33,10 @@ static std::shared_ptr<File> ZX80FileFromData(const std::vector<uint8_t> &data)
if(vars > end_of_file) return nullptr; if(vars > end_of_file) return nullptr;
if(end_of_file > display_address) return nullptr; if(end_of_file > display_address) return nullptr;
// TODO: does it make sense to inspect the tokenised BASIC?
// It starts at 0x4028 and proceeds as [16-bit line number] [tokens] [0x76],
// but I'm as yet unable to find documentation of the tokens.
// TODO: check that the line numbers declared above exist (?) // TODO: check that the line numbers declared above exist (?)
std::shared_ptr<File> file(new File); std::shared_ptr<File> file(new File);

28
Storage/Tape/Formats/ZX80O.cpp
View File

@ -7,31 +7,21 @@
// //
#include "ZX80O.hpp" #include "ZX80O.hpp"
#include "../../Data/ZX8081.hpp"
using namespace Storage::Tape; using namespace Storage::Tape;
ZX80O::ZX80O(const char *file_name) : ZX80O::ZX80O(const char *file_name) :
Storage::FileHolder(file_name) { Storage::FileHolder(file_name) {
// Files can be no longer than 16 kb // Check that contents look like a ZX80 file
if(file_stats_.st_size > 16384) throw ErrorNotZX80O; std::vector<uint8_t> whole_file((size_t)file_stats_.st_size);
fread(whole_file.data(), 1, (size_t)file_stats_.st_size, file_);
std::shared_ptr<::Storage::Data::ZX8081::File> file = Storage::Data::ZX8081::FileFromData(whole_file);
// skip the system area if(!file || file->isZX81) throw ErrorNotZX80O;
fseek(file_, 8, SEEK_SET);
// read the pointer to VARS and the alleged pointer to end of file size_of_file_ = file->data.size();
uint16_t vars = fgetc16le();
end_of_file_ = fgetc16le();
// VARs should be before end of file
if(vars > end_of_file_) throw ErrorNotZX80O;
// end of file should be no further than the actual file size
if(end_of_file_ - 0x4000 > file_stats_.st_size) throw ErrorNotZX80O;
// TODO: does it make sense to inspect the tokenised BASIC?
// It starts at 0x4028 and proceeds as [16-bit line number] [tokens] [0x76],
// but I'm as yet unable to find documentation of the tokens.
// then rewind and start again // then rewind and start again
virtual_reset(); virtual_reset();
@ -46,7 +36,7 @@ void ZX80O::virtual_reset() {
} }
bool ZX80O::has_finished_data() { bool ZX80O::has_finished_data() {
return (ftell(file_) == end_of_file_ - 0x4000) && !wave_pointer_ && !bit_pointer_; return (ftell(file_) == size_of_file_) && !wave_pointer_ && !bit_pointer_;
} }
bool ZX80O::is_at_end() { bool ZX80O::is_at_end() {
@ -69,8 +59,6 @@ Tape::Pulse ZX80O::virtual_get_next_pulse() {
// For each byte, output 8 bits and then silence. // For each byte, output 8 bits and then silence.
if(!bit_pointer_ && !wave_pointer_) { if(!bit_pointer_ && !wave_pointer_) {
byte_ = (uint8_t)fgetc(file_); byte_ = (uint8_t)fgetc(file_);
if(has_finished_data())
printf("");
bit_pointer_ = 0; bit_pointer_ = 0;
wave_pointer_ = 0; wave_pointer_ = 0;
} }

2
Storage/Tape/Formats/ZX80O.hpp
View File

@ -46,7 +46,7 @@ class ZX80O: public Tape, public Storage::FileHolder {
bool is_past_silence_, has_ended_final_byte_; bool is_past_silence_, has_ended_final_byte_;
bool is_high_; bool is_high_;
uint16_t end_of_file_; size_t size_of_file_;
}; };
} }