empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Andrea Odetti 2021-02-13 14:07:18 +00:00
commit 282e024c37
13 changed files with 89 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
AppleWinExpress2019.vcxproj
View file

@ -441,6 +441,7 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
<ConformanceMode>true</ConformanceMode>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -469,6 +470,7 @@
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
<DisableSpecificWarnings>4995</DisableSpecificWarnings> <DisableSpecificWarnings>4995</DisableSpecificWarnings>
<ConformanceMode>true</ConformanceMode>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -495,6 +497,7 @@
<AdditionalIncludeDirectories>source;source\cpu;source\debugger;zlib;zip_lib;libyaml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>source;source\cpu;source\debugger;zlib;zip_lib;libyaml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<ConformanceMode>true</ConformanceMode>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -524,6 +527,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<ConformanceMode>true</ConformanceMode>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -557,6 +561,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4995</DisableSpecificWarnings> <DisableSpecificWarnings>4995</DisableSpecificWarnings>
<ConformanceMode>true</ConformanceMode>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -589,6 +594,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<ConformanceMode>true</ConformanceMode>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

6
source/Configuration/PropertySheetHelper.cpp
View file

@ -150,7 +150,7 @@ void CPropertySheetHelper::SetSlot(UINT slot, SS_CARDTYPE newCardType)
// Used by: // Used by:
// . CPageDisk: IDC_CIDERPRESS_BROWSE // . CPageDisk: IDC_CIDERPRESS_BROWSE
// . CPageAdvanced: IDC_PRINTER_DUMP_FILENAME_BROWSE // . CPageAdvanced: IDC_PRINTER_DUMP_FILENAME_BROWSE
std::string CPropertySheetHelper::BrowseToFile(HWND hWindow, TCHAR* pszTitle, TCHAR* REGVALUE, TCHAR* FILEMASKS) std::string CPropertySheetHelper::BrowseToFile(HWND hWindow, const TCHAR* pszTitle, const TCHAR* REGVALUE, const TCHAR* FILEMASKS)
{ {
TCHAR szFilename[MAX_PATH]; TCHAR szFilename[MAX_PATH];
RegLoadString(REG_CONFIG, REGVALUE, 1, szFilename, MAX_PATH, TEXT("")); RegLoadString(REG_CONFIG, REGVALUE, 1, szFilename, MAX_PATH, TEXT(""));
@ -189,7 +189,7 @@ void CPropertySheetHelper::SaveStateUpdate()
} }
// NB. OK'ing this property sheet will call SaveStateUpdate()->Snapshot_SetFilename() with this new path & filename // NB. OK'ing this property sheet will call SaveStateUpdate()->Snapshot_SetFilename() with this new path & filename
int CPropertySheetHelper::SaveStateSelectImage(HWND hWindow, TCHAR* pszTitle, bool bSave) int CPropertySheetHelper::SaveStateSelectImage(HWND hWindow, const TCHAR* pszTitle, bool bSave)
{ {
// Whenever harddisks/disks are inserted (or removed) and *if path has changed* then: // Whenever harddisks/disks are inserted (or removed) and *if path has changed* then:
// . Snapshot's path & Snapshot's filename will be updated to reflect the new defaults. // . Snapshot's path & Snapshot's filename will be updated to reflect the new defaults.
@ -209,7 +209,7 @@ int CPropertySheetHelper::SaveStateSelectImage(HWND hWindow, TCHAR* pszTitle, bo
ofn.lStructSize = sizeof(OPENFILENAME); ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = hWindow; ofn.hwndOwner = hWindow;
ofn.hInstance = GetFrame().g_hInstance; ofn.hInstance = GetFrame().g_hInstance;
ofn.lpstrFilter = TEXT("Save State files (*.aws.yaml)\0*.aws.yaml\0"); ofn.lpstrFilter = TEXT("Save State files (*.aws.yaml)\0*.aws.yaml\0")
TEXT("All Files\0*.*\0"); TEXT("All Files\0*.*\0");
ofn.lpstrFile = szFilename; // Dialog strips the last .EXT from this string (eg. file.aws.yaml is displayed as: file.aws ofn.lpstrFile = szFilename; // Dialog strips the last .EXT from this string (eg. file.aws.yaml is displayed as: file.aws
ofn.nMaxFile = sizeof(szFilename); ofn.nMaxFile = sizeof(szFilename);

4
source/Configuration/PropertySheetHelper.h
View file

@ -15,9 +15,9 @@ public:
void FillComboBox(HWND window, int controlid, LPCTSTR choices, int currentchoice); void FillComboBox(HWND window, int controlid, LPCTSTR choices, int currentchoice);
void SetSlot(UINT slot, SS_CARDTYPE newCardType); void SetSlot(UINT slot, SS_CARDTYPE newCardType);
std::string BrowseToFile(HWND hWindow, TCHAR* pszTitle, TCHAR* REGVALUE,TCHAR* FILEMASKS); std::string BrowseToFile(HWND hWindow, const TCHAR* pszTitle, const TCHAR* REGVALUE, const TCHAR* FILEMASKS);
void SaveStateUpdate(); void SaveStateUpdate();
int SaveStateSelectImage(HWND hWindow, TCHAR* pszTitle, bool bSave); int SaveStateSelectImage(HWND hWindow, const TCHAR* pszTitle, bool bSave);
void PostMsgAfterClose(HWND hWnd, PAGETYPE page); void PostMsgAfterClose(HWND hWnd, PAGETYPE page);
void ResetPageMask(void) { m_bmPages = 0; } // Req'd because cancelling doesn't clear the page-mask void ResetPageMask(void) { m_bmPages = 0; } // Req'd because cancelling doesn't clear the page-mask

26
source/Debugger/Debug.cpp
View file

@ -4368,7 +4368,7 @@ Update_t CmdMemoryLoad (int nArgs)
struct KnownFileType_t struct KnownFileType_t
{ {
char *pExtension; const char *pExtension;
int nAddress; int nAddress;
int nLength; int nLength;
}; };
@ -5005,7 +5005,7 @@ Update_t CmdNTSC (int nArgs)
struct KnownFileType_t struct KnownFileType_t
{ {
char *pExtension; const char *pExtension;
}; };
enum KnownFileType_e enum KnownFileType_e
@ -5032,9 +5032,9 @@ Update_t CmdNTSC (int nArgs)
assert( (nFileType == NUM_FILE_TYPES) ); assert( (nFileType == NUM_FILE_TYPES) );
#endif #endif
char *pFileName = (nArgs > 1) ? g_aArgs[ 2 ].sArg : ""; const char *pFileName = (nArgs > 1) ? g_aArgs[ 2 ].sArg : "";
int nLen = strlen( pFileName ); int nLen = strlen( pFileName );
char *pEnd = pFileName + nLen - 1; const char *pEnd = pFileName + nLen - 1;
while( pEnd > pFileName ) while( pEnd > pFileName )
{ {
if( *pEnd == '.' ) if( *pEnd == '.' )
@ -5558,7 +5558,7 @@ Update_t CmdNTSC (int nArgs)
} }
size_t nRead = fread( pSwizzled, g_nChromaSize, 1, pFile ); fread( pSwizzled, g_nChromaSize, 1, pFile );
if( iFileType == TYPE_BMP ) if( iFileType == TYPE_BMP )
{ {
@ -8296,12 +8296,12 @@ void ProfileFormat( bool bExport, ProfileFormat_e eFormatMode )
bOpcodeGood = false; bOpcodeGood = false;
} }
char *pColorOperator = ""; const char *pColorOperator = "";
char *pColorNumber = ""; const char *pColorNumber = "";
char *pColorOpcode = ""; const char *pColorOpcode = "";
char *pColorMnemonic = ""; const char *pColorMnemonic = "";
char *pColorOpmode = ""; const char *pColorOpmode = "";
char *pColorTotal = ""; const char *pColorTotal = "";
if (! bExport) if (! bExport)
{ {
pColorOperator = CHC_ARG_SEP; // grey pColorOperator = CHC_ARG_SEP; // grey
@ -8700,7 +8700,7 @@ void DebugContinueStepping(const bool bCallerWillUpdateDisplay/*=false*/)
{ {
TCHAR sText[ CONSOLE_WIDTH ]; TCHAR sText[ CONSOLE_WIDTH ];
char szStopMessage[CONSOLE_WIDTH]; char szStopMessage[CONSOLE_WIDTH];
char* pszStopReason = szStopMessage; const char* pszStopReason = szStopMessage;
if (regs.pc == g_nDebugStepUntil) if (regs.pc == g_nDebugStepUntil)
pszStopReason = TEXT("PC matches 'Go until' address"); pszStopReason = TEXT("PC matches 'Go until' address");
@ -8966,7 +8966,7 @@ void DebugInitialize ()
// Check all summary help to see if it fits within the console // Check all summary help to see if it fits within the console
for (int iCmd = 0; iCmd < NUM_COMMANDS; iCmd++ ) for (int iCmd = 0; iCmd < NUM_COMMANDS; iCmd++ )
{ {
char *pHelp = g_aCommands[ iCmd ].pHelpSummary; const char *pHelp = g_aCommands[ iCmd ].pHelpSummary;
if (pHelp) if (pHelp)
{ {
int nLen = _tcslen( pHelp ) + 2; int nLen = _tcslen( pHelp ) + 2;

2
source/Debugger/Debug.h
View file

@ -150,7 +150,7 @@
// Symbol Table / Memory // Symbol Table / Memory
bool FindAddressFromSymbol( const char* pSymbol, WORD * pAddress_ = NULL, int * iTable_ = NULL ); bool FindAddressFromSymbol( const char* pSymbol, WORD * pAddress_ = NULL, int * iTable_ = NULL );
WORD GetAddressFromSymbol( const char* symbol); // HACK: returns 0 if symbol not found WORD GetAddressFromSymbol( const char* symbol); // HACK: returns 0 if symbol not found
void SymbolUpdate( SymbolTable_Index_e eSymbolTable, char *pSymbolName, WORD nAddrss, bool bRemoveSymbol, bool bUpdateSymbol ); void SymbolUpdate( SymbolTable_Index_e eSymbolTable, const char *pSymbolName, WORD nAddrss, bool bRemoveSymbol, bool bUpdateSymbol );
const char* FindSymbolFromAddress( WORD nAdress, int * iTable_ = NULL ); const char* FindSymbolFromAddress( WORD nAdress, int * iTable_ = NULL );
const char* GetSymbol( WORD nAddress, int nBytes); const char* GetSymbol( WORD nAddress, int nBytes);

2
source/Debugger/Debugger_Assembler.h
View file

@ -172,7 +172,7 @@ extern int g_aAssemblerFirstDirective[ NUM_ASSEMBLERS ];
struct AssemblerDirective_t struct AssemblerDirective_t
{ {
char *m_pMnemonic; const char *m_pMnemonic;
Hash_t m_nHash; Hash_t m_nHash;
}; };

8
source/Debugger/Debugger_DisassemblerData.cpp
View file

@ -80,7 +80,7 @@ WORD _CmdDefineByteRange(int nArgs,int iArg,DisasmData_t & tData_)
tData_.nEndAddress = nAddress + nLen; tData_.nEndAddress = nAddress + nLen;
// tData_.nArraySize = 0; // tData_.nArraySize = 0;
char *pSymbolName = ""; const char *pSymbolName = "";
char aSymbolName[ MAX_SYMBOLS_LEN+1 ]; char aSymbolName[ MAX_SYMBOLS_LEN+1 ];
SymbolTable_Index_e eSymbolTable = SYMBOLS_ASSEMBLY; SymbolTable_Index_e eSymbolTable = SYMBOLS_ASSEMBLY;
bool bAutoDefineName = false; // 2.7.0.34 bool bAutoDefineName = false; // 2.7.0.34
@ -93,8 +93,8 @@ WORD _CmdDefineByteRange(int nArgs,int iArg,DisasmData_t & tData_)
} }
else else
{ {
pSymbolName = g_aArgs[ 1 ].sArg; g_aArgs[ 1 ].sArg[MAX_SYMBOLS_LEN] = 0; // truncate to max symbol length
pSymbolName[MAX_SYMBOLS_LEN] = 0; // truncate to max symbol length pSymbolName = g_aArgs[1].sArg;
} }
} }
else else
@ -167,7 +167,7 @@ Update_t CmdDisasmDataDefCode (int nArgs)
return UPDATE_DISASM | ConsoleUpdate(); return UPDATE_DISASM | ConsoleUpdate();
} }
char* g_aNopcodeTypes[ NUM_NOPCODE_TYPES ] = const char* g_aNopcodeTypes[ NUM_NOPCODE_TYPES ] =
{ {
"-n/a-" "-n/a-"
,"byte1" ,"byte1"

12
source/Debugger/Debugger_Display.cpp
View file

@ -140,12 +140,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
\x19 Down \x19 Down
*/ */
#if USE_APPLE_FONT #if USE_APPLE_FONT
char * g_sConfigBranchIndicatorUp [ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "^", "\x8B" }; // "`K" 0x4B const char * g_sConfigBranchIndicatorUp [ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "^", "\x8B" }; // "`K" 0x4B
char * g_sConfigBranchIndicatorEqual[ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "=", "\x88" }; // "`H" 0x48 const char * g_sConfigBranchIndicatorEqual[ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "=", "\x88" }; // "`H" 0x48
char * g_sConfigBranchIndicatorDown [ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "v", "\x8A" }; // "`J" 0x4A const char * g_sConfigBranchIndicatorDown [ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "v", "\x8A" }; // "`J" 0x4A
#else #else
char * g_sConfigBranchIndicatorUp [ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "^", "\x35" }; const char * g_sConfigBranchIndicatorUp [ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "^", "\x35" };
char * g_sConfigBranchIndicatorEqual[ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "=", "\x33" }; const char * g_sConfigBranchIndicatorEqual[ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "=", "\x33" };
char * g_sConfigBranchIndicatorDown [ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "v", "\x36" }; char * g_sConfigBranchIndicatorDown [ NUM_DISASM_BRANCH_TYPES+1 ] = { " ", "v", "\x36" };
#endif #endif
@ -2832,7 +2832,7 @@ void _DrawSoftSwitchAddress( RECT & rect, int nAddress, int bg_default = BG_INFO
// 2.7.0.7 Cleaned up display of soft-switches to show address. // 2.7.0.7 Cleaned up display of soft-switches to show address.
//=========================================================================== //===========================================================================
void _DrawSoftSwitch( RECT & rect, int nAddress, bool bSet, char *sPrefix, char *sOn, char *sOff, const char *sSuffix = NULL, int bg_default = BG_INFO ) void _DrawSoftSwitch( RECT & rect, int nAddress, bool bSet, const char *sPrefix, const char *sOn, const char *sOff, const char *sSuffix = NULL, int bg_default = BG_INFO )
{ {
RECT temp = rect; RECT temp = rect;

4
source/Debugger/Debugger_Help.cpp
View file

@ -335,7 +335,7 @@ void _ColorizeString(
// pOperator is one of CHC_* // pOperator is one of CHC_*
void _ColorizeOperator( void _ColorizeOperator(
char * & pDst, const char * & pSrc, char * & pDst, const char * & pSrc,
char * pOperator ) const char * pOperator )
{ {
int nLen; int nLen;
@ -828,7 +828,7 @@ Update_t CmdHelpSpecific (int nArgs)
if (pCommand) if (pCommand)
{ {
char *pHelp = pCommand->pHelpSummary; const char *pHelp = pCommand->pHelpSummary;
if (pHelp) if (pHelp)
{ {
if (bCategory) if (bCategory)

6
source/Debugger/Debugger_Symbols.cpp
View file

@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// Symbols ________________________________________________________________________________________ // Symbols ________________________________________________________________________________________
char* g_sFileNameSymbols[ NUM_SYMBOL_TABLES ] = { const char* g_sFileNameSymbols[ NUM_SYMBOL_TABLES ] = {
"APPLE2E.SYM" "APPLE2E.SYM"
,"A2_BASIC.SYM" ,"A2_BASIC.SYM"
,"A2_ASM.SYM" ,"A2_ASM.SYM"
@ -55,7 +55,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
}; };
std::string g_sFileNameSymbolsUser; std::string g_sFileNameSymbolsUser;
char * g_aSymbolTableNames[ NUM_SYMBOL_TABLES ] = const char * g_aSymbolTableNames[ NUM_SYMBOL_TABLES ] =
{ {
"Main" "Main"
,"Basic" ,"Basic"
@ -833,7 +833,7 @@ Update_t _CmdSymbolsClear( SymbolTable_Index_e eSymbolTable )
//=========================================================================== //===========================================================================
void SymbolUpdate( SymbolTable_Index_e eSymbolTable, char *pSymbolName, WORD nAddress, bool bRemoveSymbol, bool bUpdateSymbol ) void SymbolUpdate( SymbolTable_Index_e eSymbolTable, const char *pSymbolName, WORD nAddress, bool bRemoveSymbol, bool bUpdateSymbol )
{ {
if (bRemoveSymbol) if (bRemoveSymbol)
pSymbolName = g_aArgs[2].sArg; pSymbolName = g_aArgs[2].sArg;

2
source/Debugger/Debugger_Types.h
View file

@ -270,7 +270,7 @@
char m_sName[ MAX_COMMAND_LEN ]; char m_sName[ MAX_COMMAND_LEN ];
CmdFuncPtr_t pFunction; CmdFuncPtr_t pFunction;
int iCommand; // offset (enum) for direct command name lookup int iCommand; // offset (enum) for direct command name lookup
char *pHelpSummary; // 1 line help summary const char *pHelpSummary; // 1 line help summary
// Hash_t m_nHash; // TODO // Hash_t m_nHash; // TODO
}; };

88
source/Mockingboard.cpp
View file

@ -275,6 +275,8 @@ static void StopTimer2(SY6522_AY8910* pMB)
static void ResetSY6522(SY6522_AY8910* pMB) static void ResetSY6522(SY6522_AY8910* pMB)
{ {
memset(&pMB->sy6522,0,sizeof(SY6522)); memset(&pMB->sy6522,0,sizeof(SY6522));
pMB->sy6522.TIMER1_LATCH.w = 0xffff; // Some random value (but pick $ffff so it's deterministic)
// . NB. if it's too small (< ~$0007) then MB detection routines will fail!
StopTimer1(pMB); StopTimer1(pMB);
StopTimer2(pMB); StopTimer2(pMB);
@ -694,6 +696,23 @@ static void SY6522_Write(BYTE nDevice, BYTE nReg, BYTE nValue)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static bool CheckTimerUnderflow(USHORT& counter, int& timerIrqDelay, const USHORT nClocks);
static int OnTimer1Underflow(USHORT& counter, USHORT latch);
static USHORT GetTimer1Counter(BYTE reg, USHORT counter, USHORT latch, int timerIrqDelay)
{
const UINT opcodeCycleAdjust = GetOpcodeCyclesForRead(reg) - 1; // to compensate for the 4/5/6 cycle read opcode
if (CheckTimerUnderflow(counter, timerIrqDelay, opcodeCycleAdjust))
OnTimer1Underflow(counter, latch);
return counter;
}
static USHORT GetTimer2Counter(BYTE reg, USHORT counter)
{
const UINT opcodeCycleAdjust = GetOpcodeCyclesForRead(reg) - 1; // to compensate for the 4/5/6 cycle read opcode
return counter - opcodeCycleAdjust;
}
static BYTE SY6522_Read(BYTE nDevice, BYTE nReg) static BYTE SY6522_Read(BYTE nDevice, BYTE nReg)
{ {
g_bMB_Active = true; g_bMB_Active = true;
@ -716,18 +735,12 @@ static BYTE SY6522_Read(BYTE nDevice, BYTE nReg)
nValue = pMB->sy6522.DDRA; nValue = pMB->sy6522.DDRA;
break; break;
case 0x04: // TIMER1L_COUNTER case 0x04: // TIMER1L_COUNTER
{ // NB. GH#701 (T1C:=0xFFFF, LDA T1C_L[4cy], A==0xFC)
// NB. GH#701 (T1C:=0xFFFF, LDA T1C_L, A==0xFC) nValue = GetTimer1Counter(nReg, pMB->sy6522.TIMER1_COUNTER.w, pMB->sy6522.TIMER1_LATCH.w, pMB->sy6522.timer1IrqDelay) & 0xff;
const UINT opcodeCycleAdjust = GetOpcodeCyclesForRead(nReg) - 1; // to compensate for the 4/5/6 cycle read opcode UpdateIFR(pMB, IxR_TIMER1);
nValue = (pMB->sy6522.TIMER1_COUNTER.w - opcodeCycleAdjust) & 0xff;
UpdateIFR(pMB, IxR_TIMER1);
}
break; break;
case 0x05: // TIMER1H_COUNTER case 0x05: // TIMER1H_COUNTER
{ nValue = GetTimer1Counter(nReg, pMB->sy6522.TIMER1_COUNTER.w, pMB->sy6522.TIMER1_LATCH.w, pMB->sy6522.timer1IrqDelay) >> 8;
const UINT opcodeCycleAdjust = GetOpcodeCyclesForRead(nReg) - 1; // to compensate for the 4/5/6 cycle read opcode
nValue = (pMB->sy6522.TIMER1_COUNTER.w - opcodeCycleAdjust) >> 8;
}
break; break;
case 0x06: // TIMER1L_LATCH case 0x06: // TIMER1L_LATCH
nValue = pMB->sy6522.TIMER1_LATCH.l; nValue = pMB->sy6522.TIMER1_LATCH.l;
@ -736,17 +749,11 @@ static BYTE SY6522_Read(BYTE nDevice, BYTE nReg)
nValue = pMB->sy6522.TIMER1_LATCH.h; nValue = pMB->sy6522.TIMER1_LATCH.h;
break; break;
case 0x08: // TIMER2L case 0x08: // TIMER2L
{ nValue = GetTimer2Counter(nReg, pMB->sy6522.TIMER2_COUNTER.w) & 0xff;
const UINT opcodeCycleAdjust = GetOpcodeCyclesForRead(nReg) - 1; // to compensate for the 4/5/6 cycle read opcode UpdateIFR(pMB, IxR_TIMER2);
nValue = (pMB->sy6522.TIMER2_COUNTER.w - opcodeCycleAdjust) & 0xff;
UpdateIFR(pMB, IxR_TIMER2);
}
break; break;
case 0x09: // TIMER2H case 0x09: // TIMER2H
{ nValue = GetTimer2Counter(nReg, pMB->sy6522.TIMER2_COUNTER.w) >> 8;
const UINT opcodeCycleAdjust = GetOpcodeCyclesForRead(nReg) - 1; // to compensate for the 4/5/6 cycle read opcode
nValue = (pMB->sy6522.TIMER2_COUNTER.w - opcodeCycleAdjust) >> 8;
}
break; break;
case 0x0a: // SERIAL_SHIFT case 0x0a: // SERIAL_SHIFT
break; break;
@ -2007,7 +2014,7 @@ static BYTE __stdcall MB_Write(WORD PC, WORD nAddr, BYTE bWrite, BYTE nValue, UL
// . RESET -> Mockingboard mode (b#000) // . RESET -> Mockingboard mode (b#000)
// . $C0C1, then $C0C4 (or $C0C4, then $C0C1) -> Phasor mode (b#101) // . $C0C1, then $C0C4 (or $C0C4, then $C0C1) -> Phasor mode (b#101)
// . $C0C2 -> Echo+ mode (b#111) // . $C0C2 -> Echo+ mode (b#111)
// . $C0C5 -> remaing in Echo+ mode (b#111) // . $C0C5 -> remaining in Echo+ mode (b#111)
// So $C0C5 seemingly results in 2 different modes. // So $C0C5 seemingly results in 2 different modes.
// //
@ -2161,15 +2168,15 @@ void MB_PeriodicUpdate(UINT executedCycles)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static bool CheckTimerUnderflow(USHORT& timerCounter, int& timerIrqDelay, const USHORT nClocks) static bool CheckTimerUnderflow(USHORT& counter, int& timerIrqDelay, const USHORT nClocks)
{ {
if (nClocks == 0) if (nClocks == 0)
return false; return false;
int oldTimer = timerCounter; int oldTimer = counter;
int timer = timerCounter; int timer = counter;
timer -= nClocks; timer -= nClocks;
timerCounter = (USHORT)timer; counter = (USHORT)timer;
bool timerIrq = false; bool timerIrq = false;
@ -2192,6 +2199,15 @@ static bool CheckTimerUnderflow(USHORT& timerCounter, int& timerIrqDelay, const
return timerIrq; return timerIrq;
} }
static int OnTimer1Underflow(USHORT& counter, USHORT latch)
{
int timer = (int)(short)(counter);
while (timer < -1)
timer += (latch + kExtraTimerCycles); // GH#651: account for underflowed cycles / GH#652: account for extra 2 cycles
counter = (USHORT)timer;
return (timer == -1) ? 1 : 0; // timer1IrqDelay
}
// Called by: // Called by:
// . CpuExecute() every ~1000 cycles @ 1MHz // . CpuExecute() every ~1000 cycles @ 1MHz
// . MB_SyncEventCallback() on a TIMER1/2 underflow // . MB_SyncEventCallback() on a TIMER1/2 underflow
@ -2216,23 +2232,11 @@ void MB_UpdateCycles(ULONG uExecutedCycles)
SY6522_AY8910* pMB = &g_MB[i]; SY6522_AY8910* pMB = &g_MB[i];
const bool bTimer1Underflow = CheckTimerUnderflow(pMB->sy6522.TIMER1_COUNTER.w, pMB->sy6522.timer1IrqDelay, nClocks); const bool bTimer1Underflow = CheckTimerUnderflow(pMB->sy6522.TIMER1_COUNTER.w, pMB->sy6522.timer1IrqDelay, nClocks);
const bool bTimer2Underflow = CheckTimerUnderflow(pMB->sy6522.TIMER2_COUNTER.w, pMB->sy6522.timer2IrqDelay, nClocks); if (bTimer1Underflow)
pMB->sy6522.timer1IrqDelay = OnTimer1Underflow(pMB->sy6522.TIMER1_COUNTER.w, pMB->sy6522.TIMER1_LATCH.w);
if (pMB->bTimer1Active && bTimer1Underflow) // No TIMER2 latch so "after timing out, the counter will continue to decrement"
{ CheckTimerUnderflow(pMB->sy6522.TIMER2_COUNTER.w, pMB->sy6522.timer2IrqDelay, nClocks);
pMB->sy6522.TIMER1_COUNTER.w += pMB->sy6522.TIMER1_LATCH.w; // GH#651: account for underflowed cycles too
pMB->sy6522.TIMER1_COUNTER.w += kExtraTimerCycles; // GH#652: account for extra 2 cycles
// EG. T1C=0xFFFE, T1L=0x0001
// . T1C += T1L = 0xFFFF
// . T1C += 2 = 0x0001
if (pMB->sy6522.TIMER1_COUNTER.w > pMB->sy6522.TIMER1_LATCH.w)
{
if (pMB->sy6522.TIMER1_LATCH.w)
pMB->sy6522.TIMER1_COUNTER.w %= pMB->sy6522.TIMER1_LATCH.w; // Only occurs if LATCH.w<0x0007 (# cycles for longest opcode)
else
pMB->sy6522.TIMER1_COUNTER.w = 0;
}
}
} }
} }
@ -2249,6 +2253,8 @@ static int MB_SyncEventCallback(int id, int /*cycles*/, ULONG uExecutedCycles)
UpdateIFR(pMB, 0, IxR_TIMER1); UpdateIFR(pMB, 0, IxR_TIMER1);
MB_UpdateCycles(uExecutedCycles);
if ((pMB->sy6522.ACR & RUNMODE) == RM_ONESHOT) if ((pMB->sy6522.ACR & RUNMODE) == RM_ONESHOT)
{ {
// One-shot mode // One-shot mode
@ -2257,8 +2263,6 @@ static int MB_SyncEventCallback(int id, int /*cycles*/, ULONG uExecutedCycles)
return 0; // Don't repeat event return 0; // Don't repeat event
} }
MB_UpdateCycles(uExecutedCycles);
StartTimer1(pMB); StartTimer1(pMB);
return pMB->sy6522.TIMER1_COUNTER.w + kExtraTimerCycles; return pMB->sy6522.TIMER1_COUNTER.w + kExtraTimerCycles;
} }

2
source/SoundCore.cpp
View file

@ -80,7 +80,7 @@ static BOOL CALLBACK DSEnumProc(LPGUID lpGUID, LPCTSTR lpszDesc, LPCTSTR lpszDrv
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifdef _DEBUG #ifdef _DEBUG
static char *DirectSound_ErrorText (HRESULT error) static const char *DirectSound_ErrorText (HRESULT error)
{ {
switch( error ) switch( error )
{ {