Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-27 07:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Oops. Better FB version with minor optimizations.

Browse Source
This commit is contained in:
nick_westgate 2008-12-30 16:40:05 +00:00
parent 779d2d4385
commit 7cc10fb894
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AppleWin/source/Video.cpp
View File

@ -2370,8 +2370,8 @@ WORD VideoGetScannerAddress(bool* pbVblBar_OUT, const DWORD uExecutedCycles)
nAddress |= v_1 << 8; // a8 nAddress |= v_1 << 8; // a8
nAddress |= v_2 << 9; // a9 nAddress |= v_2 << 9; // a9
int p2a = 1 ^ (nPage2 & (1 ^ n80Store)); int p2a = !(nPage2 && !n80Store);
int p2b = nPage2 & (1 ^ n80Store); int p2b = nPage2 && !n80Store;
if (nHires) // hires? if (nHires) // hires?
{ {
@ -2393,9 +2393,9 @@ WORD VideoGetScannerAddress(bool* pbVblBar_OUT, const DWORD uExecutedCycles)
// Apple ][ (not //e) and HBL? // Apple ][ (not //e) and HBL?
// //
if (IS_APPLE2 && // Apple II only (UTAIIe:I-4,#5) if (IS_APPLE2 && // Apple II only (UTAIIe:I-4,#5)
((1 ^ h_5) & ((1 ^ h_3) | (1 ^ h_4)))) // HBL (UTAIIe:8-10,F8.5) !h_5 && (!h_4 || !h_3)) // HBL (UTAIIe:8-10,F8.5)
{ {
nAddress |= 1 << 12; // Y: a12 (add $1000; ) nAddress |= 1 << 12; // Y: a12 (add $1000 to address!)
} }
} }
@ -2403,7 +2403,7 @@ WORD VideoGetScannerAddress(bool* pbVblBar_OUT, const DWORD uExecutedCycles)
// //
if (pbVblBar_OUT != NULL) if (pbVblBar_OUT != NULL)
{ {
*pbVblBar_OUT = ((v_4 & v_3) == 0); // VBL' = (v_4 & v_3)' (UTAIIe:5-10,#3) *pbVblBar_OUT = !v_4 || !v_3; // VBL' = (v_4 & v_3)' (UTAIIe:5-10,#3)
} }
return static_cast<WORD>(nAddress); return static_cast<WORD>(nAddress);
} }