Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-09-28 00:54:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix for 2x read access to (odd addr) to enable write access (#392)

Browse Source
This commit is contained in:
tomcw 2017-03-15 21:41:45 +00:00
parent 1c3838ab8f
commit 87862bcf28
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/Memory.cpp
View File

@ -174,7 +174,7 @@ iofunction IORead[256];
iofunction IOWrite[256]; iofunction IOWrite[256];
static LPVOID SlotParameters[NUM_SLOTS]; static LPVOID SlotParameters[NUM_SLOTS];
static BOOL lastwriteram = 0; // NB. redundant - only used in MemSetPaging(), where it's forced to 1 static BOOL g_bLastWriteRam = 0;
LPBYTE mem = NULL; LPBYTE mem = NULL;
@ -833,7 +833,7 @@ void MemResetPaging()
static void ResetPaging(BOOL initialize) static void ResetPaging(BOOL initialize)
{ {
lastwriteram = 0; g_bLastWriteRam = 0;
SetMemMode(MF_BANK2 | MF_SLOTCXROM | MF_WRITERAM); SetMemMode(MF_BANK2 | MF_SLOTCXROM | MF_WRITERAM);
UpdatePaging(initialize); UpdatePaging(initialize);
} }
@ -1630,16 +1630,26 @@ BYTE __stdcall MemSetPaging(WORD programcounter, WORD address, BYTE write, BYTE
// DETERMINE THE NEW MEMORY PAGING MODE. // DETERMINE THE NEW MEMORY PAGING MODE.
if ((address >= 0x80) && (address <= 0x8F)) if ((address >= 0x80) && (address <= 0x8F))
{ {
BOOL writeram = (address & 1);
SetMemMode(memmode & ~(MF_BANK2 | MF_HIGHRAM | MF_WRITERAM)); SetMemMode(memmode & ~(MF_BANK2 | MF_HIGHRAM | MF_WRITERAM));
lastwriteram = 1; // note: because diags.do doesn't set switches twice!
if (lastwriteram && writeram)
SetMemMode(memmode | MF_WRITERAM);
if (!(address & 8)) if (!(address & 8))
SetMemMode(memmode | MF_BANK2); SetMemMode(memmode | MF_BANK2);
if (((address & 2) >> 1) == (address & 1)) if (((address & 2) >> 1) == (address & 1))
SetMemMode(memmode | MF_HIGHRAM); SetMemMode(memmode | MF_HIGHRAM);
lastwriteram = writeram;
if (!write) // GH#392
{
BOOL bWriteRam = (address & 1);
// g_bLastWriteRam = 1; // note: because diags.do doesn't set switches twice!
if (g_bLastWriteRam && bWriteRam)
SetMemMode(memmode | MF_WRITERAM);
g_bLastWriteRam = bWriteRam;
}
else
{
g_bLastWriteRam = 0;
}
} }
else if (!IS_APPLE2) else if (!IS_APPLE2)
{ {
@ -1748,7 +1758,7 @@ LPVOID MemGetSlotParameters(UINT uSlot)
void MemSetSnapshot_v1(const DWORD MemMode, const BOOL LastWriteRam, const BYTE* const pMemMain, const BYTE* const pMemAux) void MemSetSnapshot_v1(const DWORD MemMode, const BOOL LastWriteRam, const BYTE* const pMemMain, const BYTE* const pMemAux)
{ {
SetMemMode(MemMode); SetMemMode(MemMode);
lastwriteram = LastWriteRam; g_bLastWriteRam = LastWriteRam;
memcpy(memmain, pMemMain, nMemMainSize); memcpy(memmain, pMemMain, nMemMainSize);
memcpy(memaux, pMemAux, nMemAuxSize); memcpy(memaux, pMemAux, nMemAuxSize);
@ -1825,7 +1835,7 @@ void MemSaveSnapshot(YamlSaveHelper& yamlSaveHelper)
{ {
YamlSaveHelper::Label state(yamlSaveHelper, "%s:\n", MemGetSnapshotStructName().c_str()); YamlSaveHelper::Label state(yamlSaveHelper, "%s:\n", MemGetSnapshotStructName().c_str());
yamlSaveHelper.SaveHexUint32(SS_YAML_KEY_MEMORYMODE, memmode); yamlSaveHelper.SaveHexUint32(SS_YAML_KEY_MEMORYMODE, memmode);
yamlSaveHelper.SaveUint(SS_YAML_KEY_LASTRAMWRITE, lastwriteram ? 1 : 0); yamlSaveHelper.SaveUint(SS_YAML_KEY_LASTRAMWRITE, g_bLastWriteRam ? 1 : 0);
yamlSaveHelper.SaveHexUint8(SS_YAML_KEY_IOSELECT, IO_SELECT); yamlSaveHelper.SaveHexUint8(SS_YAML_KEY_IOSELECT, IO_SELECT);
yamlSaveHelper.SaveHexUint8(SS_YAML_KEY_IOSELECT_INT, IO_SELECT_InternalROM); yamlSaveHelper.SaveHexUint8(SS_YAML_KEY_IOSELECT_INT, IO_SELECT_InternalROM);
yamlSaveHelper.SaveUint(SS_YAML_KEY_EXPANSIONROMTYPE, (UINT) g_eExpansionRomType); yamlSaveHelper.SaveUint(SS_YAML_KEY_EXPANSIONROMTYPE, (UINT) g_eExpansionRomType);
@ -1841,7 +1851,7 @@ bool MemLoadSnapshot(YamlLoadHelper& yamlLoadHelper)
return false; return false;
SetMemMode( yamlLoadHelper.LoadUint(SS_YAML_KEY_MEMORYMODE) ); SetMemMode( yamlLoadHelper.LoadUint(SS_YAML_KEY_MEMORYMODE) );
lastwriteram = yamlLoadHelper.LoadUint(SS_YAML_KEY_LASTRAMWRITE) ? TRUE : FALSE; g_bLastWriteRam = yamlLoadHelper.LoadUint(SS_YAML_KEY_LASTRAMWRITE) ? TRUE : FALSE;
IO_SELECT = (BYTE) yamlLoadHelper.LoadUint(SS_YAML_KEY_IOSELECT); IO_SELECT = (BYTE) yamlLoadHelper.LoadUint(SS_YAML_KEY_IOSELECT);
IO_SELECT_InternalROM = (BYTE) yamlLoadHelper.LoadUint(SS_YAML_KEY_IOSELECT_INT); IO_SELECT_InternalROM = (BYTE) yamlLoadHelper.LoadUint(SS_YAML_KEY_IOSELECT_INT);
g_eExpansionRomType = (eExpansionRomType) yamlLoadHelper.LoadUint(SS_YAML_KEY_EXPANSIONROMTYPE); g_eExpansionRomType = (eExpansionRomType) yamlLoadHelper.LoadUint(SS_YAML_KEY_EXPANSIONROMTYPE);