Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-04-27 19:46:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix 2 minor bugs:

Browse Source 
1) Debugger: wasn't accounting for 80STORE when checking PAGE2 switch (eg. CTRL+PRNTSCRN)
2) 80-col 1KiB card (std80): wasn't checking SW_WRITERAM
This commit is contained in:
tomcw 2025-01-05 17:25:27 +00:00
parent c4e81fc71d
commit c336a0ce40
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Debugger/Debug.cpp
View File

@ -4980,7 +4980,7 @@ size_t Util_GetTextScreen ( char* &pText_ )
g_nTextScreen = 0;
memset( pBeg, 0, sizeof( g_aTextScreen ) );
unsigned int uBank2 = GetVideo().VideoGetSWPAGE2() ? 1 : 0;
const unsigned int uBank2 = (!GetVideo().VideoGetSW80STORE() && GetVideo().VideoGetSWPAGE2()) ? 1 : 0;
LPBYTE g_pTextBank1 = MemGetAuxPtr (0x400 << uBank2);
LPBYTE g_pTextBank0 = MemGetMainPtr(0x400 << uBank2);
@ -6816,7 +6816,7 @@ static Update_t _ViewOutput ( ViewVideoPage_t iPage, UINT bVideoModeFlags )
switch ( iPage )
{
case VIEW_PAGE_X:
bVideoModeFlags |= GetVideo().VideoGetSWPAGE2() ? VF_PAGE2 : 0;
bVideoModeFlags |= (!GetVideo().VideoGetSW80STORE() && GetVideo().VideoGetSWPAGE2()) ? VF_PAGE2 : 0;
bVideoModeFlags |= GetVideo().VideoGetSWMIXED() ? VF_MIXED : 0;
break; // Page Current & current MIXED state
case VIEW_PAGE_0: bVideoModeFlags |= VF_PAGE0; break; // Pseudo Page 0 ($0000)

2
source/Memory.cpp
View File

@ -1418,7 +1418,7 @@ static void UpdatePagingForAltRW(void)
memwrite[loop] = (memwrite[loop] - (loop << 8)) + TEXT_PAGE1_BEGIN + ((loop & 3) << 8);
for (loop = 0xD0; loop < 0x100; loop++)
if (SW_HIGHRAM && SW_ALTZP)
if (SW_WRITERAM && SW_HIGHRAM && SW_ALTZP)
memwrite[loop] = memaux + TEXT_PAGE1_BEGIN + ((loop & 3) << 8);
if (SW_80STORE && SW_PAGE2)