Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Adding delayed writes to $4016 EPSM Addressing #134

Merged
merged 1 commit into from
Oct 24, 2022
Merged

Adding delayed writes to $4016 EPSM Addressing #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/BaseMapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ uint8_t BaseMapper::DebugReadRAM(uint16_t addr)

void BaseMapper::WriteRAM(uint16_t addr, uint8_t value)
{
if((addr == 0x4016) & (_console->GetCpu()->GetCycleCount() % 2 == 1)){ WriteEPSM(addr, value); }
if(addr == 0x4016){ WriteEPSM(addr, value); }
if ((addr >= 0x401c && addr <= 0x401f)) {WriteEPSM(addr, value); }
if(_isWriteRegisterAddr[addr]) {
if(_hasBusConflicts) {
Expand Down
10 changes: 5 additions & 5 deletions Core/EPSMAudio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,12 @@ class EPSMAudio : public EPSMSSGAudio
if (!custom) {
switch (addr) {
case 0x4016:
if ((value & 0x0F) == 0x02) {writeAddr = 0x0;} //A0 = 0, A1 = 0
if ((value & 0x0F) == 0x0A) {writeAddr = 0x1;} //A0 = 1, A1 = 0
if ((value & 0x0F) == 0x06) {writeAddr = 0x2;} //A0 = 0, A1 = 1
if ((value & 0x0F) == 0x0E) {writeAddr = 0x3;} //A0 = 1, A1 = 1
if ((value & 0x0E) == 0x02) {writeAddr = 0x0;} //A0 = 0, A1 = 0
if ((value & 0x0E) == 0x0A) {writeAddr = 0x1;} //A0 = 1, A1 = 0
if ((value & 0x0E) == 0x06) {writeAddr = 0x2;} //A0 = 0, A1 = 1
if ((value & 0x0E) == 0x0E) {writeAddr = 0x3;} //A0 = 1, A1 = 1
if (value & 0x0E) {writeValue = value;}
if ((value & 0x0F) == 0x00) {
if ((value & 0x02) == 0x00) {
writeValue = (writeValue & 0xF0) | (value >> 4);

const uint8_t a0 = !!(writeAddr & 0x1);
Expand Down
14 changes: 12 additions & 2 deletions Core/MemoryManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ MemoryManager::MemoryManager(shared_ptr<Console> console)
_console = console;
_internalRAM = new uint8_t[InternalRAMSize];
_internalRamHandler.SetInternalRam(_internalRAM);
_out1_latch = false;

_ramReadHandlers = new IMemoryHandler*[RAMSize];
_ramWriteHandlers = new IMemoryHandler*[RAMSize];
Expand Down Expand Up @@ -125,7 +126,10 @@ uint8_t MemoryManager::Read(uint16_t addr, MemoryOperationType operationType)
_console->DebugProcessRamOperation(operationType, addr, value);

_openBusHandler.SetOpenBus(value);

if (_out1_latch && operationType == MemoryOperationType::ExecOpCode) {
_out1_latch = false;
_ramWriteHandlers[0xE000]->WriteRAM(0x4016, (value & 0xF8) + (_out_delay & 0x7));
}
return value;
}

Expand All @@ -134,7 +138,13 @@ void MemoryManager::Write(uint16_t addr, uint8_t value, MemoryOperationType oper
if(_console->DebugProcessRamOperation(operationType, addr, value)) {
_ramWriteHandlers[addr]->WriteRAM(addr, value);
if (addr == 0x4016) {
_ramWriteHandlers[0xE000]->WriteRAM(addr, value);
if ((_console->GetCpu()->GetCycleCount() % 2 == 1)) {
_ramWriteHandlers[0xE000]->WriteRAM(addr, value);
}
else {
_out1_latch = true;
_out_delay = value;
}
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions Core/MemoryManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ class MemoryManager : public Snapshotable
InternalRamHandler<0x7FF> _internalRamHandler;
IMemoryHandler** _ramReadHandlers;
IMemoryHandler** _ramWriteHandlers;
bool _out1_latch;
uint8_t _out_delay;

void InitializeMemoryHandlers(IMemoryHandler** memoryHandlers, IMemoryHandler* handler, vector<uint16_t> *addresses, bool allowOverride);

Expand Down