scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

emu and memory refactoring

Browse Source
This commit is contained in:
scawful
2024-04-23 14:01:56 -04:00
parent de49d59070
commit 3eb7743dee
4 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/emu/memory/memory.cc
View File

@@ -16,6 +16,7 @@ namespace memory {
void MemoryImpl::Initialize(const std::vector<uint8_t>& romData, bool verbose) {
verbose_ = verbose;
type_ = 1;
auto location = 0x7FC0; // GetHeaderOffset();
romSize = 0x400 << romData[location + 0x17];
@@ -23,7 +24,13 @@ void MemoryImpl::Initialize(const std::vector<uint8_t>& romData, bool verbose) {
rom_.resize(romSize);
// Copy memory into rom_
std::copy(romData.begin(), romData.begin() + romSize, rom_.begin());
for (size_t i = 0; i < romSize; i++) {
rom_[i] = romData[i];
}
ram_.resize(sramSize);
for (size_t i = 0; i < sramSize; i++) {
ram_[i] = 0;
}
// Clear memory
memory_.resize(0x1000000); // 16 MB
@@ -43,6 +50,7 @@ void MemoryImpl::Initialize(const std::vector<uint8_t>& romData, bool verbose) {
}
}
}
}
memory::RomInfo MemoryImpl::ReadRomHeader() {

6
src/app/emu/memory/memory.h
View File

@@ -168,7 +168,7 @@ class MemoryImpl : public Memory, public Loggable {
void Initialize(const std::vector<uint8_t>& romData, bool verbose = false);
uint16_t GetHeaderOffset() {
uint8_t mapMode = rom_[(0x00 << 16) + 0xFFD5];
uint8_t mapMode = memory_[(0x00 << 16) + 0xFFD5];
uint16_t offset;
switch (mapMode & 0x07) {
@@ -361,10 +361,10 @@ class MemoryImpl : public Memory, public Loggable {
uint8_t open_bus_ = 0;
// Stack Pointer
uint16_t SP_ = 0x01FF;
uint16_t SP_ = 0;
// Cart Type
uint8_t type_;
uint8_t type_ = 1;
// Memory (64KB)
std::vector<uint8_t> memory_;