6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2026-01-23 04:16:02 +00:00
Code Issues Projects Releases Wiki Activity

Refactor the Intel hex file loader into it's own class.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon
2019-07-06 22:44:42 +01:00
parent ef09696ea2
commit 36465ce1c8
6 changed files with 119 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/Bus.cpp
View File

@@ -1,13 +1,9 @@
#include "stdafx.h"
#include "Bus.h"
#include "Ram.h"
#include "IntelHexFile.h"
#include "EightBitCompilerDefinitions.h"
#include <fstream>
#include <cstdlib>
#include <stdexcept>
#include <cassert>
void EightBit::Bus::raisePOWER() {}
void EightBit::Bus::lowerPOWER() {}
@@ -31,7 +27,8 @@ void EightBit::Bus::write(const uint8_t value) {
}
void EightBit::Bus::loadHexFile(const std::string path) {
const auto chunks = parseHexFile(path);
IntelHexFile file(path);
const auto chunks = file.parse();
for (const auto& chunk : chunks) {
const auto address = chunk.first;
const auto content = chunk.second;
@@ -41,57 +38,6 @@ void EightBit::Bus::loadHexFile(const std::string path) {
}
}
std::map<uint16_t, std::vector<uint8_t>> EightBit::Bus::parseHexFile(const std::string path) {
std::ifstream file;
file.open(path);
std::map<uint16_t, std::vector<uint8_t>> returned;
bool eof = false;
while (!file.eof() && !eof) {
std::string line;
std::getline(file, line);
const auto colon = line.substr(0, 1);
if (colon != ":")
throw std::out_of_range("Invalid hex file: line does not begin with a colon");
const auto countString = line.substr(1, 2);
const auto count = (uint8_t)strtoul(countString.c_str(), nullptr, 16);
const auto addressString = line.substr(3, 4);
const auto address = (uint16_t)strtoul(addressString.c_str(), nullptr, 16);
const auto recordTypeString = line.substr(7, 2);
const auto recordType = strtoul(recordTypeString.c_str(), nullptr, 16);
switch (recordType) {
case 0x00: {
std::vector<uint8_t> data(count);
const auto requiredLength = 9 + 2 + (count * 2);
if (line.length() != requiredLength)
throw std::out_of_range("Invalid hex file: line is not the required length");
for (int i = 0; i < count; ++i) {
const auto position = 9 + i * 2;
const auto datumString = line.substr(position, 2);
const auto datum = (uint8_t)strtoul(datumString.c_str(), nullptr, 16);
data[i] = datum;
}
returned[address] = data;
}
break;
case 0x01:
eof = true;
break;
default:
throw std::out_of_range("Unhandled hex file record.");
}
}
return returned;
}
uint8_t& EightBit::Bus::reference(const uint16_t address) {
const auto mapped = mapping(address);
const uint16_t offset = (address - mapped.begin) & mapped.mask;