6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-07-28 00:29:09 +00:00
Code Issues Projects Releases Wiki Activity

Correct some rom initialisation/loading issues.

Browse Source
This commit is contained in:
Adrian.Conlon 2017-09-07 12:23:06 +01:00
parent 129286f1a7
commit c5c842a70b
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
LR35902/src/GameBoyBus.cpp
View File

@ -2,7 +2,15 @@
#include "GameBoyBus.h"
EightBit::GameBoy::Bus::Bus()
: m_disableBootRom(false),
: m_bootRom(0x100),
m_gameRomBanks(1),
m_videoRam(0x2000),
m_ramBanks(0),
m_lowInternalRam(0x2000),
m_oamRam(0xa0),
m_ioPorts(0x80),
m_highInternalRam(0x80),
m_disableBootRom(false),
m_disableGameRom(false),
m_rom(false),
m_banked(false),
@ -32,13 +40,11 @@ void EightBit::GameBoy::Bus::loadBootRom(const std::string& path) {
void EightBit::GameBoy::Bus::loadGameRom(const std::string& path) {
const auto bankSize = 0x4000;
m_gameRomBanks.resize(1);
const auto size = m_gameRomBanks[0].load(path, bankSize);
auto banks = size / bankSize;
if (banks > 1) {
m_gameRomBanks.resize(banks);
for (int bank = 1; bank < banks; ++banks)
m_gameRomBanks[bank].load(path, bankSize, bankSize * bank);
}
const auto size = m_gameRomBanks[0].load(path, 0, 0, bankSize);
const auto banks = size / bankSize;
m_gameRomBanks.resize(banks);
for (int bank = 1; bank < banks; ++bank)
m_gameRomBanks[bank].load(path, 0, bankSize * bank, bankSize);
validateCartridgeType();
}

8
src/Memory.cpp
View File

@ -20,15 +20,15 @@ int EightBit::Memory::loadBinary(
if ((maximumSize > 0) && ((size - readOffset) > maximumSize))
throw std::runtime_error("Binary cannot fit");
size_t extent = size + writeOffset;
if (output.size() < extent)
output.resize(extent);
file.seekg(readOffset, std::ios::beg);
if ((limit < 0) || (limit > size))
limit = size;
const size_t extent = limit + writeOffset;
if (output.size() < extent)
output.resize(extent);
file.read((char*)&output[writeOffset], limit);
file.close();