Fix MSVC compiling

This commit is contained in:
Barry Harris 2011-12-08 21:24:53 +00:00
parent dfd8e1553d
commit 6365ee131b
3 changed files with 882 additions and 856 deletions

View File

@ -75,58 +75,57 @@ void DebugTrackerExit()
if (Debug_HiscoreInitted) bprintf(PRINT_ERROR, _T("Hiscore Not Exited\n"));
if (Debug_GenericTilesInitted) bprintf(PRINT_ERROR, _T("GenericTiles Not Exited\n"));
CHECK_DEVICE_EXIT(8255PPI);
CHECK_DEVICE_EXIT(EEPROM);
CHECK_DEVICE_EXIT(Pandora);
CHECK_DEVICE_EXIT(SeibuSnd);
CHECK_DEVICE_EXIT(TimeKpr);
if (DebugDev_8255PPIInitted) bprintf(PRINT_ERROR, _T("Device 8255PPI Not Exited\n"));
if (DebugDev_EEPROMInitted) bprintf(PRINT_ERROR, _T("Device EEPROM Not Exited\n"));
if (DebugDev_PandoraInitted) bprintf(PRINT_ERROR, _T("Device Pandora Not Exited\n"));
if (DebugDev_SeibuSndInitted) bprintf(PRINT_ERROR, _T("Device SeibuSnd Not Exited\n"));
if (DebugDev_TimeKprInitted) bprintf(PRINT_ERROR, _T("Device TimeKpr Not Exited\n"));
CHECK_SOUND_EXIT(AY8910);
CHECK_SOUND_EXIT(Y8950);
CHECK_SOUND_EXIT(YM2151);
CHECK_SOUND_EXIT(YM2203);
CHECK_SOUND_EXIT(YM2413);
CHECK_SOUND_EXIT(YM2608);
CHECK_SOUND_EXIT(YM2610);
CHECK_SOUND_EXIT(YM2612);
CHECK_SOUND_EXIT(YM3526);
CHECK_SOUND_EXIT(YM3812);
CHECK_SOUND_EXIT(YMF278B);
CHECK_SOUND_EXIT(DAC);
CHECK_SOUND_EXIT(ES5506);
CHECK_SOUND_EXIT(ES8712);
CHECK_SOUND_EXIT(ICS2115);
CHECK_SOUND_EXIT(IremGA20);
CHECK_SOUND_EXIT(K007232);
CHECK_SOUND_EXIT(K051649);
CHECK_SOUND_EXIT(K053260);
CHECK_SOUND_EXIT(K054539);
CHECK_SOUND_EXIT(MSM5205);
CHECK_SOUND_EXIT(MSM6295);
CHECK_SOUND_EXIT(NamcoSnd);
CHECK_SOUND_EXIT(RF5C68);
CHECK_SOUND_EXIT(SAA1099);
CHECK_SOUND_EXIT(Samples);
CHECK_SOUND_EXIT(SegaPCM);
CHECK_SOUND_EXIT(SN76496);
CHECK_SOUND_EXIT(UPD7759);
CHECK_SOUND_EXIT(X1010);
CHECK_SOUND_EXIT(YMZ280B);
if (DebugSnd_AY8910Initted) bprintf(PRINT_ERROR, _T("Sound Module AY8910 Not Exited\n"));
if (DebugSnd_Y8950Initted) bprintf(PRINT_ERROR, _T("Sound Module Y8950 Not Exited\n"));
if (DebugSnd_YM2151Initted) bprintf(PRINT_ERROR, _T("Sound Module YM2151 Not Exited\n"));
if (DebugSnd_YM2203Initted) bprintf(PRINT_ERROR, _T("Sound Module YM2203 Not Exited\n"));
if (DebugSnd_YM2413Initted) bprintf(PRINT_ERROR, _T("Sound Module YM2413 Not Exited\n"));
if (DebugSnd_YM2608Initted) bprintf(PRINT_ERROR, _T("Sound Module YM2608 Not Exited\n"));
if (DebugSnd_YM2610Initted) bprintf(PRINT_ERROR, _T("Sound Module YM2610 Not Exited\n"));
if (DebugSnd_YM2612Initted) bprintf(PRINT_ERROR, _T("Sound Module YM2612 Not Exited\n"));
if (DebugSnd_YM3526Initted) bprintf(PRINT_ERROR, _T("Sound Module YM3526 Not Exited\n"));
if (DebugSnd_YM3812Initted) bprintf(PRINT_ERROR, _T("Sound Module YM3812 Not Exited\n"));
if (DebugSnd_YMF278BInitted) bprintf(PRINT_ERROR, _T("Sound Module YMF278B Not Exited\n"));
if (DebugSnd_DACInitted) bprintf(PRINT_ERROR, _T("Sound Module DAC Not Exited\n"));
if (DebugSnd_ES5506Initted) bprintf(PRINT_ERROR, _T("Sound Module ES5506 Not Exited\n"));
if (DebugSnd_ES8712Initted) bprintf(PRINT_ERROR, _T("Sound Module ES8712 Not Exited\n"));
if (DebugSnd_ICS2115Initted) bprintf(PRINT_ERROR, _T("Sound Module ICS2115 Not Exited\n"));
if (DebugSnd_IremGA20Initted) bprintf(PRINT_ERROR, _T("Sound Module IremGA20 Not Exited\n"));
if (DebugSnd_K007232Initted) bprintf(PRINT_ERROR, _T("Sound Module K007232 Not Exited\n"));
if (DebugSnd_K051649Initted) bprintf(PRINT_ERROR, _T("Sound Module K051649 Not Exited\n"));
if (DebugSnd_K053260Initted) bprintf(PRINT_ERROR, _T("Sound Module K053260 Not Exited\n"));
if (DebugSnd_K054539Initted) bprintf(PRINT_ERROR, _T("Sound Module K054539 Not Exited\n"));
if (DebugSnd_MSM5205Initted) bprintf(PRINT_ERROR, _T("Sound Module MSM5205 Not Exited\n"));
if (DebugSnd_MSM6295Initted) bprintf(PRINT_ERROR, _T("Sound Module MSM6295 Not Exited\n"));
if (DebugSnd_NamcoSndInitted) bprintf(PRINT_ERROR, _T("Sound Module NamcoSnd Not Exited\n"));
if (DebugSnd_SAA1099Initted) bprintf(PRINT_ERROR, _T("Sound Module SAA1099 Not Exited\n"));
if (DebugSnd_SamplesInitted) bprintf(PRINT_ERROR, _T("Sound Module Samples Not Exited\n"));
if (DebugSnd_SegaPCMInitted) bprintf(PRINT_ERROR, _T("Sound Module SegaPCM Not Exited\n"));
if (DebugSnd_SN76496Initted) bprintf(PRINT_ERROR, _T("Sound Module SN76496 Not Exited\n"));
if (DebugSnd_UPD7759Initted) bprintf(PRINT_ERROR, _T("Sound Module UPD7759 Not Exited\n"));
if (DebugSnd_X1010Initted) bprintf(PRINT_ERROR, _T("Sound Module X1010 Not Exited\n"));
if (DebugSnd_YMZ280BInitted) bprintf(PRINT_ERROR, _T("Sound Module YMZ280B Not Exited\n"));
CHECK_CPU_EXIT(ARM7);
CHECK_CPU_EXIT(ARM);
CHECK_CPU_EXIT(H6280);
CHECK_CPU_EXIT(HD6309);
CHECK_CPU_EXIT(Konami);
CHECK_CPU_EXIT(M6502);
CHECK_CPU_EXIT(M6800);
CHECK_CPU_EXIT(M6805);
CHECK_CPU_EXIT(M6809);
CHECK_CPU_EXIT(S2650);
CHECK_CPU_EXIT(Sek);
CHECK_CPU_EXIT(Vez);
CHECK_CPU_EXIT(Zet);
CHECK_CPU_EXIT(I8039);
CHECK_CPU_EXIT(SH2);
if (DebugCPU_ARM7Initted) bprintf(PRINT_ERROR, _T("CPU ARM7 Not Exited\n"));
if (DebugCPU_ARMInitted) bprintf(PRINT_ERROR, _T("CPU ARM Not Exited\n"));
if (DebugCPU_H6280Initted) bprintf(PRINT_ERROR, _T("CPU H6280 Not Exited\n"));
if (DebugCPU_HD6309Initted) bprintf(PRINT_ERROR, _T("CPU HD6309 Not Exited\n"));
if (DebugCPU_KonamiInitted) bprintf(PRINT_ERROR, _T("CPU Konami Not Exited\n"));
if (DebugCPU_M6502Initted) bprintf(PRINT_ERROR, _T("CPU M6502 Not Exited\n"));
if (DebugCPU_M6800Initted) bprintf(PRINT_ERROR, _T("CPU M6800 Not Exited\n"));
if (DebugCPU_M6805Initted) bprintf(PRINT_ERROR, _T("CPU M6805 Not Exited\n"));
if (DebugCPU_M6809Initted) bprintf(PRINT_ERROR, _T("CPU M6809 Not Exited\n"));
if (DebugCPU_S2650Initted) bprintf(PRINT_ERROR, _T("CPU S2650 Not Exited\n"));
if (DebugCPU_SekInitted) bprintf(PRINT_ERROR, _T("CPU Sek Not Exited\n"));
if (DebugCPU_VezInitted) bprintf(PRINT_ERROR, _T("CPU Vez Not Exited\n"));
if (DebugCPU_ZetInitted) bprintf(PRINT_ERROR, _T("CPU Zet Not Exited\n"));
if (DebugCPU_I8039Initted) bprintf(PRINT_ERROR, _T("CPU I8039 Not Exited\n"));
if (DebugCPU_SH2Initted) bprintf(PRINT_ERROR, _T("CPU SH2 Not Exited\n"));
}

File diff suppressed because it is too large Load Diff

View File

@ -147,9 +147,9 @@ INT32 SekRun(const INT32 nCycles);
inline static INT32 SekIdle(INT32 nCycles)
{
#if defined FBA_DEBUG
extern INT32 DebugCPU_SekInitted;
if (!DebugCPU_SekInitted) bprintf(PRINT_ERROR, _T("SekIdle called without init\n"));
if (nSekActive == -1) bprintf(PRINT_ERROR, _T("SekIdle called when no CPU open\n"));
extern UINT8 DebugCPU_SekInitted;
if (!DebugCPU_SekInitted) bprintf(PRINT_ERROR, (TCHAR*)_T("SekIdle called without init\n"));
if (nSekActive == -1) bprintf(PRINT_ERROR, (TCHAR*)_T("SekIdle called when no CPU open\n"));
#endif
nSekCyclesTotal += nCycles;
@ -160,9 +160,9 @@ inline static INT32 SekIdle(INT32 nCycles)
inline static INT32 SekSegmentCycles()
{
#if defined FBA_DEBUG
extern INT32 DebugCPU_SekInitted;
if (!DebugCPU_SekInitted) bprintf(PRINT_ERROR, _T("SekSegmentCycles called without init\n"));
if (nSekActive == -1) bprintf(PRINT_ERROR, _T("SekSegmentCycles called when no CPU open\n"));
extern UINT8 DebugCPU_SekInitted;
if (!DebugCPU_SekInitted) bprintf(PRINT_ERROR, (TCHAR*)_T("SekSegmentCycles called without init\n"));
if (nSekActive == -1) bprintf(PRINT_ERROR, (TCHAR*)_T("SekSegmentCycles called when no CPU open\n"));
#endif
#ifdef EMU_M68K
@ -179,9 +179,9 @@ inline static INT32 SekTotalCycles()
#endif
{
#if defined FBA_DEBUG
extern INT32 DebugCPU_SekInitted;
if (!DebugCPU_SekInitted) bprintf(PRINT_ERROR, _T("SekTotalCycles called without init\n"));
if (nSekActive == -1) bprintf(PRINT_ERROR, _T("SekTotalCycles called when no CPU open\n"));
extern UINT8 DebugCPU_SekInitted;
if (!DebugCPU_SekInitted) bprintf(PRINT_ERROR, (TCHAR*)_T("SekTotalCycles called without init\n"));
if (nSekActive == -1) bprintf(PRINT_ERROR, (TCHAR*)_T("SekTotalCycles called when no CPU open\n"));
#endif
#ifdef EMU_M68K
@ -194,9 +194,9 @@ inline static INT32 SekTotalCycles()
inline static INT32 SekCurrentScanline()
{
#if defined FBA_DEBUG
extern INT32 DebugCPU_SekInitted;
if (!DebugCPU_SekInitted) bprintf(PRINT_ERROR, _T("SekCurrentScanline called without init\n"));
if (nSekActive == -1) bprintf(PRINT_ERROR, _T("SekCurrentScanline called when no CPU open\n"));
extern UINT8 DebugCPU_SekInitted;
if (!DebugCPU_SekInitted) bprintf(PRINT_ERROR, (TCHAR*)_T("SekCurrentScanline called without init\n"));
if (nSekActive == -1) bprintf(PRINT_ERROR, (TCHAR*)_T("SekCurrentScanline called when no CPU open\n"));
#endif
return SekTotalCycles() / nSekCyclesScanline;