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

Some small changes for NES support: hopefully not broken anything!

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon
2017-12-26 22:46:16 +00:00
parent df1f47fb36
commit d4782a66db
5 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Memory.cpp
View File

@@ -2,20 +2,11 @@
#include "Memory.h"
#include <iostream>
#include <fstream>
int EightBit::Memory::loadBinary(
const std::string& path,
std::vector<uint8_t>& output,
int writeOffset,
int readOffset,
int limit,
int maximumSize) {
int EightBit::Memory::load(std::ifstream& file, std::vector<uint8_t>& output, const int writeOffset, const int readOffset, int limit, const int maximumSize) {
std::ifstream file;
file.exceptions(std::ios::failbit | std::ios::badbit);
file.seekg(0, std::ios::end);
file.open(path, std::ios::binary | std::ios::ate);
const auto size = (int)file.tellg();
if ((maximumSize > 0) && ((size - readOffset) > maximumSize))
throw std::runtime_error("Binary cannot fit");
@@ -30,6 +21,17 @@ int EightBit::Memory::loadBinary(
output.resize(extent);
file.read((char*)&output[writeOffset], limit);
return size;
}
int EightBit::Memory::load(const std::string& path, std::vector<uint8_t>& output, const int writeOffset, const int readOffset, const int limit, const int maximumSize) {
std::ifstream file;
file.exceptions(std::ios::failbit | std::ios::badbit);
file.open(path, std::ios::binary | std::ios::ate);
const auto size = load(file, output, writeOffset, readOffset, limit, maximumSize);
file.close();
return size;