Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-02-09 14:30:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix crash when in Config GUI -> Disk:

Browse Source 
. eg. add DiskII in slot-5, cancel, then access $C0Dx
Change IsCardInSlot() to use CardMgr().QuerySlot()
This commit is contained in:
tomcw 2022-03-13 16:11:56 +00:00
parent 231e6c6d64
commit 35ec3fcc7f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/Memory.cpp
View File

@ -744,7 +744,7 @@ inline bool IsPotentialNoSlotClockAccess(const WORD address)
(SW_INTCXROM && (AddrHi == 0xC8)) ); // Internal ROM at [$C100-CFFF] && AddrHi == $C8 (SW_INTCXROM && (AddrHi == 0xC8)) ); // Internal ROM at [$C100-CFFF] && AddrHi == $C8
} }
static bool IsCardInSlot(const UINT uSlot); static bool IsCardInSlot(UINT slot);
// Enabling expansion ROM ($C800..$CFFF]: // Enabling expansion ROM ($C800..$CFFF]:
// . Enable if: Enable1 && Enable2 // . Enable if: Enable1 && Enable2
@ -944,7 +944,6 @@ BYTE __stdcall IO_F8xx(WORD programcounter, WORD address, BYTE write, BYTE value
static struct SlotInfo static struct SlotInfo
{ {
bool bHasCard;
iofunction IOReadCx; iofunction IOReadCx;
iofunction IOWriteCx; iofunction IOWriteCx;
} g_SlotInfo[NUM_SLOTS] = {0}; } g_SlotInfo[NUM_SLOTS] = {0};
@ -977,7 +976,6 @@ static void InitIoHandlers()
for (i=0; i<NUM_SLOTS; i++) for (i=0; i<NUM_SLOTS; i++)
{ {
g_SlotInfo[i].bHasCard = false;
g_SlotInfo[i].IOReadCx = IO_Cxxx; g_SlotInfo[i].IOReadCx = IO_Cxxx;
g_SlotInfo[i].IOWriteCx = IO_Cxxx; g_SlotInfo[i].IOWriteCx = IO_Cxxx;
ExpansionRom[i] = NULL; ExpansionRom[i] = NULL;
@ -990,12 +988,17 @@ void RegisterIoHandler(UINT uSlot, iofunction IOReadC0, iofunction IOWriteC0, io
_ASSERT(uSlot < NUM_SLOTS); _ASSERT(uSlot < NUM_SLOTS);
SlotParameters[uSlot] = lpSlotParameter; SlotParameters[uSlot] = lpSlotParameter;
if (IOReadC0 == NULL) IOReadC0 = IO_Null;
if (IOWriteC0 == NULL) IOWriteC0 = IO_Null;
IORead[uSlot+8] = IOReadC0; IORead[uSlot+8] = IOReadC0;
IOWrite[uSlot+8] = IOWriteC0; IOWrite[uSlot+8] = IOWriteC0;
if (uSlot == 0) // Don't trash C0xx handlers if (uSlot == 0) // Don't trash C0xx handlers
return; return;
//
if (IOReadCx == NULL) IOReadCx = IO_Cxxx; if (IOReadCx == NULL) IOReadCx = IO_Cxxx;
if (IOWriteCx == NULL) IOWriteCx = IO_Cxxx; if (IOWriteCx == NULL) IOWriteCx = IO_Cxxx;
@ -1005,7 +1008,6 @@ void RegisterIoHandler(UINT uSlot, iofunction IOReadC0, iofunction IOWriteC0, io
IOWrite[uSlot*16+i] = IOWriteCx; IOWrite[uSlot*16+i] = IOWriteCx;
} }
g_SlotInfo[uSlot].bHasCard = true;
g_SlotInfo[uSlot].IOReadCx = IOReadCx; g_SlotInfo[uSlot].IOReadCx = IOReadCx;
g_SlotInfo[uSlot].IOWriteCx = IOWriteCx; g_SlotInfo[uSlot].IOWriteCx = IOWriteCx;
@ -1016,7 +1018,6 @@ void RegisterIoHandler(UINT uSlot, iofunction IOReadC0, iofunction IOWriteC0, io
void UnregisterIoHandler(UINT uSlot) void UnregisterIoHandler(UINT uSlot)
{ {
RegisterIoHandler(uSlot, NULL, NULL, NULL, NULL, NULL, NULL); RegisterIoHandler(uSlot, NULL, NULL, NULL, NULL, NULL, NULL);
g_SlotInfo[uSlot].bHasCard = false;
} }
// From UTAIIe:5-28: Since INTCXROM==1 then state of SLOTC3ROM is not important // From UTAIIe:5-28: Since INTCXROM==1 then state of SLOTC3ROM is not important
@ -1058,9 +1059,9 @@ static void IoHandlerCardsIn(void)
} }
} }
static bool IsCardInSlot(const UINT uSlot) static bool IsCardInSlot(UINT slot)
{ {
return g_SlotInfo[uSlot].bHasCard; return GetCardMgr().QuerySlot(slot) != CT_Empty;
} }
//=========================================================================== //===========================================================================
@ -1478,8 +1479,8 @@ bool MemIsAddrCodeMemory(const USHORT addr)
if (addr <= APPLE_SLOT_END) // [$C100..C7FF] if (addr <= APPLE_SLOT_END) // [$C100..C7FF]
{ {
const UINT uSlot = (addr >> 8) & 0x7; UINT slot = (addr >> 8) & 0x7;
return IsCardInSlot(uSlot); return IsCardInSlot(slot);
} }
// [$C800..CFFF] // [$C800..CFFF]