added loading

This commit is contained in:
zanostro 2025-11-17 15:21:25 +01:00
parent 598865d216
commit 7b79c35f63
8 changed files with 84 additions and 14 deletions

View file

@ -2,6 +2,7 @@
#include "file_reader.h"
#include "machine.h"
#include "constants.h"
#include <algorithm>
Loader::~Loader()
{
@ -49,15 +50,22 @@ Loader::RecordType Loader::parseRecordType(char c)
Loader::HeaderMetadata Loader::readHeader()
{
RecordType type = parseRecordType(static_cast<char>(_file_reader->readByte()));
if (type != RecordType::HEADER) {
throw std::runtime_error("Expected HEADER record");
}
if(FILE_CONTAINS_WHITE_SPACES) _file_reader->readByte();
HeaderMetadata header;
// Read program name (6 bytes)
header.program_name = _file_reader->readString(6);
if(FILE_CONTAINS_WHITE_SPACES) _file_reader->readByte();
// Read start address (6 hex digits)
header.start_address = std::stoi(_file_reader->readString(6), nullptr, 16);
if(FILE_CONTAINS_WHITE_SPACES) _file_reader->readByte();
// Read length (6 hex digits)
header.length = std::stoi(_file_reader->readString(6), nullptr, 16);
// consume newline
@ -67,35 +75,40 @@ Loader::HeaderMetadata Loader::readHeader()
Loader::TextRecord Loader::readTextRecord()
{
if(FILE_CONTAINS_WHITE_SPACES) _file_reader->readByte();
TextRecord record;
// Assume 'T' has already been read
record.start_address = std::stoi(_file_reader->readString(6), nullptr, 16);
if(FILE_CONTAINS_WHITE_SPACES) _file_reader->readByte();
// Read length (1 byte, 2 hex digits)
int length = std::stoi(_file_reader->readString(2), nullptr, 16);
if(FILE_CONTAINS_WHITE_SPACES) _file_reader->readByte();
// Read data bytes
record.data.resize(length);
for(int i = 0; i < length; ++i) {
unsigned char buffer[2];
_file_reader->readBytes(buffer, 2);
record.data[i] = static_cast<uint8_t>(std::stoi(std::string(reinterpret_cast<char*>(buffer), 2), nullptr, 16));
int index = 0;
string byteStr = _file_reader->readLine();
// Remove spaces, newlines, and other whitespace characters
byteStr.erase(std::remove_if(byteStr.begin(), byteStr.end(), ::isspace), byteStr.end());
for (int i = 0; i < length; ++i) {
std::string byteHex = byteStr.substr(i * 2, 2);
record.data[i] = static_cast<uint8_t>(std::stoi(byteHex, nullptr, 16));
}
// consume newline
_file_reader->readLine();
return record;
}
Loader::EndRecord Loader::readEndRecord()
{
EndRecord record;
if(FILE_CONTAINS_WHITE_SPACES) _file_reader->readByte();
// Assume 'E' has already been read
std::string addrStr = _file_reader->readString(6);
if (!addrStr.empty()) {
record.execution_start_address = std::stoi(addrStr, nullptr, 16);
} else {
record.execution_start_address = 0; // default start address
record.execution_start_address = 0;
}
// consume newline
_file_reader->readLine();
@ -106,8 +119,8 @@ bool Loader::load_into_memory(int start_address, const std::vector<uint8_t> &dat
{
for(size_t i = 0; i < data.size(); ++i) {
int addr = start_address + static_cast<int>(i);
if (addr < 0 || addr >= MEMORY_SIZE) { // 24-bit address space
return false; // Address out of bounds
if (addr < 0 || addr >= MEMORY_SIZE) {
return false;
}
_machine->setByte(addr, data[i]);
}