diff --git a/src/emucore/System.cxx b/src/emucore/System.cxx index 7bf3551ef..2fa33a201 100644 --- a/src/emucore/System.cxx +++ b/src/emucore/System.cxx @@ -159,33 +159,29 @@ void System::poke(uInt16 addr, uInt8 value, Device::AccessFlags flags) myDataBusState = value; } +#ifdef DEBUGGER_SUPPORT // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Device::AccessFlags System::getAccessFlags(uInt16 addr) const { -#ifdef DEBUGGER_SUPPORT const PageAccess& access = getPageAccess(addr); if(access.codeAccessBase) return *(access.codeAccessBase + (addr & PAGE_MASK)); else return access.device->getAccessFlags(addr); -#else - return 0; -#endif } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void System::setAccessFlags(uInt16 addr, Device::AccessFlags flags) { -#ifdef DEBUGGER_SUPPORT const PageAccess& access = getPageAccess(addr); if(access.codeAccessBase) *(access.codeAccessBase + (addr & PAGE_MASK)) |= flags; else access.device->setAccessFlags(addr, flags); -#endif } +#endif // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool System::save(Serializer& out) const diff --git a/src/windows/Stella.sln b/src/windows/Stella.sln index fb70ffeaf..3aae8e551 100755 --- a/src/windows/Stella.sln +++ b/src/windows/Stella.sln @@ -1,16 +1,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.168 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29613.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Stella", "Stella.vcxproj", "{D7FCEC7F-33E1-49DD-A4B0-D5FC222250AD}" EndProject Global - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Debug-NoDebugger|Win32 = Debug-NoDebugger|Win32 + Debug-NoDebugger|x64 = Debug-NoDebugger|x64 Profile|Win32 = Profile|Win32 Profile|x64 = Profile|x64 Release|Win32 = Release|Win32 @@ -21,6 +20,10 @@ Global {D7FCEC7F-33E1-49DD-A4B0-D5FC222250AD}.Debug|Win32.Build.0 = Debug|Win32 {D7FCEC7F-33E1-49DD-A4B0-D5FC222250AD}.Debug|x64.ActiveCfg = Debug|x64 {D7FCEC7F-33E1-49DD-A4B0-D5FC222250AD}.Debug|x64.Build.0 = Debug|x64 + {D7FCEC7F-33E1-49DD-A4B0-D5FC222250AD}.Debug-NoDebugger|Win32.ActiveCfg = Debug-NoDebugger|Win32 + {D7FCEC7F-33E1-49DD-A4B0-D5FC222250AD}.Debug-NoDebugger|Win32.Build.0 = Debug-NoDebugger|Win32 + {D7FCEC7F-33E1-49DD-A4B0-D5FC222250AD}.Debug-NoDebugger|x64.ActiveCfg = Debug-NoDebugger|x64 + {D7FCEC7F-33E1-49DD-A4B0-D5FC222250AD}.Debug-NoDebugger|x64.Build.0 = Debug-NoDebugger|x64 {D7FCEC7F-33E1-49DD-A4B0-D5FC222250AD}.Profile|Win32.ActiveCfg = Profile|Win32 {D7FCEC7F-33E1-49DD-A4B0-D5FC222250AD}.Profile|Win32.Build.0 = Profile|Win32 {D7FCEC7F-33E1-49DD-A4B0-D5FC222250AD}.Profile|x64.ActiveCfg = Profile|x64 @@ -42,4 +45,7 @@ Global GlobalSection(Performance) = preSolution HasPerformanceSessions = true EndGlobalSection + GlobalSection(Performance) = preSolution + HasPerformanceSessions = true + EndGlobalSection EndGlobal diff --git a/src/windows/Stella.vcxproj b/src/windows/Stella.vcxproj index e15336141..9aa49cb84 100644 --- a/src/windows/Stella.vcxproj +++ b/src/windows/Stella.vcxproj @@ -1,6 +1,14 @@  + + Debug-NoDebugger + Win32 + + + Debug-NoDebugger + x64 + Debug Win32 @@ -48,6 +56,11 @@ MultiByte v141_xp + + Application + MultiByte + v141_xp + Application MultiByte @@ -63,6 +76,11 @@ MultiByte v141_xp + + Application + MultiByte + v141_xp + false @@ -81,6 +99,10 @@ + + + + @@ -93,15 +115,25 @@ + + + + <_ProjectFileVersion>10.0.30319.1 $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ true + true $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ true + true $(Platform)\$(Configuration)\ Release\ $(Platform)\$(Configuration)\ @@ -111,11 +143,17 @@ $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset AllRules.ruleset @@ -133,6 +171,10 @@ $(ProjectDir)\SDL\lib\x86;$(LibraryPath) $(ProjectDir)\SDL\include;$(IncludePath) + + $(ProjectDir)\SDL\lib\x86;$(LibraryPath) + $(ProjectDir)\SDL\include;$(IncludePath) + $(ProjectDir)\SDL\lib\x86;$(LibraryPath) $(ProjectDir)\SDL\include;$(IncludePath) @@ -145,6 +187,10 @@ $(ProjectDir)\SDL\lib\x64;$(LibraryPath) $(ProjectDir)\SDL\include;$(IncludePath) + + $(ProjectDir)\SDL\lib\x64;$(LibraryPath) + $(ProjectDir)\SDL\include;$(IncludePath) + $(ProjectDir)\SDL\lib\x64;$(LibraryPath) $(ProjectDir)\SDL\include;$(IncludePath) @@ -187,6 +233,40 @@ Default + + + Disabled + ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories) + BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;GUI_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + + + Level4 + EditAndContinue + $(IntDir)obj\\windows\%(RelativeDir) + StreamingSIMDExtensions + stdcpp17 + true + 4100;4127;4146;4244;%(DisableSpecificWarnings) + CompileAsCpp + NoListing + $(IntDir)asm\windows\%(RelativeDir) + + + SDL2.lib;SDL2main.lib;SDL2main.lib;%(AdditionalDependencies) + $(OutDir)Stella.exe + true + $(OutDir)Stella.pdb + Console + false + + + MachineX86 + Default + + X64 @@ -223,6 +303,42 @@ Default + + + X64 + + + Disabled + ..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories) + BSPF_WINDOWS;WIN32;NOMINMAX;DEBUG_BUILD;SDL_SUPPORT;GUI_SUPPORT;PNG_SUPPORT;ZIP_SUPPORT;JOYSTICK_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + + + Level4 + ProgramDatabase + $(IntDir)obj\\windows\%(RelativeDir) + stdcpp17 + true + 4100;4127;4146;4244;%(DisableSpecificWarnings) + CompileAsCpp + NoListing + $(IntDir)asm\windows\%(RelativeDir) + + + SDL2.lib;SDL2main.lib;SDL2main.lib;%(AdditionalDependencies) + $(OutDir)Stella.exe + true + $(OutDir)Stella.pdb + Console + false + + + MachineX64 + Default + + true @@ -403,70 +519,201 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + @@ -591,31 +838,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + @@ -653,421 +947,541 @@ CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC Level2 + Level2 Level2 Level2 Level2 + Level2 Level2 Level2 CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC @@ -1118,73 +1532,207 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + @@ -1339,33 +1887,87 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true +