Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-20 15:17:50 +00:00
Code Issues Projects Releases Wiki Activity

HDD r/w: error if r/w overlaps with I/O memory

Browse Source 
. break to debugger if single-stepping
HDD write: support memory accesses across 64KiB boundary
This commit is contained in:
tomcw
2021-12-09 21:22:13 +00:00
parent c594d6e101
commit bb6fa80335
3 changed files with 59 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Harddisk.cpp
+35 -3
View File
@@ -39,6 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "SaveState.h"
#include "YamlHelper.h"
#include "Debugger/Debug.h"
#include "../resource/resource.h"
/*
@@ -520,7 +521,12 @@ BYTE __stdcall HarddiskInterfaceCard::IORead(WORD pc, WORD addr, BYTE bWrite, BY
LPBYTE page = memwrite[dstAddr >> 8];
if (!page)
{
_ASSERT(0);
if (g_nAppMode == MODE_STEPPING)
DebuggerBreakOnDmaToOrFromIoMemory(dstAddr, true);
//else // Show MessageBox?
pCard->m_notBusyCycle = 0; // DMA complete
bRes = false;
break;
}
@@ -535,7 +541,8 @@ BYTE __stdcall HarddiskInterfaceCard::IORead(WORD pc, WORD addr, BYTE bWrite, BY
remaining -= size;
}
}
else
if (!bRes)
{
pHDD->m_error = 1;
r = DEVICE_IO_ERROR;
@@ -568,7 +575,32 @@ BYTE __stdcall HarddiskInterfaceCard::IORead(WORD pc, WORD addr, BYTE bWrite, BY
}
}
memcpy(pHDD->m_buf, mem + pHDD->m_memblock, HD_BLOCK_SIZE);
// Trap and error on any accesses that overlap with I/O memory
if ((pHDD->m_memblock < 0xC000 && ((pHDD->m_memblock + HD_BLOCK_SIZE - 1) >= 0xC000)) // 1) Starts before I/O, but ends in I/O memory
|| ((pHDD->m_memblock >> 12) == 0xC)) // 2) Starts in I/O memory
{
WORD dstAddr = ((pHDD->m_memblock >> 12) == 0xC) ? pHDD->m_memblock : 0xC000;
if (g_nAppMode == MODE_STEPPING)
DebuggerBreakOnDmaToOrFromIoMemory(dstAddr, false);
//else // Show MessageBox?
pCard->m_notBusyCycle = 0; // DMA complete
bRes = false;
}
else
{
if (pHDD->m_memblock <= 0xFE00)
{
memcpy(pHDD->m_buf, mem + pHDD->m_memblock, HD_BLOCK_SIZE);
}
else // wraps on 64KiB boundary
{
const UINT size = 0x10000 - pHDD->m_memblock;
memcpy(pHDD->m_buf, mem + pHDD->m_memblock, size);
memcpy(pHDD->m_buf + size, mem, HD_BLOCK_SIZE - size);
}
}
if (bRes)
bRes = ImageWriteBlock(pHDD->m_imagehandle, pHDD->m_diskblock, pHDD->m_buf);