From a429a7fd08b6c0f1c878ba63965e68dbd472253f Mon Sep 17 00:00:00 2001 From: zilmar Date: Sun, 6 Dec 2015 20:59:58 +1100 Subject: [PATCH] [Project64] Create Project64-core --- Project64.sln | 13 +- Project64.vs2008.sln | 7 + .../3rdParty/7zip.cpp | 0 .../3rdParty/7zip.h | 0 .../3rdParty/zip.h | 0 .../{Project64 => Project64-core}/AppInit.cpp | 9 +- .../{Project64 => Project64-core}/AppInit.h | 0 .../{Project64 => Project64-core}/Debugger.h | 0 Source/Project64-core/ExceptionHandler.h | 4 + .../Logging.cpp} | 8 +- .../{Project64 => Project64-core}/Logging.h | 2 +- .../Multilanguage.h | 0 .../Multilanguage/LanguageClass.cpp | 0 .../Multilanguage/LanguageClass.h | 0 .../N64System/CheatClass.cpp | 6 + .../N64System/CheatClass.h | 3 + .../N64System/EmulationThread.cpp | 3 +- .../N64System}/FramePerSecondClass.cpp | 7 +- .../N64System}/FramePerSecondClass.h | 4 +- .../N64System/Interpreter/InterpreterCPU.cpp | 9 + .../N64System/Interpreter/InterpreterCPU.h | 2 +- .../N64System/Interpreter/InterpreterOps.cpp | 12 +- .../N64System/Interpreter/InterpreterOps.h | 6 +- .../Interpreter/InterpreterOps32.cpp | 7 +- .../N64System/Interpreter/InterpreterOps32.h | 0 .../N64System/Interpreter/stdafx.h | 0 .../N64System/Mips/Audio.cpp | 4 +- .../N64System/Mips/Audio.h | 0 .../N64System/Mips/Dma.cpp | 7 + .../N64System/Mips/Dma.h | 6 +- .../N64System/Mips/Eeprom.cpp | 5 +- .../N64System/Mips/Eeprom.h | 1 + .../N64System/Mips/FlashRam.cpp | 40 +- .../N64System/Mips/FlashRam.h | 23 +- .../N64System/Mips/MemoryClass.h | 0 .../N64System/Mips/MemoryLabelsClass.cpp | 0 .../N64System/Mips/MemoryLabelsClass.h | 0 .../N64System/Mips/MemoryVirtualMem.cpp | 7 + .../N64System/Mips/MemoryVirtualMem.h | 8 + .../N64System/Mips/Mempak.H | 9 +- .../N64System/Mips/Mempak.cpp | 18 +- .../N64System/Mips/OpCode.h | 0 .../N64System/Mips/OpcodeName.cpp} | 28 +- .../N64System/Mips/OpcodeName.h} | 24 +- .../N64System/Mips/PifRam.cpp | 44 +- .../N64System/Mips/PifRam.h | 12 +- .../N64System/Mips/RegisterClass.cpp | 7 +- .../N64System/Mips/RegisterClass.h | 6 +- .../N64System/Mips/Rumblepak.cpp | 14 +- .../N64System/Mips/Rumblepak.h | 5 +- .../N64System/Mips/Sram.cpp | 19 +- .../N64System/Mips/Sram.h | 6 +- .../N64System/Mips/SystemEvents.cpp | 6 +- .../N64System/Mips/SystemEvents.h | 9 +- .../N64System/Mips/SystemTiming.cpp | 23 +- .../N64System/Mips/SystemTiming.h | 7 +- .../N64System/Mips/TLBClass.h | 3 + .../N64System/Mips/TLBclass.cpp | 3 + .../N64System/Mips/TranslateVaddr.h | 0 .../N64System/N64Class.cpp | 15 +- .../N64System/N64Class.h | 17 +- .../N64System/N64RomClass.cpp | 6 + .../N64System/N64RomClass.h | 3 +- .../N64System/N64Types.h | 0 .../N64System/ProfilingClass.cpp | 10 +- .../N64System/ProfilingClass.h | 7 +- .../N64System/Recompiler/CodeBlock.cpp | 6 + .../N64System/Recompiler/CodeBlock.h | 4 + .../N64System/Recompiler/CodeSection.cpp | 19 +- .../N64System/Recompiler/CodeSection.h | 2 + .../N64System/Recompiler/ExitInfo.h | 2 + .../N64System/Recompiler/FunctionInfo.cpp | 1 + .../N64System/Recompiler/FunctionInfo.h | 1 + .../N64System/Recompiler/FunctionMapClass.cpp | 4 + .../N64System/Recompiler/FunctionMapClass.h | 1 + .../N64System/Recompiler/JumpInfo.h | 1 + .../N64System/Recompiler/LoopAnalysis.cpp | 7 + .../N64System/Recompiler/LoopAnalysis.h | 3 + .../N64System/Recompiler/RecompilerClass.cpp | 6 + .../N64System/Recompiler/RecompilerClass.h | 4 + .../N64System/Recompiler/RecompilerMemory.cpp | 18 +- .../N64System/Recompiler/RecompilerMemory.h | 1 + .../N64System/Recompiler/RecompilerOps.cpp | 12 +- .../N64System/Recompiler/RecompilerOps.h | 9 +- .../N64System/Recompiler/RegInfo.cpp | 7 +- .../N64System/Recompiler/RegInfo.h | 3 + .../N64System/Recompiler/SectionInfo.cpp | 2 + .../N64System/Recompiler/SectionInfo.h | 0 .../N64System/Recompiler/X86ops.cpp | 4 + .../N64System/Recompiler/X86ops.h | 0 .../N64System/Recompiler/x86CodeLog.cpp | 3 + .../N64System/Recompiler/x86CodeLog.h | 0 .../N64System/SpeedLimitorClass.cpp | 0 .../N64System/SpeedLimitorClass.h | 0 .../N64System/SystemGlobals.cpp | 1 + .../N64System/SystemGlobals.h | 27 +- Source/Project64-core/N64System/stdafx.h | 1 + Source/Project64-core/Notification.h | 34 + Source/{Project64 => Project64-core}/Plugin.h | 3 - .../Plugins/AudioPlugin.cpp | 7 + .../Plugins/AudioPlugin.h | 0 .../Plugins/ControllerPlugin.cpp | 5 + .../Plugins/ControllerPlugin.h | 0 .../Plugins/GFXPlugin.h | 0 .../Plugins/GFXplugin.cpp | 6 + .../Plugins/PluginBase.cpp | 2 + .../Plugins/PluginBase.h | 3 + .../Plugins/PluginClass.cpp | 8 +- .../Plugins/PluginClass.h | 10 +- .../Plugins/RSPPlugin.cpp | 7 + .../Plugins/RSPPlugin.h | 0 Source/Project64-core/Project64-core.vcproj | 717 +++++++++++++++++ Source/Project64-core/Project64-core.vcxproj | 206 +++++ .../Project64-core.vcxproj.filters | 567 ++++++++++++++ .../Settings/DebugSettings.cpp | 0 .../Settings/DebugSettings.h | 2 +- .../Settings/GameSettings.cpp | 4 +- .../Settings/GameSettings.h | 2 +- .../Settings/LoggingSettings.cpp | 0 .../Settings/LoggingSettings.h | 0 .../Settings/N64SystemSettings.cpp | 0 .../Settings/N64SystemSettings.h | 0 .../Settings/RecompilerSettings.cpp | 0 .../Settings/RecompilerSettings.h | 2 +- .../SettingType/SettingsType-Application.cpp | 0 .../SettingType/SettingsType-Application.h | 0 .../SettingsType-ApplicationIndex.cpp | 0 .../SettingsType-ApplicationIndex.h | 0 .../SettingsType-ApplicationPath.cpp | 0 .../SettingsType-ApplicationPath.h | 0 .../Settings/SettingType/SettingsType-Base.h | 0 .../SettingType/SettingsType-Cheats.cpp | 0 .../SettingType/SettingsType-Cheats.h | 0 .../SettingType/SettingsType-GameSetting.cpp | 0 .../SettingType/SettingsType-GameSetting.h | 0 .../SettingsType-GameSettingIndex.cpp | 0 .../SettingsType-GameSettingIndex.h | 0 .../SettingType/SettingsType-RDBCpuType.cpp | 0 .../SettingType/SettingsType-RDBCpuType.h | 0 .../SettingType/SettingsType-RDBOnOff.cpp | 0 .../SettingType/SettingsType-RDBOnOff.h | 0 .../SettingType/SettingsType-RDBRamSize.cpp | 0 .../SettingType/SettingsType-RDBRamSize.h | 0 .../SettingType/SettingsType-RDBSaveChip.cpp | 0 .../SettingType/SettingsType-RDBSaveChip.h | 0 .../SettingType/SettingsType-RDBYesNo.cpp | 0 .../SettingType/SettingsType-RDBYesNo.h | 0 .../SettingType/SettingsType-RelativePath.cpp | 0 .../SettingType/SettingsType-RelativePath.h | 0 .../SettingType/SettingsType-RomDatabase.cpp | 0 .../SettingType/SettingsType-RomDatabase.h | 0 .../SettingsType-RomDatabaseIndex.cpp | 0 .../SettingsType-RomDatabaseIndex.h | 0 .../SettingsType-RomDatabaseSetting.cpp | 0 .../SettingsType-RomDatabaseSetting.h | 0 .../SettingType/SettingsType-RomSetting.h | 0 .../SettingsType-SelectedDirectory.cpp | 0 .../SettingsType-SelectedDirectory.h | 0 .../SettingType/SettingsType-TempBool.cpp | 0 .../SettingType/SettingsType-TempBool.h | 0 .../SettingType/SettingsType-TempNumber.cpp | 0 .../SettingType/SettingsType-TempNumber.h | 0 .../SettingType/SettingsType-TempString.cpp | 0 .../SettingType/SettingsType-TempString.h | 0 .../Settings/SettingType/stdafx.h | 1 + .../Settings/Settings.h | 0 .../Settings/SettingsClass.cpp | 0 .../Settings/SettingsClass.h | 0 Source/Project64-core/Settings/stdafx.h | 1 + .../{Project64 => Project64-core}/Version.h | 0 Source/Project64-core/stdafx.cpp | 1 + Source/Project64-core/stdafx.h | 8 + Source/Project64/N64System.h | 85 +- Source/Project64/Plugins/PluginList.cpp | 2 +- Source/Project64/Plugins/PluginList.h | 2 +- Source/Project64/Project64.vcproj | 728 ------------------ Source/Project64/Project64.vcxproj | 217 +----- Source/Project64/Project64.vcxproj.filters | 719 +++-------------- Source/Project64/UserInterface.h | 6 +- .../Project64/UserInterface/CheatClassUI.cpp | 4 +- Source/Project64/UserInterface/GuiClass.cpp | 2 +- Source/Project64/UserInterface/GuiClass.h | 4 +- Source/Project64/UserInterface/LoggingUI.cpp | 4 +- .../UserInterface/NotificationClass.cpp | 60 +- .../UserInterface/NotificationClass.h | 18 +- .../Settings/SettingsPage-Game-General.h | 2 +- .../Settings/SettingsPage-Game-Plugin.h | 3 +- .../Settings/SettingsPage-Plugin.h | 2 +- .../UserInterface/SettingsConfig.cpp | 2 +- Source/Project64/UserInterface/UIResources.rc | 2 +- Source/Project64/main.cpp | 2 +- Source/Project64/stdafx.h | 10 +- Source/RSP/Interpreter Ops.c | 12 +- 193 files changed, 2268 insertions(+), 1867 deletions(-) rename Source/{Project64 => Project64-core}/3rdParty/7zip.cpp (100%) rename Source/{Project64 => Project64-core}/3rdParty/7zip.h (100%) rename Source/{Project64 => Project64-core}/3rdParty/zip.h (100%) rename Source/{Project64 => Project64-core}/AppInit.cpp (92%) rename Source/{Project64 => Project64-core}/AppInit.h (100%) rename Source/{Project64 => Project64-core}/Debugger.h (100%) create mode 100644 Source/Project64-core/ExceptionHandler.h rename Source/{Project64/logging.cpp => Project64-core/Logging.cpp} (99%) rename Source/{Project64 => Project64-core}/Logging.h (95%) rename Source/{Project64 => Project64-core}/Multilanguage.h (100%) rename Source/{Project64 => Project64-core}/Multilanguage/LanguageClass.cpp (100%) rename Source/{Project64 => Project64-core}/Multilanguage/LanguageClass.h (100%) rename Source/{Project64 => Project64-core}/N64System/CheatClass.cpp (94%) rename Source/{Project64 => Project64-core}/N64System/CheatClass.h (90%) rename Source/{Project64 => Project64-core}/N64System/EmulationThread.cpp (96%) rename Source/{Project64/UserInterface => Project64-core/N64System}/FramePerSecondClass.cpp (92%) rename Source/{Project64/UserInterface => Project64-core/N64System}/FramePerSecondClass.h (90%) rename Source/{Project64 => Project64-core}/N64System/Interpreter/InterpreterCPU.cpp (94%) rename Source/{Project64 => Project64-core}/N64System/Interpreter/InterpreterCPU.h (93%) rename Source/{Project64 => Project64-core}/N64System/Interpreter/InterpreterOps.cpp (95%) rename Source/{Project64 => Project64-core}/N64System/Interpreter/InterpreterOps.h (95%) rename Source/{Project64 => Project64-core}/N64System/Interpreter/InterpreterOps32.cpp (96%) rename Source/{Project64 => Project64-core}/N64System/Interpreter/InterpreterOps32.h (100%) rename Source/{Project64 => Project64-core}/N64System/Interpreter/stdafx.h (100%) rename Source/{Project64 => Project64-core}/N64System/Mips/Audio.cpp (95%) rename Source/{Project64 => Project64-core}/N64System/Mips/Audio.h (100%) rename Source/{Project64 => Project64-core}/N64System/Mips/Dma.cpp (94%) rename Source/{Project64 => Project64-core}/N64System/Mips/Dma.h (86%) rename Source/{Project64 => Project64-core}/N64System/Mips/Eeprom.cpp (94%) rename Source/{Project64 => Project64-core}/N64System/Mips/Eeprom.h (94%) rename Source/{Project64 => Project64-core}/N64System/Mips/FlashRam.cpp (81%) rename Source/{Project64 => Project64-core}/N64System/Mips/FlashRam.h (66%) rename Source/{Project64 => Project64-core}/N64System/Mips/MemoryClass.h (100%) rename Source/{Project64 => Project64-core}/N64System/Mips/MemoryLabelsClass.cpp (100%) rename Source/{Project64 => Project64-core}/N64System/Mips/MemoryLabelsClass.h (100%) rename Source/{Project64 => Project64-core}/N64System/Mips/MemoryVirtualMem.cpp (96%) rename Source/{Project64 => Project64-core}/N64System/Mips/MemoryVirtualMem.h (92%) rename Source/{Project64 => Project64-core}/N64System/Mips/Mempak.H (78%) rename Source/{Project64 => Project64-core}/N64System/Mips/Mempak.cpp (89%) rename Source/{Project64 => Project64-core}/N64System/Mips/OpCode.h (100%) rename Source/{Project64/N64System/C_Core/r4300iCommands.cpp => Project64-core/N64System/Mips/OpcodeName.cpp} (95%) rename Source/{Project64/N64System/C_Core/r4300iCommands.h => Project64-core/N64System/Mips/OpcodeName.h} (56%) rename Source/{Project64 => Project64-core}/N64System/Mips/PifRam.cpp (90%) rename Source/{Project64 => Project64-core}/N64System/Mips/PifRam.h (82%) rename Source/{Project64 => Project64-core}/N64System/Mips/RegisterClass.cpp (95%) rename Source/{Project64 => Project64-core}/N64System/Mips/RegisterClass.h (96%) rename Source/{Project64 => Project64-core}/N64System/Mips/Rumblepak.cpp (68%) rename Source/{Project64 => Project64-core}/N64System/Mips/Rumblepak.h (89%) rename Source/{Project64 => Project64-core}/N64System/Mips/Sram.cpp (89%) rename Source/{Project64 => Project64-core}/N64System/Mips/Sram.h (84%) rename Source/{Project64 => Project64-core}/N64System/Mips/SystemEvents.cpp (93%) rename Source/{Project64 => Project64-core}/N64System/Mips/SystemEvents.h (91%) rename Source/{Project64 => Project64-core}/N64System/Mips/SystemTiming.cpp (89%) rename Source/{Project64 => Project64-core}/N64System/Mips/SystemTiming.h (88%) rename Source/{Project64 => Project64-core}/N64System/Mips/TLBClass.h (94%) rename Source/{Project64 => Project64-core}/N64System/Mips/TLBclass.cpp (96%) rename Source/{Project64 => Project64-core}/N64System/Mips/TranslateVaddr.h (100%) rename Source/{Project64 => Project64-core}/N64System/N64Class.cpp (96%) rename Source/{Project64 => Project64-core}/N64System/N64Class.h (88%) rename Source/{Project64 => Project64-core}/N64System/N64RomClass.cpp (95%) rename Source/{Project64 => Project64-core}/N64System/N64RomClass.h (93%) rename Source/{Project64 => Project64-core}/N64System/N64Types.h (100%) rename Source/{Project64 => Project64-core}/N64System/ProfilingClass.cpp (94%) rename Source/{Project64 => Project64-core}/N64System/ProfilingClass.h (89%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/CodeBlock.cpp (96%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/CodeBlock.h (95%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/CodeSection.cpp (96%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/CodeSection.h (95%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/ExitInfo.h (92%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/FunctionInfo.cpp (96%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/FunctionInfo.h (96%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/FunctionMapClass.cpp (91%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/FunctionMapClass.h (95%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/JumpInfo.h (95%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/LoopAnalysis.cpp (96%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/LoopAnalysis.h (93%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/RecompilerClass.cpp (95%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/RecompilerClass.h (90%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/RecompilerMemory.cpp (76%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/RecompilerMemory.h (95%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/RecompilerOps.cpp (97%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/RecompilerOps.h (95%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/RegInfo.cpp (96%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/RegInfo.h (96%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/SectionInfo.cpp (95%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/SectionInfo.h (100%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/X86ops.cpp (96%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/X86ops.h (100%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/x86CodeLog.cpp (93%) rename Source/{Project64 => Project64-core}/N64System/Recompiler/x86CodeLog.h (100%) rename Source/{Project64 => Project64-core}/N64System/SpeedLimitorClass.cpp (100%) rename Source/{Project64 => Project64-core}/N64System/SpeedLimitorClass.h (100%) rename Source/{Project64 => Project64-core}/N64System/SystemGlobals.cpp (96%) rename Source/{Project64 => Project64-core}/N64System/SystemGlobals.h (80%) create mode 100644 Source/Project64-core/N64System/stdafx.h create mode 100644 Source/Project64-core/Notification.h rename Source/{Project64 => Project64-core}/Plugin.h (93%) rename Source/{Project64 => Project64-core}/Plugins/AudioPlugin.cpp (92%) rename Source/{Project64 => Project64-core}/Plugins/AudioPlugin.h (100%) rename Source/{Project64 => Project64-core}/Plugins/ControllerPlugin.cpp (93%) rename Source/{Project64 => Project64-core}/Plugins/ControllerPlugin.h (100%) rename Source/{Project64 => Project64-core}/Plugins/GFXPlugin.h (100%) rename Source/{Project64 => Project64-core}/Plugins/GFXplugin.cpp (94%) rename Source/{Project64 => Project64-core}/Plugins/PluginBase.cpp (99%) rename Source/{Project64 => Project64-core}/Plugins/PluginBase.h (97%) rename Source/{Project64 => Project64-core}/Plugins/PluginClass.cpp (96%) rename Source/{Project64 => Project64-core}/Plugins/PluginClass.h (91%) rename Source/{Project64 => Project64-core}/Plugins/RSPPlugin.cpp (93%) rename Source/{Project64 => Project64-core}/Plugins/RSPPlugin.h (100%) create mode 100644 Source/Project64-core/Project64-core.vcproj create mode 100644 Source/Project64-core/Project64-core.vcxproj create mode 100644 Source/Project64-core/Project64-core.vcxproj.filters rename Source/{Project64 => Project64-core}/Settings/DebugSettings.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/DebugSettings.h (94%) rename Source/{Project64 => Project64-core}/Settings/GameSettings.cpp (95%) rename Source/{Project64 => Project64-core}/Settings/GameSettings.h (96%) rename Source/{Project64 => Project64-core}/Settings/LoggingSettings.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/LoggingSettings.h (100%) rename Source/{Project64 => Project64-core}/Settings/N64SystemSettings.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/N64SystemSettings.h (100%) rename Source/{Project64 => Project64-core}/Settings/RecompilerSettings.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/RecompilerSettings.h (94%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-Application.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-Application.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-ApplicationIndex.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-ApplicationIndex.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-ApplicationPath.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-ApplicationPath.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-Base.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-Cheats.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-Cheats.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-GameSetting.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-GameSetting.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-GameSettingIndex.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-GameSettingIndex.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RDBCpuType.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RDBCpuType.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RDBOnOff.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RDBOnOff.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RDBRamSize.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RDBRamSize.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RDBSaveChip.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RDBSaveChip.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RDBYesNo.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RDBYesNo.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RelativePath.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RelativePath.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RomDatabase.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RomDatabase.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RomDatabaseIndex.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RomDatabaseSetting.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-RomSetting.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-SelectedDirectory.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-SelectedDirectory.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-TempBool.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-TempBool.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-TempNumber.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-TempNumber.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-TempString.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingType/SettingsType-TempString.h (100%) create mode 100644 Source/Project64-core/Settings/SettingType/stdafx.h rename Source/{Project64 => Project64-core}/Settings/Settings.h (100%) rename Source/{Project64 => Project64-core}/Settings/SettingsClass.cpp (100%) rename Source/{Project64 => Project64-core}/Settings/SettingsClass.h (100%) create mode 100644 Source/Project64-core/Settings/stdafx.h rename Source/{Project64 => Project64-core}/Version.h (100%) create mode 100644 Source/Project64-core/stdafx.cpp create mode 100644 Source/Project64-core/stdafx.h diff --git a/Project64.sln b/Project64.sln index 5965b6796..db5bda645 100644 --- a/Project64.sln +++ b/Project64.sln @@ -1,6 +1,7 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 or later +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}" EndProject @@ -61,6 +62,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertyS EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "Source\3rdParty\sdl\sdl2.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64-core", "Source\Project64-core\Project64-core.vcxproj", "{00C7B43A-DED7-4DF0-B072-9A5783EF866D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -210,6 +213,12 @@ Global {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64 + {00C7B43A-DED7-4DF0-B072-9A5783EF866D}.Debug|Win32.ActiveCfg = Debug|Win32 + {00C7B43A-DED7-4DF0-B072-9A5783EF866D}.Debug|Win32.Build.0 = Debug|Win32 + {00C7B43A-DED7-4DF0-B072-9A5783EF866D}.Debug|x64.ActiveCfg = Debug|Win32 + {00C7B43A-DED7-4DF0-B072-9A5783EF866D}.Release|Win32.ActiveCfg = Release|Win32 + {00C7B43A-DED7-4DF0-B072-9A5783EF866D}.Release|Win32.Build.0 = Release|Win32 + {00C7B43A-DED7-4DF0-B072-9A5783EF866D}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Project64.vs2008.sln b/Project64.vs2008.sln index a8b4aaf6e..04414d660 100644 --- a/Project64.vs2008.sln +++ b/Project64.vs2008.sln @@ -8,6 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64", "Source\Project {731BD205-2826-4631-B7AF-117658E88DBC} = {731BD205-2826-4631-B7AF-117658E88DBC} {A4D13408-A794-4199-8FC7-4A9A32505005} = {A4D13408-A794-4199-8FC7-4A9A32505005} {3326E128-33AF-422C-BB7C-67CC6B915610} = {3326E128-33AF-422C-BB7C-67CC6B915610} + {00C7B43A-DED7-4DF0-B072-9A5783EF866D} = {00C7B43A-DED7-4DF0-B072-9A5783EF866D} {FD617E80-9E40-4138-85DA-B94633972E6A} = {FD617E80-9E40-4138-85DA-B94633972E6A} {B4A4B994-9111-42B1-93C2-6F1CA8BC4421} = {B4A4B994-9111-42B1-93C2-6F1CA8BC4421} EndProjectSection @@ -82,6 +83,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PJ64 NRage", "Source\nragev EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "Source\3rdParty\sdl\sdl2.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64-core", "Source\Project64-core\Project64-core.vcproj", "{00C7B43A-DED7-4DF0-B072-9A5783EF866D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -163,6 +166,10 @@ Global {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32 + {00C7B43A-DED7-4DF0-B072-9A5783EF866D}.Debug|Win32.ActiveCfg = Debug|Win32 + {00C7B43A-DED7-4DF0-B072-9A5783EF866D}.Debug|Win32.Build.0 = Debug|Win32 + {00C7B43A-DED7-4DF0-B072-9A5783EF866D}.Release|Win32.ActiveCfg = Release|Win32 + {00C7B43A-DED7-4DF0-B072-9A5783EF866D}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/Project64/3rdParty/7zip.cpp b/Source/Project64-core/3rdParty/7zip.cpp similarity index 100% rename from Source/Project64/3rdParty/7zip.cpp rename to Source/Project64-core/3rdParty/7zip.cpp diff --git a/Source/Project64/3rdParty/7zip.h b/Source/Project64-core/3rdParty/7zip.h similarity index 100% rename from Source/Project64/3rdParty/7zip.h rename to Source/Project64-core/3rdParty/7zip.h diff --git a/Source/Project64/3rdParty/zip.h b/Source/Project64-core/3rdParty/zip.h similarity index 100% rename from Source/Project64/3rdParty/zip.h rename to Source/Project64-core/3rdParty/zip.h diff --git a/Source/Project64/AppInit.cpp b/Source/Project64-core/AppInit.cpp similarity index 92% rename from Source/Project64/AppInit.cpp rename to Source/Project64-core/AppInit.cpp index 9bf1c4d3c..3ea66234f 100644 --- a/Source/Project64/AppInit.cpp +++ b/Source/Project64-core/AppInit.cpp @@ -1,5 +1,11 @@ #include "stdafx.h" -#include +#include +#include +#include +#include +#include +#include +#include void FixDirectories(void); @@ -120,6 +126,7 @@ void FixDirectories(void) if (!Directory.DirectoryExists()) Directory.DirectoryCreate(); } +#include void IncreaseThreadPriority(void) { SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL); diff --git a/Source/Project64/AppInit.h b/Source/Project64-core/AppInit.h similarity index 100% rename from Source/Project64/AppInit.h rename to Source/Project64-core/AppInit.h diff --git a/Source/Project64/Debugger.h b/Source/Project64-core/Debugger.h similarity index 100% rename from Source/Project64/Debugger.h rename to Source/Project64-core/Debugger.h diff --git a/Source/Project64-core/ExceptionHandler.h b/Source/Project64-core/ExceptionHandler.h new file mode 100644 index 000000000..86ba82440 --- /dev/null +++ b/Source/Project64-core/ExceptionHandler.h @@ -0,0 +1,4 @@ +#include + +#define __except_try() __try +#define __except_catch() __except (g_MMU->MemoryFilter(_exception_code(), _exception_info())) diff --git a/Source/Project64/logging.cpp b/Source/Project64-core/Logging.cpp similarity index 99% rename from Source/Project64/logging.cpp rename to Source/Project64-core/Logging.cpp index b932b77c2..651f70dd2 100644 --- a/Source/Project64/logging.cpp +++ b/Source/Project64-core/Logging.cpp @@ -11,10 +11,10 @@ #include "stdafx.h" #include "logging.h" #include -#include -#include -#include -#include +#include +#include +#include +#include CFile * CLogging::m_hLogFile = NULL; diff --git a/Source/Project64/Logging.h b/Source/Project64-core/Logging.h similarity index 95% rename from Source/Project64/Logging.h rename to Source/Project64-core/Logging.h index 75c30ccf5..e520d5386 100644 --- a/Source/Project64/Logging.h +++ b/Source/Project64-core/Logging.h @@ -9,7 +9,7 @@ * * ****************************************************************************/ #pragma once -#include +#include #include class CLogging : diff --git a/Source/Project64/Multilanguage.h b/Source/Project64-core/Multilanguage.h similarity index 100% rename from Source/Project64/Multilanguage.h rename to Source/Project64-core/Multilanguage.h diff --git a/Source/Project64/Multilanguage/LanguageClass.cpp b/Source/Project64-core/Multilanguage/LanguageClass.cpp similarity index 100% rename from Source/Project64/Multilanguage/LanguageClass.cpp rename to Source/Project64-core/Multilanguage/LanguageClass.cpp diff --git a/Source/Project64/Multilanguage/LanguageClass.h b/Source/Project64-core/Multilanguage/LanguageClass.h similarity index 100% rename from Source/Project64/Multilanguage/LanguageClass.h rename to Source/Project64-core/Multilanguage/LanguageClass.h diff --git a/Source/Project64/N64System/CheatClass.cpp b/Source/Project64-core/N64System/CheatClass.cpp similarity index 94% rename from Source/Project64/N64System/CheatClass.cpp rename to Source/Project64-core/N64System/CheatClass.cpp index 65a6b6e1b..f444c6fb3 100644 --- a/Source/Project64/N64System/CheatClass.cpp +++ b/Source/Project64-core/N64System/CheatClass.cpp @@ -10,6 +10,12 @@ ****************************************************************************/ #include "stdafx.h" +#include "CheatClass.h" +#include +#include +#include +#include +#include CCheats::CCheats() { diff --git a/Source/Project64/N64System/CheatClass.h b/Source/Project64-core/N64System/CheatClass.h similarity index 90% rename from Source/Project64/N64System/CheatClass.h rename to Source/Project64-core/N64System/CheatClass.h index 5734a2cf1..3b3f412af 100644 --- a/Source/Project64/N64System/CheatClass.h +++ b/Source/Project64-core/N64System/CheatClass.h @@ -9,6 +9,9 @@ * * ****************************************************************************/ #pragma once +#include "N64RomClass.h" +#include +#include class CCheats { diff --git a/Source/Project64/N64System/EmulationThread.cpp b/Source/Project64-core/N64System/EmulationThread.cpp similarity index 96% rename from Source/Project64/N64System/EmulationThread.cpp rename to Source/Project64-core/N64System/EmulationThread.cpp index ec9e0670b..629ff7eb8 100644 --- a/Source/Project64/N64System/EmulationThread.cpp +++ b/Source/Project64-core/N64System/EmulationThread.cpp @@ -9,7 +9,8 @@ * * ****************************************************************************/ #include "stdafx.h" -#include +#include +#include #include #include #include diff --git a/Source/Project64/UserInterface/FramePerSecondClass.cpp b/Source/Project64-core/N64System/FramePerSecondClass.cpp similarity index 92% rename from Source/Project64/UserInterface/FramePerSecondClass.cpp rename to Source/Project64-core/N64System/FramePerSecondClass.cpp index e329a57c2..51914040d 100644 --- a/Source/Project64/UserInterface/FramePerSecondClass.cpp +++ b/Source/Project64-core/N64System/FramePerSecondClass.cpp @@ -9,6 +9,9 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "FramePerSecondClass.h" +#include +#include CFramePerSecond::CFramePerSecond () { @@ -72,7 +75,7 @@ void CFramePerSecond::UpdateViCounter ( void ) m_CurrentFrame += 1; } -void CFramePerSecond::DisplayViCounter(DWORD FrameRate) +void CFramePerSecond::DisplayViCounter(uint32_t FrameRate) { if (m_iFrameRateType == FR_VIs) { @@ -157,7 +160,7 @@ void CFramePerSecond::UpdateDlCounter ( void ) m_CurrentFrame += 1; } -void CFramePerSecond::DisplayDlCounter(DWORD FrameRate) +void CFramePerSecond::DisplayDlCounter(uint32_t FrameRate) { if (m_iFrameRateType != FR_DLs) { diff --git a/Source/Project64/UserInterface/FramePerSecondClass.h b/Source/Project64-core/N64System/FramePerSecondClass.h similarity index 90% rename from Source/Project64/UserInterface/FramePerSecondClass.h rename to Source/Project64-core/N64System/FramePerSecondClass.h index 77d099b4c..45d74a9e7 100644 --- a/Source/Project64/UserInterface/FramePerSecondClass.h +++ b/Source/Project64-core/N64System/FramePerSecondClass.h @@ -20,8 +20,8 @@ public: void UpdateDlCounter ( void ); void UpdateViCounter ( void ); - void DisplayDlCounter ( DWORD FrameRate ); - void DisplayViCounter ( DWORD FrameRate ); + void DisplayDlCounter ( uint32_t FrameRate ); + void DisplayViCounter ( uint32_t FrameRate ); private: static void FrameRateTypeChanged(CFramePerSecond * _this); diff --git a/Source/Project64/N64System/Interpreter/InterpreterCPU.cpp b/Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp similarity index 94% rename from Source/Project64/N64System/Interpreter/InterpreterCPU.cpp rename to Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp index 524b76b94..f5750b9d1 100644 --- a/Source/Project64/N64System/Interpreter/InterpreterCPU.cpp +++ b/Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp @@ -9,6 +9,15 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "InterpreterCPU.h" +#include +#include +#include +#include +#include +#include +#include +#include R4300iOp::Func * CInterpreterCPU::m_R4300i_Opcode = NULL; diff --git a/Source/Project64/N64System/Interpreter/InterpreterCPU.h b/Source/Project64-core/N64System/Interpreter/InterpreterCPU.h similarity index 93% rename from Source/Project64/N64System/Interpreter/InterpreterCPU.h rename to Source/Project64-core/N64System/Interpreter/InterpreterCPU.h index 2fb1e37a9..429f63bbe 100644 --- a/Source/Project64/N64System/Interpreter/InterpreterCPU.h +++ b/Source/Project64-core/N64System/Interpreter/InterpreterCPU.h @@ -10,7 +10,7 @@ ****************************************************************************/ #pragma once -#include +#include class CInterpreterCPU : private R4300iOp diff --git a/Source/Project64/N64System/Interpreter/InterpreterOps.cpp b/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp similarity index 95% rename from Source/Project64/N64System/Interpreter/InterpreterOps.cpp rename to Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp index 9000b335d..ef1c82f89 100644 --- a/Source/Project64/N64System/Interpreter/InterpreterOps.cpp +++ b/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp @@ -9,7 +9,17 @@ * * ****************************************************************************/ #include "stdafx.h" -#include +#include "InterpreterOps.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include void InPermLoop(); void TestInterpreterJump(uint32_t PC, uint32_t TargetPC, int32_t Reg1, int32_t Reg2); diff --git a/Source/Project64/N64System/Interpreter/InterpreterOps.h b/Source/Project64-core/N64System/Interpreter/InterpreterOps.h similarity index 95% rename from Source/Project64/N64System/Interpreter/InterpreterOps.h rename to Source/Project64-core/N64System/Interpreter/InterpreterOps.h index cd5675252..6aeb7000d 100644 --- a/Source/Project64/N64System/Interpreter/InterpreterOps.h +++ b/Source/Project64-core/N64System/Interpreter/InterpreterOps.h @@ -10,9 +10,9 @@ ****************************************************************************/ #pragma once -#include -#include -#include +#include +#include +#include class R4300iOp : public CLogging, diff --git a/Source/Project64/N64System/Interpreter/InterpreterOps32.cpp b/Source/Project64-core/N64System/Interpreter/InterpreterOps32.cpp similarity index 96% rename from Source/Project64/N64System/Interpreter/InterpreterOps32.cpp rename to Source/Project64-core/N64System/Interpreter/InterpreterOps32.cpp index edc1c8608..39d744105 100644 --- a/Source/Project64/N64System/Interpreter/InterpreterOps32.cpp +++ b/Source/Project64-core/N64System/Interpreter/InterpreterOps32.cpp @@ -9,7 +9,12 @@ * * ****************************************************************************/ #include "stdafx.h" -#include +#include "InterpreterOps32.h" +#include +#include +#include +#include +#include bool DelaySlotEffectsCompare(uint32_t PC, uint32_t Reg1, uint32_t Reg2); diff --git a/Source/Project64/N64System/Interpreter/InterpreterOps32.h b/Source/Project64-core/N64System/Interpreter/InterpreterOps32.h similarity index 100% rename from Source/Project64/N64System/Interpreter/InterpreterOps32.h rename to Source/Project64-core/N64System/Interpreter/InterpreterOps32.h diff --git a/Source/Project64/N64System/Interpreter/stdafx.h b/Source/Project64-core/N64System/Interpreter/stdafx.h similarity index 100% rename from Source/Project64/N64System/Interpreter/stdafx.h rename to Source/Project64-core/N64System/Interpreter/stdafx.h diff --git a/Source/Project64/N64System/Mips/Audio.cpp b/Source/Project64-core/N64System/Mips/Audio.cpp similarity index 95% rename from Source/Project64/N64System/Mips/Audio.cpp rename to Source/Project64-core/N64System/Mips/Audio.cpp index 5b0ac026f..216d1a8a5 100644 --- a/Source/Project64/N64System/Mips/Audio.cpp +++ b/Source/Project64-core/N64System/Mips/Audio.cpp @@ -10,8 +10,8 @@ ****************************************************************************/ #include "stdafx.h" #include "Audio.h" -#include -#include +#include +#include CAudio::CAudio() { diff --git a/Source/Project64/N64System/Mips/Audio.h b/Source/Project64-core/N64System/Mips/Audio.h similarity index 100% rename from Source/Project64/N64System/Mips/Audio.h rename to Source/Project64-core/N64System/Mips/Audio.h diff --git a/Source/Project64/N64System/Mips/Dma.cpp b/Source/Project64-core/N64System/Mips/Dma.cpp similarity index 94% rename from Source/Project64/N64System/Mips/Dma.cpp rename to Source/Project64-core/N64System/Mips/Dma.cpp index 333c30db9..e27d94454 100644 --- a/Source/Project64/N64System/Mips/Dma.cpp +++ b/Source/Project64-core/N64System/Mips/Dma.cpp @@ -9,6 +9,13 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "Dma.h" +#include +#include +#include +#include +#include +#include CDMA::CDMA(CFlashram & FlashRam, CSram & Sram) : m_FlashRam(FlashRam), diff --git a/Source/Project64/N64System/Mips/Dma.h b/Source/Project64-core/N64System/Mips/Dma.h similarity index 86% rename from Source/Project64/N64System/Mips/Dma.h rename to Source/Project64-core/N64System/Mips/Dma.h index 624394fbb..1b327dc03 100644 --- a/Source/Project64/N64System/Mips/Dma.h +++ b/Source/Project64-core/N64System/Mips/Dma.h @@ -9,9 +9,9 @@ * * ****************************************************************************/ #pragma once -#include -#include -#include +#include +#include +#include class CDMA : private CDebugSettings diff --git a/Source/Project64/N64System/Mips/Eeprom.cpp b/Source/Project64-core/N64System/Mips/Eeprom.cpp similarity index 94% rename from Source/Project64/N64System/Mips/Eeprom.cpp rename to Source/Project64-core/N64System/Mips/Eeprom.cpp index ab2507b65..03d8f50b1 100644 --- a/Source/Project64/N64System/Mips/Eeprom.cpp +++ b/Source/Project64-core/N64System/Mips/Eeprom.cpp @@ -10,9 +10,10 @@ ****************************************************************************/ #include "stdafx.h" #include "Eeprom.h" -#include -#include +#include +#include #include +#include CEeprom::CEeprom(bool ReadOnly) : m_ReadOnly(ReadOnly), diff --git a/Source/Project64/N64System/Mips/Eeprom.h b/Source/Project64-core/N64System/Mips/Eeprom.h similarity index 94% rename from Source/Project64/N64System/Mips/Eeprom.h rename to Source/Project64-core/N64System/Mips/Eeprom.h index 86705fbcc..192c3a590 100644 --- a/Source/Project64/N64System/Mips/Eeprom.h +++ b/Source/Project64-core/N64System/Mips/Eeprom.h @@ -9,6 +9,7 @@ * * ****************************************************************************/ #pragma once +#include class CEeprom : private CDebugSettings diff --git a/Source/Project64/N64System/Mips/FlashRam.cpp b/Source/Project64-core/N64System/Mips/FlashRam.cpp similarity index 81% rename from Source/Project64/N64System/Mips/FlashRam.cpp rename to Source/Project64-core/N64System/Mips/FlashRam.cpp index e54bdb7b8..1611343de 100644 --- a/Source/Project64/N64System/Mips/FlashRam.cpp +++ b/Source/Project64-core/N64System/Mips/FlashRam.cpp @@ -9,6 +9,11 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "FlashRam.h" +#include +#include +#include +#include CFlashram::CFlashram(bool ReadOnly): m_FlashRamPointer(NULL), @@ -30,10 +35,10 @@ CFlashram::~CFlashram() } } -void CFlashram::DmaFromFlashram ( BYTE * dest, int StartOffset, int len) +void CFlashram::DmaFromFlashram(uint8_t * dest, int StartOffset, int len) { - BYTE FlipBuffer[0x10000]; - DWORD dwRead, count; + uint8_t FlipBuffer[0x10000]; + uint32_t count; switch (m_FlashFlag) { @@ -64,6 +69,7 @@ void CFlashram::DmaFromFlashram ( BYTE * dest, int StartOffset, int len) memset(FlipBuffer,0,sizeof(FlipBuffer)); StartOffset = StartOffset << 1; SetFilePointer(m_hFile,StartOffset,NULL,FILE_BEGIN); + DWORD dwRead; ReadFile(m_hFile,FlipBuffer,len,&dwRead,NULL); for (count = dwRead; (int)count < len; count ++) { @@ -72,11 +78,11 @@ void CFlashram::DmaFromFlashram ( BYTE * dest, int StartOffset, int len) for (count = 0; (int)count < len; count += 4) { - register DWORD eax; + register uint32_t eax; - eax = *(unsigned __int32 *)&FlipBuffer[count]; + eax = *(uint32_t *)&FlipBuffer[count]; // eax = swap32by8(eax); // ; bswap eax - *(unsigned __int32 *)(dest + count) = eax; + *(uint32_t *)(dest + count) = eax; } break; case FLASHRAM_MODE_STATUS: @@ -87,8 +93,8 @@ void CFlashram::DmaFromFlashram ( BYTE * dest, int StartOffset, int len) g_Notify->DisplayError(stdstr_f(__FUNCTION__ ": Reading m_FlashStatus not being handled correctly\nStart: %X len: %X", StartOffset, len).ToUTF16().c_str()); } } - *((DWORD *)(dest)) = (DWORD)((m_FlashStatus >> 32) & 0xFFFFFFFF); - *((DWORD *)(dest) + 1) = (DWORD)(m_FlashStatus & 0xFFFFFFFF); + *((uint32_t *)(dest)) = (uint32_t)((m_FlashStatus >> 32) & 0xFFFFFFFF); + *((uint32_t *)(dest)+1) = (uint32_t)(m_FlashStatus & 0xFFFFFFFF); break; default: if (bHaveDebugger()) @@ -98,7 +104,7 @@ void CFlashram::DmaFromFlashram ( BYTE * dest, int StartOffset, int len) } } -void CFlashram::DmaToFlashram(BYTE * Source, int StartOffset, int len) +void CFlashram::DmaToFlashram(uint8_t * Source, int StartOffset, int len) { switch (m_FlashFlag) { @@ -114,11 +120,11 @@ void CFlashram::DmaToFlashram(BYTE * Source, int StartOffset, int len) } -DWORD CFlashram::ReadFromFlashStatus (DWORD PAddr) +uint32_t CFlashram::ReadFromFlashStatus(uint32_t PAddr) { switch (PAddr) { - case 0x08000000: return (DWORD)(m_FlashStatus >> 32); + case 0x08000000: return (uint32_t)(m_FlashStatus >> 32); default: if (bHaveDebugger()) { @@ -126,7 +132,7 @@ DWORD CFlashram::ReadFromFlashStatus (DWORD PAddr) } break; } - return (DWORD)(m_FlashStatus >> 32); + return (uint32_t)(m_FlashStatus >> 32); } bool CFlashram::LoadFlashram() @@ -154,9 +160,9 @@ bool CFlashram::LoadFlashram() return true; } -void CFlashram::WriteToFlashCommand(DWORD FlashRAM_Command) +void CFlashram::WriteToFlashCommand(uint32_t FlashRAM_Command) { - BYTE EmptyBlock[128]; + uint8_t EmptyBlock[128]; DWORD dwWritten; switch (FlashRAM_Command & 0xFF000000) @@ -186,14 +192,14 @@ void CFlashram::WriteToFlashCommand(DWORD FlashRAM_Command) } } { - BYTE FlipBuffer[128]; + uint8_t FlipBuffer[128]; register size_t edx; - BYTE * FlashRamPointer = m_FlashRamPointer; + uint8_t * FlashRamPointer = m_FlashRamPointer; memset(FlipBuffer,0,sizeof(FlipBuffer)); for (edx = 0; edx < 128; edx += 4) { - register DWORD eax; + register uint32_t eax; eax = *(unsigned __int32 *)&FlashRamPointer[edx]; // eax = swap32by8(eax); // ; bswap eax diff --git a/Source/Project64/N64System/Mips/FlashRam.h b/Source/Project64-core/N64System/Mips/FlashRam.h similarity index 66% rename from Source/Project64/N64System/Mips/FlashRam.h rename to Source/Project64-core/N64System/Mips/FlashRam.h index 5c982c996..2ae4cc640 100644 --- a/Source/Project64/N64System/Mips/FlashRam.h +++ b/Source/Project64-core/N64System/Mips/FlashRam.h @@ -9,6 +9,7 @@ * * ****************************************************************************/ #pragma once +#include class CFlashram : private CDebugSettings @@ -26,18 +27,18 @@ public: CFlashram(bool ReadOnly); ~CFlashram(); - void DmaFromFlashram ( BYTE * dest, int StartOffset, int len ); - void DmaToFlashram ( BYTE * Source, int StartOffset, int len ); - DWORD ReadFromFlashStatus ( DWORD PAddr ); - void WriteToFlashCommand ( DWORD Value ); + void DmaFromFlashram ( uint8_t * dest, int StartOffset, int len ); + void DmaToFlashram ( uint8_t * Source, int StartOffset, int len ); + uint32_t ReadFromFlashStatus ( uint32_t PAddr ); + void WriteToFlashCommand ( uint32_t Value ); private: - bool LoadFlashram(); + bool LoadFlashram(); - BYTE * m_FlashRamPointer; - Modes m_FlashFlag; - QWORD m_FlashStatus; - DWORD m_FlashRAM_Offset; - bool m_ReadOnly; - HANDLE m_hFile; + uint8_t * m_FlashRamPointer; + Modes m_FlashFlag; + uint64_t m_FlashStatus; + uint32_t m_FlashRAM_Offset; + bool m_ReadOnly; + void * m_hFile; }; diff --git a/Source/Project64/N64System/Mips/MemoryClass.h b/Source/Project64-core/N64System/Mips/MemoryClass.h similarity index 100% rename from Source/Project64/N64System/Mips/MemoryClass.h rename to Source/Project64-core/N64System/Mips/MemoryClass.h diff --git a/Source/Project64/N64System/Mips/MemoryLabelsClass.cpp b/Source/Project64-core/N64System/Mips/MemoryLabelsClass.cpp similarity index 100% rename from Source/Project64/N64System/Mips/MemoryLabelsClass.cpp rename to Source/Project64-core/N64System/Mips/MemoryLabelsClass.cpp diff --git a/Source/Project64/N64System/Mips/MemoryLabelsClass.h b/Source/Project64-core/N64System/Mips/MemoryLabelsClass.h similarity index 100% rename from Source/Project64/N64System/Mips/MemoryLabelsClass.h rename to Source/Project64-core/N64System/Mips/MemoryLabelsClass.h diff --git a/Source/Project64/N64System/Mips/MemoryVirtualMem.cpp b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp similarity index 96% rename from Source/Project64/N64System/Mips/MemoryVirtualMem.cpp rename to Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp index 1f8a415b5..130120c00 100644 --- a/Source/Project64/N64System/Mips/MemoryVirtualMem.cpp +++ b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp @@ -9,6 +9,13 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "MemoryVirtualMem.h" +#include +#include +#include +#include +#include +#include uint32_t RegModValue; diff --git a/Source/Project64/N64System/Mips/MemoryVirtualMem.h b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h similarity index 92% rename from Source/Project64/N64System/Mips/MemoryVirtualMem.h rename to Source/Project64-core/N64System/Mips/MemoryVirtualMem.h index 069b393ca..f4209463c 100644 --- a/Source/Project64/N64System/Mips/MemoryVirtualMem.h +++ b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h @@ -9,6 +9,14 @@ * * ****************************************************************************/ #pragma once +#include "MemoryClass.h" +#include "TranslateVaddr.h" +#include +#include +#include +#include +#include +#include /* * 64-bit Windows exception recovery facilities will expect to interact with diff --git a/Source/Project64/N64System/Mips/Mempak.H b/Source/Project64-core/N64System/Mips/Mempak.H similarity index 78% rename from Source/Project64/N64System/Mips/Mempak.H rename to Source/Project64-core/N64System/Mips/Mempak.H index 711fc640e..0cfca48e4 100644 --- a/Source/Project64/N64System/Mips/Mempak.H +++ b/Source/Project64-core/N64System/Mips/Mempak.H @@ -13,9 +13,8 @@ class Mempak { public: - static void Close(); - static BYTE CalculateCrc(BYTE * DataToCrc); - static void ReadFrom(int Control, BYTE * command); - static void WriteTo(int Control, BYTE * command); - + static void Close(); + static uint8_t CalculateCrc(uint8_t * DataToCrc); + static void ReadFrom(int32_t Control, uint8_t * command); + static void WriteTo(int32_t Control, uint8_t * command); }; diff --git a/Source/Project64/N64System/Mips/Mempak.cpp b/Source/Project64-core/N64System/Mips/Mempak.cpp similarity index 89% rename from Source/Project64/N64System/Mips/Mempak.cpp rename to Source/Project64-core/N64System/Mips/Mempak.cpp index 7fa9a8905..2d18f3076 100644 --- a/Source/Project64/N64System/Mips/Mempak.cpp +++ b/Source/Project64-core/N64System/Mips/Mempak.cpp @@ -9,7 +9,11 @@ * * ****************************************************************************/ #include "stdafx.h" -static BYTE Mempaks[4][0x8000]; +#include "Mempak.H" +#include +#include + +static uint8_t Mempaks[4][0x8000]; HANDLE hMempakFile[4]; void Mempak::Close() @@ -46,7 +50,7 @@ void LoadMempak (int Control) FileName.DirectoryCreate(); } - BYTE Initialize[] = { + uint8_t Initialize[] = { 0x81,0x01,0x02,0x03, 0x04,0x05,0x06,0x07, 0x08,0x09,0x0a,0x0b, 0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13, 0x14,0x15,0x16,0x17, 0x18,0x19,0x1A,0x1B, 0x1C,0x1D,0x1E,0x1F, 0xFF,0xFF,0xFF,0xFF, 0x05,0x1A,0x5F,0x13, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, @@ -94,13 +98,13 @@ void LoadMempak (int Control) } } -BYTE Mempak::CalculateCrc(BYTE * DataToCrc) +uint8_t Mempak::CalculateCrc(uint8_t * DataToCrc) { DWORD Count; DWORD XorTap; int Length; - BYTE CRC = 0; + uint8_t CRC = 0; for (Count = 0; Count < 0x21; Count++) { @@ -127,7 +131,7 @@ BYTE Mempak::CalculateCrc(BYTE * DataToCrc) return CRC; } -void Mempak::ReadFrom(int Control, BYTE * command) +void Mempak::ReadFrom(int Control, uint8_t * command) { DWORD address = (command[3] << 8) | (command[4] & 0xE0); @@ -146,10 +150,10 @@ void Mempak::ReadFrom(int Control, BYTE * command) } } -void Mempak::WriteTo(int Control, BYTE * command) +void Mempak::WriteTo(int Control, uint8_t * command) { DWORD dwWritten; - DWORD address = (command[3] << 8) | (command[4] & 0xE0); + uint32_t address = (command[3] << 8) | (command[4] & 0xE0); if (address < 0x8000) { diff --git a/Source/Project64/N64System/Mips/OpCode.h b/Source/Project64-core/N64System/Mips/OpCode.h similarity index 100% rename from Source/Project64/N64System/Mips/OpCode.h rename to Source/Project64-core/N64System/Mips/OpCode.h diff --git a/Source/Project64/N64System/C_Core/r4300iCommands.cpp b/Source/Project64-core/N64System/Mips/OpcodeName.cpp similarity index 95% rename from Source/Project64/N64System/C_Core/r4300iCommands.cpp rename to Source/Project64-core/N64System/Mips/OpcodeName.cpp index 36e9049aa..b93695d52 100644 --- a/Source/Project64/N64System/C_Core/r4300iCommands.cpp +++ b/Source/Project64-core/N64System/Mips/OpcodeName.cpp @@ -9,34 +9,22 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "OpCode.h" +#include "RegisterClass.h" #define FPR_Type(Reg) (Reg) == R4300i_COP1_S ? "S" : (Reg) == R4300i_COP1_D ? "D" :\ (Reg) == R4300i_COP1_W ? "W" : "L" -BOOL InR4300iCommandsWindow = FALSE; char CommandName[100]; -void SetR4300iCommandToStepping ( void ) -{ -} - -void SetR4300iCommandViewto ( UINT /*NewLocation*/ ) -{ -} - -void __cdecl Enter_R4300i_Commands_Window ( void ) -{ -} - -char strLabelName[100]; - -char * LabelName (DWORD Address) +char * LabelName (uint32_t Address) { + static char strLabelName[100]; sprintf(strLabelName,"0x%08X",Address); return strLabelName; } -char * R4300iSpecialName ( DWORD OpCode, DWORD /*PC*/ ) +char * R4300iSpecialName ( uint32_t OpCode, uint32_t /*PC*/ ) { OPCODE command; command.Hex = OpCode; @@ -239,7 +227,7 @@ char * R4300iSpecialName ( DWORD OpCode, DWORD /*PC*/ ) return CommandName; } -char * R4300iRegImmName ( DWORD OpCode, DWORD PC ) +char * R4300iRegImmName ( uint32_t OpCode, uint32_t PC ) { OPCODE command; command.Hex = OpCode; @@ -308,7 +296,7 @@ char * R4300iRegImmName ( DWORD OpCode, DWORD PC ) return CommandName; } -char * R4300iCop1Name ( DWORD OpCode, DWORD PC ) +char * R4300iCop1Name ( uint32_t OpCode, uint32_t PC ) { OPCODE command; command.Hex = OpCode; @@ -519,7 +507,7 @@ char * R4300iCop1Name ( DWORD OpCode, DWORD PC ) return CommandName; } -char * R4300iOpcodeName ( DWORD OpCode, DWORD PC ) +const char * R4300iOpcodeName(uint32_t OpCode, uint32_t PC) { OPCODE command; command.Hex = OpCode; diff --git a/Source/Project64/N64System/C_Core/r4300iCommands.h b/Source/Project64-core/N64System/Mips/OpcodeName.h similarity index 56% rename from Source/Project64/N64System/C_Core/r4300iCommands.h rename to Source/Project64-core/N64System/Mips/OpcodeName.h index 7390b9dea..1699b1d09 100644 --- a/Source/Project64/N64System/C_Core/r4300iCommands.h +++ b/Source/Project64-core/N64System/Mips/OpcodeName.h @@ -10,26 +10,4 @@ ****************************************************************************/ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef _DEBUG -void Disable_R4300i_Commands_Window ( void ); -void Enable_R4300i_Commands_Window ( void ); -void __cdecl Enter_R4300i_Commands_Window ( void ); -char * R4300iOpcodeName ( DWORD OpCode, DWORD PC ); -void RefreshR4300iCommands ( void ); -void SetR4300iCommandToRunning ( void ); -void SetR4300iCommandToStepping ( void ); -void SetR4300iCommandViewto ( UINT NewLocation ); -void Update_r4300iCommandList (void); - -extern BOOL InR4300iCommandsWindow; -#else -char * R4300iOpcodeName ( DWORD OpCode, DWORD PC ); -#endif - -#ifdef __cplusplus -} -#endif +const char * R4300iOpcodeName(uint32_t OpCode, uint32_t PC); diff --git a/Source/Project64/N64System/Mips/PifRam.cpp b/Source/Project64-core/N64System/Mips/PifRam.cpp similarity index 90% rename from Source/Project64/N64System/Mips/PifRam.cpp rename to Source/Project64-core/N64System/Mips/PifRam.cpp index a33f7bf82..6b60512dc 100644 --- a/Source/Project64/N64System/Mips/PifRam.cpp +++ b/Source/Project64-core/N64System/Mips/PifRam.cpp @@ -9,7 +9,15 @@ * * ****************************************************************************/ #include "stdafx.h" -#include +#include "PifRam.h" +#include +#include +#include +#include +#include +#include +#include +#include int CPifRamSettings::m_RefCount = 0; bool CPifRamSettings::m_bShowPifRamErrors = false; @@ -166,19 +174,19 @@ void CPifRam::PifRamWrite() Challenge[i * 2 + 1] = m_PifRam[48 + i] & 0x0f; } n64_cic_nus_6105(Challenge, Response, CHALLENGE_LENGTH - 2); - QWORD ResponseValue = 0; + uint64_t ResponseValue = 0; m_PifRam[46] = m_PifRam[47] = 0x00; for (int z = 8; z > 0; z--) { ResponseValue = (ResponseValue << 8) | ((Response[(z - 1) * 2] << 4) + Response[(z - 1) * 2 + 1]); } - std::memcpy(&m_PifRam[48], &ResponseValue, sizeof(QWORD)); + std::memcpy(&m_PifRam[48], &ResponseValue, sizeof(uint64_t)); ResponseValue = 0; for (int z = 7; z > 0; z--) { ResponseValue = (ResponseValue << 8) | ((Response[((z + 8) - 1) * 2] << 4) + Response[((z + 8) - 1) * 2 + 1]); } - std::memcpy(&m_PifRam[56], &ResponseValue, sizeof(QWORD)); + std::memcpy(&m_PifRam[56], &ResponseValue, sizeof(uint64_t)); } break; case 0x08: @@ -270,8 +278,8 @@ void CPifRam::PifRamWrite() void CPifRam::SI_DMA_READ() { - BYTE * PifRamPos = m_PifRam; - BYTE * RDRAM = g_MMU->Rdram(); + uint8_t * PifRamPos = m_PifRam; + uint8_t * RDRAM = g_MMU->Rdram(); uint32_t & SI_DRAM_ADDR_REG = (uint32_t &)g_Reg->SI_DRAM_ADDR_REG; if ((int32_t)SI_DRAM_ADDR_REG > (int32_t)g_System->RdramSize()) @@ -444,7 +452,7 @@ void CPifRam::SI_DMA_WRITE() } } -void CPifRam::ProcessControllerCommand(int Control, BYTE * Command) +void CPifRam::ProcessControllerCommand(int Control, uint8_t * Command) { CONTROL * Controllers = g_Plugins->Control()->PluginControllers(); @@ -467,7 +475,7 @@ void CPifRam::ProcessControllerCommand(int Control, BYTE * Command) g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); } } - if (Controllers[Control].Present == TRUE) + if (Controllers[Control].Present == true) { Command[3] = 0x05; Command[4] = 0x00; @@ -498,7 +506,7 @@ void CPifRam::ProcessControllerCommand(int Control, BYTE * Command) g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); } } - if (Controllers[Control].Present == FALSE) + if (Controllers[Control].Present == false) { Command[1] |= 0x80; } @@ -519,7 +527,7 @@ void CPifRam::ProcessControllerCommand(int Control, BYTE * Command) g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); } } - if (Controllers[Control].Present == TRUE) + if (Controllers[Control].Present == true) { switch (Controllers[Control].Plugin) { @@ -561,7 +569,7 @@ void CPifRam::ProcessControllerCommand(int Control, BYTE * Command) g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); } } - if (Controllers[Control].Present == TRUE) + if (Controllers[Control].Present == true) { switch (Controllers[Control].Plugin) { @@ -593,13 +601,13 @@ void CPifRam::ProcessControllerCommand(int Control, BYTE * Command) } } -void CPifRam::ReadControllerCommand(int Control, BYTE * Command) { +void CPifRam::ReadControllerCommand(int Control, uint8_t * Command) { CONTROL * Controllers = g_Plugins->Control()->PluginControllers(); switch (Command[2]) { case 0x01: // read controller - if (Controllers[Control].Present == TRUE) + if (Controllers[Control].Present == true) { if (bShowPifRamErrors()) { @@ -607,12 +615,12 @@ void CPifRam::ReadControllerCommand(int Control, BYTE * Command) { if (Command[1] != 4) { g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); } } - const DWORD buttons = g_BaseSystem->GetButtons(Control); - std::memcpy(&Command[3], &buttons, sizeof(DWORD)); + const uint32_t buttons = g_BaseSystem->GetButtons(Control); + std::memcpy(&Command[3], &buttons, sizeof(uint32_t)); } break; case 0x02: //read from controller pack - if (Controllers[Control].Present == TRUE) + if (Controllers[Control].Present == true) { switch (Controllers[Control].Plugin) { @@ -621,7 +629,7 @@ void CPifRam::ReadControllerCommand(int Control, BYTE * Command) { } break; case 0x03: //write controller pak - if (Controllers[Control].Present == TRUE) + if (Controllers[Control].Present == true) { switch (Controllers[Control].Plugin) { @@ -634,7 +642,7 @@ void CPifRam::ReadControllerCommand(int Control, BYTE * Command) { void CPifRam::LogControllerPakData(char * Description) { - BYTE * PIF_Ram = g_MMU->PifRam(); + uint8_t * PIF_Ram = g_MMU->PifRam(); int count, count2; char HexData[100], AsciiData[100], Addon[20]; diff --git a/Source/Project64/N64System/Mips/PifRam.h b/Source/Project64-core/N64System/Mips/PifRam.h similarity index 82% rename from Source/Project64/N64System/Mips/PifRam.h rename to Source/Project64-core/N64System/Mips/PifRam.h index 30770f184..ee7b54a7b 100644 --- a/Source/Project64/N64System/Mips/PifRam.h +++ b/Source/Project64-core/N64System/Mips/PifRam.h @@ -10,7 +10,9 @@ ****************************************************************************/ #pragma once -#include +#include +#include "Eeprom.h" + class CPifRamSettings { protected: @@ -49,13 +51,13 @@ public: void SI_DMA_WRITE(); protected: - BYTE m_PifRom[0x7C0]; - BYTE m_PifRam[0x40]; + uint8_t m_PifRom[0x7C0]; + uint8_t m_PifRam[0x40]; private: #define CHALLENGE_LENGTH 0x20 - void ProcessControllerCommand ( int Control, BYTE * Command ); - void ReadControllerCommand ( int Control, BYTE * Command ); + void ProcessControllerCommand ( int Control, uint8_t * Command ); + void ReadControllerCommand ( int Control, uint8_t * Command ); void LogControllerPakData ( char * Description ); void n64_cic_nus_6105 (char challenge[], char response[], int length); }; diff --git a/Source/Project64/N64System/Mips/RegisterClass.cpp b/Source/Project64-core/N64System/Mips/RegisterClass.cpp similarity index 95% rename from Source/Project64/N64System/Mips/RegisterClass.cpp rename to Source/Project64-core/N64System/Mips/RegisterClass.cpp index 73d5a6421..e7608340f 100644 --- a/Source/Project64/N64System/Mips/RegisterClass.cpp +++ b/Source/Project64-core/N64System/Mips/RegisterClass.cpp @@ -9,7 +9,10 @@ * * ****************************************************************************/ #include "stdafx.h" -#include +#include "RegisterClass.h" +#include +#include +#include const char * CRegName::GPR[32] = { "r0", "at", "v0", "v1", "a0", "a1", "a2", "a3", "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", @@ -507,7 +510,7 @@ void CRegisters::DoTLBReadMiss(bool DelaySlot, uint32_t BadVaddr) { if (bHaveDebugger()) { - g_Notify->DisplayError(stdstr_f("TLBMiss - EXL Set\nBadVaddr = %X\nAddress Defined: %s", BadVaddr, g_TLB->AddressDefined(BadVaddr) ? "TRUE" : "FALSE").ToUTF16().c_str()); + g_Notify->DisplayError(stdstr_f("TLBMiss - EXL Set\nBadVaddr = %X\nAddress Defined: %s", BadVaddr, g_TLB->AddressDefined(BadVaddr) ? "true" : "false").ToUTF16().c_str()); } m_PROGRAM_COUNTER = 0x80000180; } diff --git a/Source/Project64/N64System/Mips/RegisterClass.h b/Source/Project64-core/N64System/Mips/RegisterClass.h similarity index 96% rename from Source/Project64/N64System/Mips/RegisterClass.h rename to Source/Project64-core/N64System/Mips/RegisterClass.h index e473bff47..193c6865c 100644 --- a/Source/Project64/N64System/Mips/RegisterClass.h +++ b/Source/Project64-core/N64System/Mips/RegisterClass.h @@ -10,8 +10,10 @@ ****************************************************************************/ #pragma once -#include -#include +#include +#include +#include +#include //CPO registers by name class CP0registers diff --git a/Source/Project64/N64System/Mips/Rumblepak.cpp b/Source/Project64-core/N64System/Mips/Rumblepak.cpp similarity index 68% rename from Source/Project64/N64System/Mips/Rumblepak.cpp rename to Source/Project64-core/N64System/Mips/Rumblepak.cpp index 856a3aa86..45df9e6e1 100644 --- a/Source/Project64/N64System/Mips/Rumblepak.cpp +++ b/Source/Project64-core/N64System/Mips/Rumblepak.cpp @@ -9,10 +9,14 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "Rumblepak.h" +#include +#include +#include -void Rumblepak::ReadFrom(BYTE * command) +void Rumblepak::ReadFrom(uint8_t * command) { - DWORD address = (command[3] << 8) | (command[4] & 0xE0); + uint32_t address = (command[3] << 8) | (command[4] & 0xE0); if ((address >= 0x8000) && (address < 0x9000)) { @@ -24,15 +28,15 @@ void Rumblepak::ReadFrom(BYTE * command) } } -void Rumblepak::WriteTo(int Control, BYTE * command) +void Rumblepak::WriteTo(int Control, uint8_t * command) { - DWORD address = (command[3] << 8) | (command[4] & 0xE0); + uint32_t address = (command[3] << 8) | (command[4] & 0xE0); if ((address) == 0xC000) { if (g_Plugins->Control()->RumbleCommand != NULL) { - g_Plugins->Control()->RumbleCommand(Control, *(BOOL *)(&command[5])); + g_Plugins->Control()->RumbleCommand(Control, *(int *)(&command[5])); } } } \ No newline at end of file diff --git a/Source/Project64/N64System/Mips/Rumblepak.h b/Source/Project64-core/N64System/Mips/Rumblepak.h similarity index 89% rename from Source/Project64/N64System/Mips/Rumblepak.h rename to Source/Project64-core/N64System/Mips/Rumblepak.h index 55308dc8e..7101c8043 100644 --- a/Source/Project64/N64System/Mips/Rumblepak.h +++ b/Source/Project64-core/N64System/Mips/Rumblepak.h @@ -13,7 +13,6 @@ class Rumblepak { public: - static void ReadFrom(BYTE * command); - static void WriteTo(int Control, BYTE * command); - + static void ReadFrom(uint8_t * command); + static void WriteTo(int Control, uint8_t * command); }; diff --git a/Source/Project64/N64System/Mips/Sram.cpp b/Source/Project64-core/N64System/Mips/Sram.cpp similarity index 89% rename from Source/Project64/N64System/Mips/Sram.cpp rename to Source/Project64-core/N64System/Mips/Sram.cpp index 45dd2817f..b3edc1a0e 100644 --- a/Source/Project64/N64System/Mips/Sram.cpp +++ b/Source/Project64-core/N64System/Mips/Sram.cpp @@ -9,6 +9,9 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "Sram.h" +#include +#include CSram::CSram ( bool ReadOnly ) : m_ReadOnly(ReadOnly), @@ -50,11 +53,11 @@ bool CSram::LoadSram() return true; } -void CSram::DmaFromSram(BYTE * dest, int StartOffset, int len) +void CSram::DmaFromSram(uint8_t * dest, int StartOffset, int len) { DWORD dwRead; - DWORD i; - BYTE tmp[4]; + uint32_t i; + uint8_t tmp[4]; if (m_hFile == NULL) { @@ -67,7 +70,7 @@ void CSram::DmaFromSram(BYTE * dest, int StartOffset, int len) // Fix Dezaemon 3D saves StartOffset = ((StartOffset >> 3) & 0xFFFF8000) | (StartOffset & 0x7FFF); - DWORD Offset = StartOffset & 3; + uint32_t Offset = StartOffset & 3; if (Offset == 0) { @@ -131,11 +134,11 @@ void CSram::DmaFromSram(BYTE * dest, int StartOffset, int len) } } -void CSram::DmaToSram(BYTE * Source, int StartOffset, int len) +void CSram::DmaToSram(uint8_t * Source, int StartOffset, int len) { DWORD dwWritten; - DWORD i; - BYTE tmp[4]; + uint32_t i; + uint8_t tmp[4]; if (m_ReadOnly) { @@ -153,7 +156,7 @@ void CSram::DmaToSram(BYTE * Source, int StartOffset, int len) // Fix Dezaemon 3D saves StartOffset = ((StartOffset >> 3) & 0xFFFF8000) | (StartOffset & 0x7FFF); - DWORD Offset = StartOffset & 3; + uint32_t Offset = StartOffset & 3; if (Offset == 0) { diff --git a/Source/Project64/N64System/Mips/Sram.h b/Source/Project64-core/N64System/Mips/Sram.h similarity index 84% rename from Source/Project64/N64System/Mips/Sram.h rename to Source/Project64-core/N64System/Mips/Sram.h index 513a49ad3..c3671e166 100644 --- a/Source/Project64/N64System/Mips/Sram.h +++ b/Source/Project64-core/N64System/Mips/Sram.h @@ -16,12 +16,12 @@ public: CSram(bool ReadOnly); ~CSram(); - void DmaFromSram(BYTE * dest, int StartOffset, int len); - void DmaToSram(BYTE * Source, int StartOffset, int len); + void DmaFromSram(uint8_t * dest, int StartOffset, int len); + void DmaToSram(uint8_t * Source, int StartOffset, int len); private: bool LoadSram(); bool m_ReadOnly; - HANDLE m_hFile; + void * m_hFile; }; diff --git a/Source/Project64/N64System/Mips/SystemEvents.cpp b/Source/Project64-core/N64System/Mips/SystemEvents.cpp similarity index 93% rename from Source/Project64/N64System/Mips/SystemEvents.cpp rename to Source/Project64-core/N64System/Mips/SystemEvents.cpp index 590b05fb6..308021e1e 100644 --- a/Source/Project64/N64System/Mips/SystemEvents.cpp +++ b/Source/Project64-core/N64System/Mips/SystemEvents.cpp @@ -1,3 +1,4 @@ +SysEvent_ChangingFullScreen /**************************************************************************** * * * Project64 - A Nintendo 64 emulator. * @@ -9,6 +10,9 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "SystemEvents.h" +#include +#include CSystemEvents::CSystemEvents(CN64System * System, CPlugins * Plugins) : m_System(System), @@ -122,7 +126,7 @@ void CSystemEvents::ExecuteEvents() ChangePluginFunc(); break; case SysEvent_ChangingFullScreen: - Notify().ChangeFullScreen(); + g_Notify->ChangeFullScreen(); break; case SysEvent_GSButtonPressed: if (m_System->HasCheatsSlectionChanged()) diff --git a/Source/Project64/N64System/Mips/SystemEvents.h b/Source/Project64-core/N64System/Mips/SystemEvents.h similarity index 91% rename from Source/Project64/N64System/Mips/SystemEvents.h rename to Source/Project64-core/N64System/Mips/SystemEvents.h index 3b7101bb9..5dfae4931 100644 --- a/Source/Project64/N64System/Mips/SystemEvents.h +++ b/Source/Project64-core/N64System/Mips/SystemEvents.h @@ -10,6 +10,8 @@ ****************************************************************************/ #pragma once +#include + enum SystemEvent { SysEvent_ExecuteInterrupt, @@ -52,6 +54,9 @@ enum SystemEvent SysEvent_Profile_GenerateLogs, }; +class CN64System; +class CPlugins; + class CSystemEvents { typedef std::vector EventList; @@ -64,7 +69,7 @@ public: void ExecuteEvents(); void QueueEvent(SystemEvent action); - const BOOL & DoSomething() const + const int32_t & DoSomething() const { return m_bDoSomething; } @@ -79,6 +84,6 @@ private: CN64System * m_System; CPlugins * m_Plugins; EventList m_Events; - BOOL m_bDoSomething; + int32_t m_bDoSomething; CriticalSection m_CS; }; diff --git a/Source/Project64/N64System/Mips/SystemTiming.cpp b/Source/Project64-core/N64System/Mips/SystemTiming.cpp similarity index 89% rename from Source/Project64/N64System/Mips/SystemTiming.cpp rename to Source/Project64-core/N64System/Mips/SystemTiming.cpp index 681de9245..5f733a6ce 100644 --- a/Source/Project64/N64System/Mips/SystemTiming.cpp +++ b/Source/Project64-core/N64System/Mips/SystemTiming.cpp @@ -9,6 +9,11 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "SystemTiming.h" +#include +#include +#include +#include CSystemTimer::CSystemTimer( int & NextTimer ) : m_NextTimer(NextTimer), @@ -33,7 +38,7 @@ void CSystemTimer::Reset() SetCompareTimer(); } -void CSystemTimer::SetTimer ( TimerType Type, DWORD Cycles, bool bRelative ) +void CSystemTimer::SetTimer ( TimerType Type, uint32_t Cycles, bool bRelative ) { if (Type >= MaxTimer || Type == UnknownTimer) { @@ -61,7 +66,7 @@ void CSystemTimer::SetTimer ( TimerType Type, DWORD Cycles, bool bRelative ) FixTimers(); } -DWORD CSystemTimer::GetTimer ( TimerType Type ) +uint32_t CSystemTimer::GetTimer ( TimerType Type ) { if (Type >= MaxTimer || Type == UnknownTimer) { @@ -81,7 +86,7 @@ DWORD CSystemTimer::GetTimer ( TimerType Type ) { return 0x7FFFFFFF; } - return (DWORD)CyclesToTimer; + return (uint32_t)CyclesToTimer; } void CSystemTimer::StopTimer ( TimerType Type ) @@ -172,7 +177,7 @@ void CSystemTimer::TimerDone() { UpdateTimers(); -/* DWORD LastTimer; +/* uint32_t LastTimer; if (Profiling) { LastTimer = StartTimer(Timer_Done); @@ -253,7 +258,7 @@ void CSystemTimer::TimerDone() void CSystemTimer::SetCompareTimer() { - DWORD NextCompare = 0x7FFFFFFF; + uint32_t NextCompare = 0x7FFFFFFF; if (g_Reg) { NextCompare = g_Reg->COMPARE_REGISTER - g_Reg->COUNT_REGISTER; @@ -296,8 +301,8 @@ bool CSystemTimer::SaveAllowed ( void ) void CSystemTimer::SaveData ( void * file ) const { - DWORD TimerDetailsSize = sizeof(TIMER_DETAILS); - DWORD Entries = sizeof(m_TimerDetatils)/sizeof(m_TimerDetatils[0]); + uint32_t TimerDetailsSize = sizeof(TIMER_DETAILS); + uint32_t Entries = sizeof(m_TimerDetatils)/sizeof(m_TimerDetatils[0]); zipWriteInFileInZip(file,&TimerDetailsSize,sizeof(TimerDetailsSize)); zipWriteInFileInZip(file,&Entries,sizeof(Entries)); zipWriteInFileInZip(file,(void *)&m_TimerDetatils,sizeof(m_TimerDetatils)); @@ -308,7 +313,7 @@ void CSystemTimer::SaveData ( void * file ) const void CSystemTimer::LoadData ( void * file ) { - DWORD TimerDetailsSize, Entries; + uint32_t TimerDetailsSize, Entries; unzReadCurrentFile( file,&TimerDetailsSize,sizeof(TimerDetailsSize)); unzReadCurrentFile( file,&Entries,sizeof(Entries)); @@ -357,7 +362,7 @@ void CSystemTimer::RecordDifference( CLog &LogFile, const CSystemTimer& rSystemT } if (m_TimerDetatils[i].CyclesToTimer != rSystemTimer.m_TimerDetatils[i].CyclesToTimer) { - LogFile.LogF("Timer-m_TimerDetatils[%d] 0x%08X, 0x%08X\r\n",i,(DWORD)m_TimerDetatils[i].CyclesToTimer,(DWORD)rSystemTimer.m_TimerDetatils[i].CyclesToTimer ); + LogFile.LogF("Timer-m_TimerDetatils[%d] 0x%08X, 0x%08X\r\n",i,(uint32_t)m_TimerDetatils[i].CyclesToTimer,(uint32_t)rSystemTimer.m_TimerDetatils[i].CyclesToTimer ); } } } diff --git a/Source/Project64/N64System/Mips/SystemTiming.h b/Source/Project64-core/N64System/Mips/SystemTiming.h similarity index 88% rename from Source/Project64/N64System/Mips/SystemTiming.h rename to Source/Project64-core/N64System/Mips/SystemTiming.h index 65ea2ab9a..b374c9ddd 100644 --- a/Source/Project64/N64System/Mips/SystemTiming.h +++ b/Source/Project64-core/N64System/Mips/SystemTiming.h @@ -10,7 +10,8 @@ ****************************************************************************/ #pragma once -#include "../N64Types.h" +#include +#include class CSystemTimer { @@ -39,8 +40,8 @@ public: public: CSystemTimer ( int & NextTimer ); - void SetTimer ( TimerType Type, DWORD Cycles, bool bRelative ); - DWORD GetTimer ( TimerType Type ); + void SetTimer(TimerType Type, uint32_t Cycles, bool bRelative); + uint32_t GetTimer(TimerType Type); void StopTimer ( TimerType Type ); void UpdateTimers (); void TimerDone (); diff --git a/Source/Project64/N64System/Mips/TLBClass.h b/Source/Project64-core/N64System/Mips/TLBClass.h similarity index 94% rename from Source/Project64/N64System/Mips/TLBClass.h rename to Source/Project64-core/N64System/Mips/TLBClass.h index 7926b99e8..2c1a86747 100644 --- a/Source/Project64/N64System/Mips/TLBClass.h +++ b/Source/Project64-core/N64System/Mips/TLBClass.h @@ -10,6 +10,9 @@ ****************************************************************************/ #pragma once +#include +#include "RegisterClass.h" + class CDebugTlb; __interface CTLB_CB diff --git a/Source/Project64/N64System/Mips/TLBclass.cpp b/Source/Project64-core/N64System/Mips/TLBclass.cpp similarity index 96% rename from Source/Project64/N64System/Mips/TLBclass.cpp rename to Source/Project64-core/N64System/Mips/TLBclass.cpp index 3af3da5b6..511b8b087 100644 --- a/Source/Project64/N64System/Mips/TLBclass.cpp +++ b/Source/Project64-core/N64System/Mips/TLBclass.cpp @@ -9,6 +9,9 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "TLBClass.h" +#include +#include "RegisterClass.h" CTLB::CTLB(CTLB_CB * CallBack ): m_CB(CallBack) diff --git a/Source/Project64/N64System/Mips/TranslateVaddr.h b/Source/Project64-core/N64System/Mips/TranslateVaddr.h similarity index 100% rename from Source/Project64/N64System/Mips/TranslateVaddr.h rename to Source/Project64-core/N64System/Mips/TranslateVaddr.h diff --git a/Source/Project64/N64System/N64Class.cpp b/Source/Project64-core/N64System/N64Class.cpp similarity index 96% rename from Source/Project64/N64System/N64Class.cpp rename to Source/Project64-core/N64System/N64Class.cpp index eb34fd1a0..73dc35ee6 100644 --- a/Source/Project64/N64System/N64Class.cpp +++ b/Source/Project64-core/N64System/N64Class.cpp @@ -9,7 +9,18 @@ * * ****************************************************************************/ #include "stdafx.h" -#include +#include "N64class.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #pragma warning(disable:4355) // Disable 'this' : used in base member initializer list @@ -1381,7 +1392,7 @@ bool CN64System::SaveState() CPath SavedFileName(FileName); g_Notify->DisplayMessage(5, stdstr_f("%ws %s", SaveMessage.c_str(), SavedFileName.GetNameExtension().c_str()).ToUTF16().c_str()); - Notify().RefreshMenu(); + //Notify().RefreshMenu(); WriteTrace(TraceDebug, __FUNCTION__ ": Done"); return true; } diff --git a/Source/Project64/N64System/N64Class.h b/Source/Project64-core/N64System/N64Class.h similarity index 88% rename from Source/Project64/N64System/N64Class.h rename to Source/Project64-core/N64System/N64Class.h index a4ea87ebc..f77765d9a 100644 --- a/Source/Project64/N64System/N64Class.h +++ b/Source/Project64-core/N64System/N64Class.h @@ -11,7 +11,22 @@ #pragma once #include -#include +#include +#include +#include +#include +#include +#include + +#include "Mips/SystemEvents.h" +#include "Mips/MemoryClass.h" +#include "Mips/TLBClass.h" +#include "Mips/Audio.h" +#include "Mips/SystemTiming.h" +#include "ProfilingClass.h" +#include "CheatClass.h" +#include "FramePerSecondClass.h" +#include "SpeedLimitorClass.h" typedef std::list EVENT_LIST; diff --git a/Source/Project64/N64System/N64RomClass.cpp b/Source/Project64-core/N64System/N64RomClass.cpp similarity index 95% rename from Source/Project64/N64System/N64RomClass.cpp rename to Source/Project64-core/N64System/N64RomClass.cpp index f92435d69..19a1929c5 100644 --- a/Source/Project64/N64System/N64RomClass.cpp +++ b/Source/Project64-core/N64System/N64RomClass.cpp @@ -9,6 +9,12 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "N64RomClass.h" +#include "SystemGlobals.h" +#include +#include +#include +#include CN64Rom::CN64Rom() { diff --git a/Source/Project64/N64System/N64RomClass.h b/Source/Project64-core/N64System/N64RomClass.h similarity index 93% rename from Source/Project64/N64System/N64RomClass.h rename to Source/Project64-core/N64System/N64RomClass.h index 422aea5f6..2b4c8c404 100644 --- a/Source/Project64/N64System/N64RomClass.h +++ b/Source/Project64-core/N64System/N64RomClass.h @@ -10,7 +10,8 @@ ****************************************************************************/ #pragma once -#include "N64Types.h" +#include +#include class CN64Rom : protected CDebugSettings diff --git a/Source/Project64/N64System/N64Types.h b/Source/Project64-core/N64System/N64Types.h similarity index 100% rename from Source/Project64/N64System/N64Types.h rename to Source/Project64-core/N64System/N64Types.h diff --git a/Source/Project64/N64System/ProfilingClass.cpp b/Source/Project64-core/N64System/ProfilingClass.cpp similarity index 94% rename from Source/Project64/N64System/ProfilingClass.cpp rename to Source/Project64-core/N64System/ProfilingClass.cpp index 421b9320b..a9a7550e4 100644 --- a/Source/Project64/N64System/ProfilingClass.cpp +++ b/Source/Project64-core/N64System/ProfilingClass.cpp @@ -9,6 +9,8 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "ProfilingClass.h" +#include enum { MAX_FRAMES = 13 }; @@ -26,8 +28,9 @@ SPECIAL_TIMERS CProfiling::StartTimer(SPECIAL_TIMERS Address) m_CurrentTimerAddr = Address; #ifdef _M_IX86 - DWORD HiValue, LoValue; - _asm { + uint32_t HiValue, LoValue; + _asm + { pushad rdtsc mov HiValue, edx @@ -43,7 +46,7 @@ SPECIAL_TIMERS CProfiling::StartTimer(SPECIAL_TIMERS Address) } SPECIAL_TIMERS CProfiling::StopTimer() { - DWORD HiValue, LoValue; + uint32_t HiValue, LoValue; if (m_CurrentTimerAddr == Timer_None) { return m_CurrentTimerAddr; } @@ -182,6 +185,5 @@ void CProfiling::GenerateLog() { } } - ShellExecute(NULL,"open",LogFileName.c_str(),NULL,NULL,SW_SHOW); ResetCounters(); } diff --git a/Source/Project64/N64System/ProfilingClass.h b/Source/Project64-core/N64System/ProfilingClass.h similarity index 89% rename from Source/Project64/N64System/ProfilingClass.h rename to Source/Project64-core/N64System/ProfilingClass.h index f96bbaef2..471efbf2a 100644 --- a/Source/Project64/N64System/ProfilingClass.h +++ b/Source/Project64-core/N64System/ProfilingClass.h @@ -9,7 +9,7 @@ * * ****************************************************************************/ #pragma once -#include "N64Types.h" +#include typedef std::map PROFILE_ENRTIES; typedef PROFILE_ENRTIES::iterator PROFILE_ENRTY; @@ -38,8 +38,7 @@ private: CProfiling& operator=(const CProfiling&); // Disable assignment SPECIAL_TIMERS m_CurrentTimerAddr; - DWORD m_CurrentDisplayCount; - DWORD m_StartTimeHi, m_StartTimeLo; //The Current Timer start time + uint32_t m_CurrentDisplayCount; + uint32_t m_StartTimeHi, m_StartTimeLo; //The Current Timer start time PROFILE_ENRTIES m_Entries; - }; diff --git a/Source/Project64/N64System/Recompiler/CodeBlock.cpp b/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp similarity index 96% rename from Source/Project64/N64System/Recompiler/CodeBlock.cpp rename to Source/Project64-core/N64System/Recompiler/CodeBlock.cpp index d5712dc48..6238f7e32 100644 --- a/Source/Project64/N64System/Recompiler/CodeBlock.cpp +++ b/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp @@ -9,6 +9,12 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "CodeBlock.h" +#include "x86CodeLog.h" +#include +#include +#include +#include bool DelaySlotEffectsCompare (uint32_t PC, uint32_t Reg1, uint32_t Reg2); diff --git a/Source/Project64/N64System/Recompiler/CodeBlock.h b/Source/Project64-core/N64System/Recompiler/CodeBlock.h similarity index 95% rename from Source/Project64/N64System/Recompiler/CodeBlock.h rename to Source/Project64-core/N64System/Recompiler/CodeBlock.h index 8fbf4e5fa..553554402 100644 --- a/Source/Project64/N64System/Recompiler/CodeBlock.h +++ b/Source/Project64-core/N64System/Recompiler/CodeBlock.h @@ -9,6 +9,10 @@ * * ****************************************************************************/ #pragma once +#include +#include "RecompilerOps.h" +#include "ExitInfo.h" +#include "CodeSection.h" class CCodeBlock : private CRecompilerOps diff --git a/Source/Project64/N64System/Recompiler/CodeSection.cpp b/Source/Project64-core/N64System/Recompiler/CodeSection.cpp similarity index 96% rename from Source/Project64/N64System/Recompiler/CodeSection.cpp rename to Source/Project64-core/N64System/Recompiler/CodeSection.cpp index 80ec9664d..1c9765b8b 100644 --- a/Source/Project64/N64System/Recompiler/CodeSection.cpp +++ b/Source/Project64-core/N64System/Recompiler/CodeSection.cpp @@ -10,15 +10,16 @@ ****************************************************************************/ #include "stdafx.h" #include "CodeSection.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include void InPermLoop(); diff --git a/Source/Project64/N64System/Recompiler/CodeSection.h b/Source/Project64-core/N64System/Recompiler/CodeSection.h similarity index 95% rename from Source/Project64/N64System/Recompiler/CodeSection.h rename to Source/Project64-core/N64System/Recompiler/CodeSection.h index fdc115ecc..b1c91660c 100644 --- a/Source/Project64/N64System/Recompiler/CodeSection.h +++ b/Source/Project64-core/N64System/Recompiler/CodeSection.h @@ -9,6 +9,8 @@ * * ****************************************************************************/ #pragma once +#include "JumpInfo.h" +#include class CCodeBlock; diff --git a/Source/Project64/N64System/Recompiler/ExitInfo.h b/Source/Project64-core/N64System/Recompiler/ExitInfo.h similarity index 92% rename from Source/Project64/N64System/Recompiler/ExitInfo.h rename to Source/Project64-core/N64System/Recompiler/ExitInfo.h index 6e3e5a40c..a6c43369e 100644 --- a/Source/Project64/N64System/Recompiler/ExitInfo.h +++ b/Source/Project64-core/N64System/Recompiler/ExitInfo.h @@ -10,6 +10,8 @@ ****************************************************************************/ #pragma once +#include + struct CExitInfo { enum EXIT_REASON diff --git a/Source/Project64/N64System/Recompiler/FunctionInfo.cpp b/Source/Project64-core/N64System/Recompiler/FunctionInfo.cpp similarity index 96% rename from Source/Project64/N64System/Recompiler/FunctionInfo.cpp rename to Source/Project64-core/N64System/Recompiler/FunctionInfo.cpp index 2eac26329..6b107ae8a 100644 --- a/Source/Project64/N64System/Recompiler/FunctionInfo.cpp +++ b/Source/Project64-core/N64System/Recompiler/FunctionInfo.cpp @@ -9,6 +9,7 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "FunctionInfo.h" CCompiledFunc::CCompiledFunc( const CCodeBlock & CodeBlock ) : m_EnterPC(CodeBlock.VAddrEnter()), diff --git a/Source/Project64/N64System/Recompiler/FunctionInfo.h b/Source/Project64-core/N64System/Recompiler/FunctionInfo.h similarity index 96% rename from Source/Project64/N64System/Recompiler/FunctionInfo.h rename to Source/Project64-core/N64System/Recompiler/FunctionInfo.h index f930b196f..91df099ee 100644 --- a/Source/Project64/N64System/Recompiler/FunctionInfo.h +++ b/Source/Project64-core/N64System/Recompiler/FunctionInfo.h @@ -9,6 +9,7 @@ * * ****************************************************************************/ #pragma once +#include "CodeBlock.h" class CCompiledFunc { diff --git a/Source/Project64/N64System/Recompiler/FunctionMapClass.cpp b/Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp similarity index 91% rename from Source/Project64/N64System/Recompiler/FunctionMapClass.cpp rename to Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp index 942437040..1db93925a 100644 --- a/Source/Project64/N64System/Recompiler/FunctionMapClass.cpp +++ b/Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp @@ -9,6 +9,10 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "FunctionMapClass.h" +#include +#include +#include CFunctionMap::CFunctionMap() : m_JumpTable(NULL), diff --git a/Source/Project64/N64System/Recompiler/FunctionMapClass.h b/Source/Project64-core/N64System/Recompiler/FunctionMapClass.h similarity index 95% rename from Source/Project64/N64System/Recompiler/FunctionMapClass.h rename to Source/Project64-core/N64System/Recompiler/FunctionMapClass.h index 2abef6e36..aa10f76fc 100644 --- a/Source/Project64/N64System/Recompiler/FunctionMapClass.h +++ b/Source/Project64-core/N64System/Recompiler/FunctionMapClass.h @@ -9,6 +9,7 @@ * * ****************************************************************************/ #pragma once +#include "FunctionInfo.h" class CFunctionMap { diff --git a/Source/Project64/N64System/Recompiler/JumpInfo.h b/Source/Project64-core/N64System/Recompiler/JumpInfo.h similarity index 95% rename from Source/Project64/N64System/Recompiler/JumpInfo.h rename to Source/Project64-core/N64System/Recompiler/JumpInfo.h index b8e14c215..60cb3c60a 100644 --- a/Source/Project64/N64System/Recompiler/JumpInfo.h +++ b/Source/Project64-core/N64System/Recompiler/JumpInfo.h @@ -9,6 +9,7 @@ * * ****************************************************************************/ #pragma once +#include "ExitInfo.h" struct CJumpInfo { diff --git a/Source/Project64/N64System/Recompiler/LoopAnalysis.cpp b/Source/Project64-core/N64System/Recompiler/LoopAnalysis.cpp similarity index 96% rename from Source/Project64/N64System/Recompiler/LoopAnalysis.cpp rename to Source/Project64-core/N64System/Recompiler/LoopAnalysis.cpp index 6a5b14f4e..599716495 100644 --- a/Source/Project64/N64System/Recompiler/LoopAnalysis.cpp +++ b/Source/Project64-core/N64System/Recompiler/LoopAnalysis.cpp @@ -9,6 +9,13 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "LoopAnalysis.h" +#include +#include +#include +#include +#include +#include #ifdef _DEBUG #define CHECKED_BUILD 1 diff --git a/Source/Project64/N64System/Recompiler/LoopAnalysis.h b/Source/Project64-core/N64System/Recompiler/LoopAnalysis.h similarity index 93% rename from Source/Project64/N64System/Recompiler/LoopAnalysis.h rename to Source/Project64-core/N64System/Recompiler/LoopAnalysis.h index 30afffa81..d828b18fd 100644 --- a/Source/Project64/N64System/Recompiler/LoopAnalysis.h +++ b/Source/Project64-core/N64System/Recompiler/LoopAnalysis.h @@ -10,6 +10,9 @@ ****************************************************************************/ #pragma once +#include +#include + class CCodeSection; class CCodeBlock; diff --git a/Source/Project64/N64System/Recompiler/RecompilerClass.cpp b/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp similarity index 95% rename from Source/Project64/N64System/Recompiler/RecompilerClass.cpp rename to Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp index 4849ed253..323423ce8 100644 --- a/Source/Project64/N64System/Recompiler/RecompilerClass.cpp +++ b/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp @@ -9,6 +9,12 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "RecompilerClass.h" +#include +#include +#include +#include +#include CRecompiler::CRecompiler(CRegisters & Registers, CProfiling & Profile, bool & EndEmulation) : m_Registers(Registers), diff --git a/Source/Project64/N64System/Recompiler/RecompilerClass.h b/Source/Project64-core/N64System/Recompiler/RecompilerClass.h similarity index 90% rename from Source/Project64/N64System/Recompiler/RecompilerClass.h rename to Source/Project64-core/N64System/Recompiler/RecompilerClass.h index cc317e3f8..feb684ea4 100644 --- a/Source/Project64/N64System/Recompiler/RecompilerClass.h +++ b/Source/Project64-core/N64System/Recompiler/RecompilerClass.h @@ -9,6 +9,10 @@ * * ****************************************************************************/ #pragma once +#include +#include +#include +#include "RecompilerMemory.h" class CRecompiler : protected CDebugSettings, diff --git a/Source/Project64/N64System/Recompiler/RecompilerMemory.cpp b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp similarity index 76% rename from Source/Project64/N64System/Recompiler/RecompilerMemory.cpp rename to Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp index c8a00419b..c4d720b6e 100644 --- a/Source/Project64/N64System/Recompiler/RecompilerMemory.cpp +++ b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp @@ -9,6 +9,10 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "RecompilerMemory.h" +#include +#include +#include CRecompMemory::CRecompMemory() : m_RecompCode(NULL), @@ -29,7 +33,7 @@ CRecompMemory::~CRecompMemory() bool CRecompMemory::AllocateMemory() { - BYTE * RecompCodeBase = (BYTE *)VirtualAlloc(NULL, MaxCompileBufferSize + 4, MEM_RESERVE | MEM_TOP_DOWN, PAGE_EXECUTE_READWRITE); + uint8_t * RecompCodeBase = (uint8_t *)VirtualAlloc(NULL, MaxCompileBufferSize + 4, MEM_RESERVE | MEM_TOP_DOWN, PAGE_EXECUTE_READWRITE); if (RecompCodeBase == NULL) { WriteTrace(TraceError, __FUNCTION__ ": failed to allocate RecompCodeBase"); @@ -37,7 +41,7 @@ bool CRecompMemory::AllocateMemory() return false; } - m_RecompCode = (BYTE *)VirtualAlloc(RecompCodeBase, InitialCompileBufferSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE); + m_RecompCode = (uint8_t *)VirtualAlloc(RecompCodeBase, InitialCompileBufferSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE); if (m_RecompCode == NULL) { WriteTrace(TraceError, __FUNCTION__ ": failed to commit initial buffer"); @@ -53,7 +57,7 @@ bool CRecompMemory::AllocateMemory() void CRecompMemory::CheckRecompMem() { - DWORD Size = (DWORD)((BYTE *)m_RecompPos - (BYTE *)m_RecompCode); + uint32_t Size = (uint32_t)((uint8_t *)m_RecompPos - (uint8_t *)m_RecompCode); if ((Size + 0x20000) < m_RecompSize) { return; @@ -79,13 +83,13 @@ void CRecompMemory::Reset() void CRecompMemory::ShowMemUsed() { - DWORD Size = m_RecompPos - m_RecompCode; - DWORD MB = Size / 0x100000; + uint32_t Size = m_RecompPos - m_RecompCode; + uint32_t MB = Size / 0x100000; Size -= MB * 0x100000; - DWORD KB = Size / 1024; + uint32_t KB = Size / 1024; Size -= KB * 1024; - DWORD TotalAvaliable = m_RecompSize / 0x100000; + uint32_t TotalAvaliable = m_RecompSize / 0x100000; g_Notify->DisplayMessage(0, stdstr_f("Memory used: %d mb %-3d kb %-3d bytes Total Available: %d mb", MB, KB, Size, TotalAvaliable).ToUTF16().c_str()); } diff --git a/Source/Project64/N64System/Recompiler/RecompilerMemory.h b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.h similarity index 95% rename from Source/Project64/N64System/Recompiler/RecompilerMemory.h rename to Source/Project64-core/N64System/Recompiler/RecompilerMemory.h index bff2a26e1..007779008 100644 --- a/Source/Project64/N64System/Recompiler/RecompilerMemory.h +++ b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.h @@ -9,6 +9,7 @@ * * ****************************************************************************/ #pragma once +#include "X86ops.h" class CRecompMemory : protected CX86Ops diff --git a/Source/Project64/N64System/Recompiler/RecompilerOps.cpp b/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp similarity index 97% rename from Source/Project64/N64System/Recompiler/RecompilerOps.cpp rename to Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp index a326a5da7..023e8af6a 100644 --- a/Source/Project64/N64System/Recompiler/RecompilerOps.cpp +++ b/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp @@ -9,6 +9,16 @@ * * ****************************************************************************/ #include "stdafx.h" +#include +#include +#include +#include +#include +#include +#include "RecompilerClass.h" +#include "RecompilerOps.h" +#include "CodeSection.h" +#include "x86CodeLog.h" CCodeSection * CRecompilerOps::m_Section = NULL; CRegInfo CRecompilerOps::m_RegWorkingSet; @@ -5491,7 +5501,7 @@ void CRecompilerOps::COP0_CO_TLBWI(void) CPU_Message(" %X %s", m_CompilePC, R4300iOpcodeName(m_Opcode.Hex, m_CompilePC)); if (!g_System->bUseTlb()) { return; } BeforeCallDirect(m_RegWorkingSet); - PushImm32("FALSE", 0); + PushImm32("false", 0); MoveVariableToX86reg(&g_Reg->INDEX_REGISTER, "INDEX_REGISTER", x86_ECX); AndConstToX86Reg(x86_ECX, 0x1F); Push(x86_ECX); diff --git a/Source/Project64/N64System/Recompiler/RecompilerOps.h b/Source/Project64-core/N64System/Recompiler/RecompilerOps.h similarity index 95% rename from Source/Project64/N64System/Recompiler/RecompilerOps.h rename to Source/Project64-core/N64System/Recompiler/RecompilerOps.h index 5eb713f2d..e148dfbd6 100644 --- a/Source/Project64/N64System/Recompiler/RecompilerOps.h +++ b/Source/Project64-core/N64System/Recompiler/RecompilerOps.h @@ -10,8 +10,13 @@ ****************************************************************************/ #pragma once -#include -#include +#include +#include +#include +#include +#include +#include +#include "X86ops.h" class CCodeSection; diff --git a/Source/Project64/N64System/Recompiler/RegInfo.cpp b/Source/Project64-core/N64System/Recompiler/RegInfo.cpp similarity index 96% rename from Source/Project64/N64System/Recompiler/RegInfo.cpp rename to Source/Project64-core/N64System/Recompiler/RegInfo.cpp index 1b0126713..8456a3bd9 100644 --- a/Source/Project64/N64System/Recompiler/RegInfo.cpp +++ b/Source/Project64-core/N64System/Recompiler/RegInfo.cpp @@ -9,6 +9,11 @@ * * ****************************************************************************/ #include "stdafx.h" +#include +#include +#include "RegInfo.h" +#include "RecompilerClass.h" +#include "x86CodeLog.h" uint32_t CRegInfo::m_fpuControl = 0; @@ -1137,7 +1142,7 @@ void CRegInfo::UnMap_GPR(uint32_t Reg, bool WriteBackValue) } if (IsUnknown(Reg)) { return; } - //CPU_Message("UnMap_GPR: State: %X\tReg: %s\tWriteBack: %s",State,CRegName::GPR[Reg],WriteBackValue?"TRUE":"FALSE"); + //CPU_Message("UnMap_GPR: State: %X\tReg: %s\tWriteBack: %s",State,CRegName::GPR[Reg],WriteBackValue?"true":"false"); if (IsConst(Reg)) { if (!WriteBackValue) diff --git a/Source/Project64/N64System/Recompiler/RegInfo.h b/Source/Project64-core/N64System/Recompiler/RegInfo.h similarity index 96% rename from Source/Project64/N64System/Recompiler/RegInfo.h rename to Source/Project64-core/N64System/Recompiler/RegInfo.h index a16cfbebc..022252f52 100644 --- a/Source/Project64/N64System/Recompiler/RegInfo.h +++ b/Source/Project64-core/N64System/Recompiler/RegInfo.h @@ -9,6 +9,9 @@ * * ****************************************************************************/ #pragma once +#include +#include +#include "X86ops.h" class CRegInfo : private CDebugSettings, diff --git a/Source/Project64/N64System/Recompiler/SectionInfo.cpp b/Source/Project64-core/N64System/Recompiler/SectionInfo.cpp similarity index 95% rename from Source/Project64/N64System/Recompiler/SectionInfo.cpp rename to Source/Project64-core/N64System/Recompiler/SectionInfo.cpp index a497e4b47..3c13afa18 100644 --- a/Source/Project64/N64System/Recompiler/SectionInfo.cpp +++ b/Source/Project64-core/N64System/Recompiler/SectionInfo.cpp @@ -9,6 +9,8 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "SectionInfo.h" +#include "JumpInfo.h" CJumpInfo::CJumpInfo() { diff --git a/Source/Project64/N64System/Recompiler/SectionInfo.h b/Source/Project64-core/N64System/Recompiler/SectionInfo.h similarity index 100% rename from Source/Project64/N64System/Recompiler/SectionInfo.h rename to Source/Project64-core/N64System/Recompiler/SectionInfo.h diff --git a/Source/Project64/N64System/Recompiler/X86ops.cpp b/Source/Project64-core/N64System/Recompiler/X86ops.cpp similarity index 96% rename from Source/Project64/N64System/Recompiler/X86ops.cpp rename to Source/Project64-core/N64System/Recompiler/X86ops.cpp index f2239b028..ab4d96dcf 100644 --- a/Source/Project64/N64System/Recompiler/X86ops.cpp +++ b/Source/Project64-core/N64System/Recompiler/X86ops.cpp @@ -9,6 +9,10 @@ * * ****************************************************************************/ #include "stdafx.h" +#include +#include +#include "X86ops.h" +#include "x86CodeLog.h" #define PUTDST8(dest,value) (*((uint8_t *)(dest))=(uint8_t)(value)); dest += 1; #define PUTDST16(dest,value) (*((uint16_t *)(dest))=(uint16_t)(value)); dest += 2; diff --git a/Source/Project64/N64System/Recompiler/X86ops.h b/Source/Project64-core/N64System/Recompiler/X86ops.h similarity index 100% rename from Source/Project64/N64System/Recompiler/X86ops.h rename to Source/Project64-core/N64System/Recompiler/X86ops.h diff --git a/Source/Project64/N64System/Recompiler/x86CodeLog.cpp b/Source/Project64-core/N64System/Recompiler/x86CodeLog.cpp similarity index 93% rename from Source/Project64/N64System/Recompiler/x86CodeLog.cpp rename to Source/Project64-core/N64System/Recompiler/x86CodeLog.cpp index 870e1baf6..9bd60a426 100644 --- a/Source/Project64/N64System/Recompiler/x86CodeLog.cpp +++ b/Source/Project64-core/N64System/Recompiler/x86CodeLog.cpp @@ -9,6 +9,9 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "x86CodeLog.h" +#include +#include static HANDLE hCPULogFile = NULL; bool bX86Logging = false; diff --git a/Source/Project64/N64System/Recompiler/x86CodeLog.h b/Source/Project64-core/N64System/Recompiler/x86CodeLog.h similarity index 100% rename from Source/Project64/N64System/Recompiler/x86CodeLog.h rename to Source/Project64-core/N64System/Recompiler/x86CodeLog.h diff --git a/Source/Project64/N64System/SpeedLimitorClass.cpp b/Source/Project64-core/N64System/SpeedLimitorClass.cpp similarity index 100% rename from Source/Project64/N64System/SpeedLimitorClass.cpp rename to Source/Project64-core/N64System/SpeedLimitorClass.cpp diff --git a/Source/Project64/N64System/SpeedLimitorClass.h b/Source/Project64-core/N64System/SpeedLimitorClass.h similarity index 100% rename from Source/Project64/N64System/SpeedLimitorClass.h rename to Source/Project64-core/N64System/SpeedLimitorClass.h diff --git a/Source/Project64/N64System/SystemGlobals.cpp b/Source/Project64-core/N64System/SystemGlobals.cpp similarity index 96% rename from Source/Project64/N64System/SystemGlobals.cpp rename to Source/Project64-core/N64System/SystemGlobals.cpp index 64aae0e7c..011078a93 100644 --- a/Source/Project64/N64System/SystemGlobals.cpp +++ b/Source/Project64-core/N64System/SystemGlobals.cpp @@ -9,6 +9,7 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "SystemGlobals.h" CN64System * g_System = NULL; CN64System * g_BaseSystem = NULL; diff --git a/Source/Project64/N64System/SystemGlobals.h b/Source/Project64-core/N64System/SystemGlobals.h similarity index 80% rename from Source/Project64/N64System/SystemGlobals.h rename to Source/Project64-core/N64System/SystemGlobals.h index a63350de3..55678624d 100644 --- a/Source/Project64/N64System/SystemGlobals.h +++ b/Source/Project64-core/N64System/SystemGlobals.h @@ -10,21 +10,42 @@ ****************************************************************************/ #pragma once -extern CNotification * g_Notify; -extern CSettings * g_Settings; +class CSettings; +extern CSettings * g_Settings; +class CN64System; extern CN64System * g_System; extern CN64System * g_BaseSystem; extern CN64System * g_SyncSystem; + +class CRecompiler; extern CRecompiler * g_Recompiler; -extern CMipsMemory * g_MMU; //Memory of the n64 + +__interface CMipsMemory; +extern CMipsMemory * g_MMU; //Memory of the n64 + +class CTLB; extern CTLB * g_TLB; //TLB Unit + +class CRegisters; extern CRegisters * g_Reg; //Current Register Set attached to the g_MMU + +class CPlugins; extern CPlugins * g_Plugins; + +class CN64Rom; extern CN64Rom * g_Rom; //The current rom that this system is executing.. it can only execute one file at the time + +class CAudio; extern CAudio * g_Audio; + +class CSystemTimer; extern CSystemTimer * g_SystemTimer; + +__interface CTransVaddr; extern CTransVaddr * g_TransVaddr; + +class CSystemEvents; extern CSystemEvents * g_SystemEvents; extern int32_t * g_NextTimer; diff --git a/Source/Project64-core/N64System/stdafx.h b/Source/Project64-core/N64System/stdafx.h new file mode 100644 index 000000000..8b696d0b1 --- /dev/null +++ b/Source/Project64-core/N64System/stdafx.h @@ -0,0 +1 @@ +#include "../stdafx.h" diff --git a/Source/Project64-core/Notification.h b/Source/Project64-core/Notification.h new file mode 100644 index 000000000..1c3445ce8 --- /dev/null +++ b/Source/Project64-core/Notification.h @@ -0,0 +1,34 @@ +#pragma once + +#include "Multilanguage.h" + +#ifndef _MSC_VER +#define __interface struct +#endif + +__interface CNotification +{ +public: + //Error Messages + virtual void DisplayError(const wchar_t * Message) const = 0; + virtual void DisplayError(LanguageStringID StringID) const = 0; + + virtual void FatalError(const wchar_t * Message) const = 0; + virtual void FatalError(LanguageStringID StringID) const = 0; + + //User Feedback + virtual void DisplayMessage(int DisplayTime, const wchar_t * Message) const = 0; + virtual void DisplayMessage(int DisplayTime, LanguageStringID StringID) const = 0; + virtual void DisplayMessage2(const wchar_t * Message) const = 0; + + // Ask a Yes/No Question to the user, yes = true, no = false + virtual bool AskYesNoQuestion(const wchar_t * Question) const = 0; + + virtual void BreakPoint(const wchar_t * FileName, int LineNumber) = 0; + + virtual void AppInitDone(void) = 0; + virtual bool ProcessGuiMessages(void) const = 0; + virtual void ChangeFullScreen(void) const = 0; +}; + +extern CNotification * g_Notify; diff --git a/Source/Project64/Plugin.h b/Source/Project64-core/Plugin.h similarity index 93% rename from Source/Project64/Plugin.h rename to Source/Project64-core/Plugin.h index 8259c4aa8..c87be00f4 100644 --- a/Source/Project64/Plugin.h +++ b/Source/Project64-core/Plugin.h @@ -10,8 +10,6 @@ ****************************************************************************/ #pragma once -#include "Support.h" - //Plugin controller #include "Plugins/PluginClass.h" @@ -22,4 +20,3 @@ #include "Plugins/AudioPlugin.h" #include "Plugins/ControllerPlugin.h" #include "Plugins/RSPPlugin.h" -#include "Plugins/PluginList.h" \ No newline at end of file diff --git a/Source/Project64/Plugins/AudioPlugin.cpp b/Source/Project64-core/Plugins/AudioPlugin.cpp similarity index 92% rename from Source/Project64/Plugins/AudioPlugin.cpp rename to Source/Project64-core/Plugins/AudioPlugin.cpp index f45b84f43..aa6f6efcf 100644 --- a/Source/Project64/Plugins/AudioPlugin.cpp +++ b/Source/Project64-core/Plugins/AudioPlugin.cpp @@ -9,6 +9,13 @@ * * ****************************************************************************/ #include "stdafx.h" +#include +#include +#include +#include +#include +#include "AudioPlugin.h" +#include CAudioPlugin::CAudioPlugin() : AiLenChanged(NULL), diff --git a/Source/Project64/Plugins/AudioPlugin.h b/Source/Project64-core/Plugins/AudioPlugin.h similarity index 100% rename from Source/Project64/Plugins/AudioPlugin.h rename to Source/Project64-core/Plugins/AudioPlugin.h diff --git a/Source/Project64/Plugins/ControllerPlugin.cpp b/Source/Project64-core/Plugins/ControllerPlugin.cpp similarity index 93% rename from Source/Project64/Plugins/ControllerPlugin.cpp rename to Source/Project64-core/Plugins/ControllerPlugin.cpp index bf2fef1f3..01240c51f 100644 --- a/Source/Project64/Plugins/ControllerPlugin.cpp +++ b/Source/Project64-core/Plugins/ControllerPlugin.cpp @@ -9,6 +9,11 @@ * * ****************************************************************************/ #include "stdafx.h" +#include +#include +#include +#include "ControllerPlugin.h" +#include CControl_Plugin::CControl_Plugin(void) : WM_KeyDown(NULL), diff --git a/Source/Project64/Plugins/ControllerPlugin.h b/Source/Project64-core/Plugins/ControllerPlugin.h similarity index 100% rename from Source/Project64/Plugins/ControllerPlugin.h rename to Source/Project64-core/Plugins/ControllerPlugin.h diff --git a/Source/Project64/Plugins/GFXPlugin.h b/Source/Project64-core/Plugins/GFXPlugin.h similarity index 100% rename from Source/Project64/Plugins/GFXPlugin.h rename to Source/Project64-core/Plugins/GFXPlugin.h diff --git a/Source/Project64/Plugins/GFXplugin.cpp b/Source/Project64-core/Plugins/GFXplugin.cpp similarity index 94% rename from Source/Project64/Plugins/GFXplugin.cpp rename to Source/Project64-core/Plugins/GFXplugin.cpp index 199f716b9..d6169cdd6 100644 --- a/Source/Project64/Plugins/GFXplugin.cpp +++ b/Source/Project64-core/Plugins/GFXplugin.cpp @@ -9,6 +9,12 @@ * * ****************************************************************************/ #include "stdafx.h" +#include +#include +#include +#include +#include "GFXplugin.h" +#include CGfxPlugin::CGfxPlugin() : CaptureScreen(NULL), diff --git a/Source/Project64/Plugins/PluginBase.cpp b/Source/Project64-core/Plugins/PluginBase.cpp similarity index 99% rename from Source/Project64/Plugins/PluginBase.cpp rename to Source/Project64-core/Plugins/PluginBase.cpp index 2ef931177..195678354 100644 --- a/Source/Project64/Plugins/PluginBase.cpp +++ b/Source/Project64-core/Plugins/PluginBase.cpp @@ -9,6 +9,8 @@ * * ****************************************************************************/ #include "stdafx.h" +#include "PluginBase.h" +#include CPlugin::CPlugin() : DllAbout(NULL), diff --git a/Source/Project64/Plugins/PluginBase.h b/Source/Project64-core/Plugins/PluginBase.h similarity index 97% rename from Source/Project64/Plugins/PluginBase.h rename to Source/Project64-core/Plugins/PluginBase.h index 4312dc8aa..35494e8fc 100644 --- a/Source/Project64/Plugins/PluginBase.h +++ b/Source/Project64-core/Plugins/PluginBase.h @@ -10,6 +10,9 @@ ****************************************************************************/ #pragma once +#include +#include "PluginClass.h" + class CPlugin : private CDebugSettings { diff --git a/Source/Project64/Plugins/PluginClass.cpp b/Source/Project64-core/Plugins/PluginClass.cpp similarity index 96% rename from Source/Project64/Plugins/PluginClass.cpp rename to Source/Project64-core/Plugins/PluginClass.cpp index 291102c20..f29bb6de2 100644 --- a/Source/Project64/Plugins/PluginClass.cpp +++ b/Source/Project64-core/Plugins/PluginClass.cpp @@ -9,6 +9,8 @@ * * ****************************************************************************/ #include "stdafx.h" +#include +#include #include #include "PluginClass.h" @@ -77,7 +79,6 @@ void CPlugins::PluginChanged(CPlugins * _this) else { _this->Reset(NULL); - Notify().RefreshMenu(); } } } @@ -128,11 +129,6 @@ void CPlugins::CreatePlugins(void) m_RSP->EnableDebugging(bHaveDebugger()); WriteTrace(TraceRSP, __FUNCTION__ ": EnableDebugging done"); } - - if (bHaveDebugger()) - { - Notify().RefreshMenu(); - } } void CPlugins::GameReset(void) diff --git a/Source/Project64/Plugins/PluginClass.h b/Source/Project64-core/Plugins/PluginClass.h similarity index 91% rename from Source/Project64/Plugins/PluginClass.h rename to Source/Project64-core/Plugins/PluginClass.h index af0b86942..c7d158b45 100644 --- a/Source/Project64/Plugins/PluginClass.h +++ b/Source/Project64-core/Plugins/PluginClass.h @@ -10,7 +10,7 @@ ****************************************************************************/ #pragma once #include -#include +#include #ifndef PLUGIN_INFO_STRUCT #define PLUGIN_INFO_STRUCT @@ -87,9 +87,9 @@ class CPlugins; __interface RenderWindow { - bool ResetPluginsInUiThread(CPlugins * plugins, CN64System * System) = 0; - void * GetWindowHandle(void) const = 0; - void * GetStatusBar(void) const = 0; + virtual bool ResetPluginsInUiThread(CPlugins * plugins, CN64System * System) = 0; + virtual void * GetWindowHandle(void) const = 0; + virtual void * GetStatusBar(void) const = 0; }; class CPlugins : @@ -104,7 +104,7 @@ public: void RomOpened(void); void RomClosed(void); void SetRenderWindows(RenderWindow * MainWindow, RenderWindow * SyncWindow); - void ConfigPlugin(void* hParent, PLUGIN_TYPE Type); + void ConfigPlugin(void * hParent, PLUGIN_TYPE Type); bool CopyPlugins(const stdstr & DstDir) const; void CreatePlugins(void); bool Reset(CN64System * System); diff --git a/Source/Project64/Plugins/RSPPlugin.cpp b/Source/Project64-core/Plugins/RSPPlugin.cpp similarity index 93% rename from Source/Project64/Plugins/RSPPlugin.cpp rename to Source/Project64-core/Plugins/RSPPlugin.cpp index 2a992013d..9d66555d9 100644 --- a/Source/Project64/Plugins/RSPPlugin.cpp +++ b/Source/Project64-core/Plugins/RSPPlugin.cpp @@ -9,6 +9,13 @@ * * ****************************************************************************/ #include "stdafx.h" +#include +#include +#include +#include "RSPPlugin.h" +#include "GFXplugin.h" +#include "AudioPlugin.h" +#include void DummyFunc1(int a) { a += 1;} diff --git a/Source/Project64/Plugins/RSPPlugin.h b/Source/Project64-core/Plugins/RSPPlugin.h similarity index 100% rename from Source/Project64/Plugins/RSPPlugin.h rename to Source/Project64-core/Plugins/RSPPlugin.h diff --git a/Source/Project64-core/Project64-core.vcproj b/Source/Project64-core/Project64-core.vcproj new file mode 100644 index 000000000..f3ed88360 --- /dev/null +++ b/Source/Project64-core/Project64-core.vcproj @@ -0,0 +1,717 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Project64-core/Project64-core.vcxproj b/Source/Project64-core/Project64-core.vcxproj new file mode 100644 index 000000000..75ea71f56 --- /dev/null +++ b/Source/Project64-core/Project64-core.vcxproj @@ -0,0 +1,206 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {00C7B43A-DED7-4DF0-B072-9A5783EF866D} + Project64core + + + StaticLibrary + + + + + + + + + + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {731bd205-2826-4631-b7af-117658e88dbc} + + + {3326e128-33af-422c-bb7c-67cc6b915610} + + + + \ No newline at end of file diff --git a/Source/Project64-core/Project64-core.vcxproj.filters b/Source/Project64-core/Project64-core.vcxproj.filters new file mode 100644 index 000000000..05c2b696d --- /dev/null +++ b/Source/Project64-core/Project64-core.vcxproj.filters @@ -0,0 +1,567 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {79bf4b75-4a28-4d09-a1ff-ba8d94c3bd6a} + + + {727ca617-08a9-456c-be66-91f287495874} + + + {3066447b-6324-41a3-a220-25e86d06ecb7} + + + {2245e08f-c941-4a72-8456-c23f5c7b8084} + + + {5247fbf4-b36d-4fae-a307-e1f260323444} + + + {a13e8feb-8c4c-463f-8c4e-bcd9c8d8bac7} + + + {9ac6fa7e-446a-4954-8bf7-4597925ebc28} + + + {b55114a3-4311-4d2b-9bd6-586bc5d7430c} + + + {e3f8ea19-e06b-47a7-8d69-14a0c1cfa8f1} + + + {ac92e812-22e1-4a1a-8dd5-5055073c882c} + + + {febaabe1-9838-4211-970d-2af9a003ef8f} + + + {a1b6e544-b421-41c3-9298-2d2c3680d077} + + + {ef7fa35e-b30c-4ec8-9a6c-9e019ac01827} + + + {0ea653e0-6dcc-4d95-87f2-a488a6012094} + + + {aed6cf1c-b7c0-43e8-8d47-91c7b9dfd936} + + + {22470874-76c8-4c5b-bbf2-d054e022422a} + + + {609b09f8-142c-4090-a682-27095d71c8ab} + + + {d92afe8c-f660-4a4d-b5bc-7785de1f14d3} + + + {1478740a-b66b-41bd-833c-917c0cb85047} + + + + + Source Files + + + Source Files + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files\Settings\SettingType + + + Source Files + + + Source Files\3rd Party + + + Source Files\N64 System\Recompiler + + + Source Files\N64 System\Recompiler + + + Source Files\Settings + + + Source Files\Settings + + + Source Files\Settings + + + Source Files\Settings + + + Source Files\Settings + + + Source Files\Settings + + + Source Files\Plugins + + + Source Files\Plugins + + + Source Files\Plugins + + + Source Files\Plugins + + + Source Files\Plugins + + + Source Files\Plugins + + + Source Files\N64 System + + + Source Files\N64 System + + + Source Files\N64 System + + + Source Files\N64 System + + + Source Files\N64 System + + + Source Files\N64 System + + + Source Files\N64 System + + + Source Files\N64 System + + + Source Files\N64 System\Recompiler + + + Source Files\N64 System\Recompiler + + + Source Files\N64 System\Recompiler + + + Source Files\N64 System\Recompiler + + + Source Files\N64 System\Recompiler + + + Source Files\N64 System\Recompiler + + + Source Files\N64 System\Recompiler + + + Source Files\N64 System\Recompiler + + + Source Files\N64 System\Recompiler + + + Source Files\N64 System\Recompiler + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Mips + + + Source Files\N64 System\Interpreter + + + Source Files\N64 System\Interpreter + + + Source Files\N64 System\Interpreter + + + Source Files\Multilanguage + + + + + Header Files + + + Header Files + + + Header Files\Multilanguage + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings\SettingType + + + Header Files\Settings + + + Header Files + + + Header Files\Plugins + + + Header Files\Plugins + + + Header Files\Plugins + + + Header Files\Plugins + + + Header Files\Plugins + + + Header Files\Plugins + + + Header Files\Settings + + + Header Files\Settings + + + Header Files\Settings + + + Header Files + + + Header Files + + + Header Files + + + Header Files\Settings + + + Header Files\3rd Party + + + Header Files\3rd Party + + + Header Files\3rd Party\Zlib + + + Header Files\3rd Party\Zlib + + + Header Files\3rd Party\Zlib + + + Header Files\3rd Party\Zlib + + + Header Files + + + Header Files\Settings + + + Header Files\N64 System + + + Header Files\N64 System + + + Header Files\N64 System + + + Header Files\N64 System + + + Header Files\N64 System + + + Header Files\N64 System + + + Header Files\N64 System + + + Header Files\N64 System + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Recompiler + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Mips + + + Header Files\N64 System\Interpreter + + + Header Files\N64 System\Interpreter + + + Header Files\N64 System\Interpreter + + + Header Files\Settings + + + \ No newline at end of file diff --git a/Source/Project64/Settings/DebugSettings.cpp b/Source/Project64-core/Settings/DebugSettings.cpp similarity index 100% rename from Source/Project64/Settings/DebugSettings.cpp rename to Source/Project64-core/Settings/DebugSettings.cpp diff --git a/Source/Project64/Settings/DebugSettings.h b/Source/Project64-core/Settings/DebugSettings.h similarity index 94% rename from Source/Project64/Settings/DebugSettings.h rename to Source/Project64-core/Settings/DebugSettings.h index 75258a2db..d82d89f52 100644 --- a/Source/Project64/Settings/DebugSettings.h +++ b/Source/Project64-core/Settings/DebugSettings.h @@ -10,7 +10,7 @@ ****************************************************************************/ #pragma once -#include +#include class CDebugSettings { diff --git a/Source/Project64/Settings/GameSettings.cpp b/Source/Project64-core/Settings/GameSettings.cpp similarity index 95% rename from Source/Project64/Settings/GameSettings.cpp rename to Source/Project64-core/Settings/GameSettings.cpp index bf86f9bd4..62c440acd 100644 --- a/Source/Project64/Settings/GameSettings.cpp +++ b/Source/Project64-core/Settings/GameSettings.cpp @@ -9,8 +9,8 @@ * * ****************************************************************************/ #include "stdafx.h" -#include -#include +#include +#include #include "GameSettings.h" bool CGameSettings::m_bSMM_StoreInstruc; diff --git a/Source/Project64/Settings/GameSettings.h b/Source/Project64-core/Settings/GameSettings.h similarity index 96% rename from Source/Project64/Settings/GameSettings.h rename to Source/Project64-core/Settings/GameSettings.h index fced65116..737014f27 100644 --- a/Source/Project64/Settings/GameSettings.h +++ b/Source/Project64-core/Settings/GameSettings.h @@ -10,7 +10,7 @@ ****************************************************************************/ #pragma once -#include +#include class CGameSettings { diff --git a/Source/Project64/Settings/LoggingSettings.cpp b/Source/Project64-core/Settings/LoggingSettings.cpp similarity index 100% rename from Source/Project64/Settings/LoggingSettings.cpp rename to Source/Project64-core/Settings/LoggingSettings.cpp diff --git a/Source/Project64/Settings/LoggingSettings.h b/Source/Project64-core/Settings/LoggingSettings.h similarity index 100% rename from Source/Project64/Settings/LoggingSettings.h rename to Source/Project64-core/Settings/LoggingSettings.h diff --git a/Source/Project64/Settings/N64SystemSettings.cpp b/Source/Project64-core/Settings/N64SystemSettings.cpp similarity index 100% rename from Source/Project64/Settings/N64SystemSettings.cpp rename to Source/Project64-core/Settings/N64SystemSettings.cpp diff --git a/Source/Project64/Settings/N64SystemSettings.h b/Source/Project64-core/Settings/N64SystemSettings.h similarity index 100% rename from Source/Project64/Settings/N64SystemSettings.h rename to Source/Project64-core/Settings/N64SystemSettings.h diff --git a/Source/Project64/Settings/RecompilerSettings.cpp b/Source/Project64-core/Settings/RecompilerSettings.cpp similarity index 100% rename from Source/Project64/Settings/RecompilerSettings.cpp rename to Source/Project64-core/Settings/RecompilerSettings.cpp diff --git a/Source/Project64/Settings/RecompilerSettings.h b/Source/Project64-core/Settings/RecompilerSettings.h similarity index 94% rename from Source/Project64/Settings/RecompilerSettings.h rename to Source/Project64-core/Settings/RecompilerSettings.h index 7105255eb..5b28782be 100644 --- a/Source/Project64/Settings/RecompilerSettings.h +++ b/Source/Project64-core/Settings/RecompilerSettings.h @@ -10,7 +10,7 @@ ****************************************************************************/ #pragma once -#include +#include class CRecompilerSettings { diff --git a/Source/Project64/Settings/SettingType/SettingsType-Application.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-Application.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-Application.h b/Source/Project64-core/Settings/SettingType/SettingsType-Application.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-Application.h rename to Source/Project64-core/Settings/SettingType/SettingsType-Application.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.h b/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.h rename to Source/Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationPath.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-ApplicationPath.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.h b/Source/Project64-core/Settings/SettingType/SettingsType-ApplicationPath.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.h rename to Source/Project64-core/Settings/SettingType/SettingsType-ApplicationPath.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-Base.h b/Source/Project64-core/Settings/SettingType/SettingsType-Base.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-Base.h rename to Source/Project64-core/Settings/SettingType/SettingsType-Base.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-Cheats.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-Cheats.h b/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-Cheats.h rename to Source/Project64-core/Settings/SettingType/SettingsType-Cheats.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-GameSetting.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-GameSetting.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-GameSetting.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-GameSetting.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-GameSetting.h b/Source/Project64-core/Settings/SettingType/SettingsType-GameSetting.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-GameSetting.h rename to Source/Project64-core/Settings/SettingType/SettingsType-GameSetting.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.h b/Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.h rename to Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.h b/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.h rename to Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.h b/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.h rename to Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.h b/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.h rename to Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.h b/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.h rename to Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.h b/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.h rename to Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-RelativePath.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RelativePath.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-RelativePath.h b/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RelativePath.h rename to Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.h b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RomDatabase.h rename to Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.h b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.h rename to Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.h b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.h rename to Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseSetting.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomSetting.h b/Source/Project64-core/Settings/SettingType/SettingsType-RomSetting.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-RomSetting.h rename to Source/Project64-core/Settings/SettingType/SettingsType-RomSetting.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.h b/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.h rename to Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempBool.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-TempBool.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-TempBool.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempBool.h b/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-TempBool.h rename to Source/Project64-core/Settings/SettingType/SettingsType-TempBool.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempNumber.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-TempNumber.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempNumber.h b/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-TempNumber.h rename to Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.h diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempString.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-TempString.cpp similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-TempString.cpp rename to Source/Project64-core/Settings/SettingType/SettingsType-TempString.cpp diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempString.h b/Source/Project64-core/Settings/SettingType/SettingsType-TempString.h similarity index 100% rename from Source/Project64/Settings/SettingType/SettingsType-TempString.h rename to Source/Project64-core/Settings/SettingType/SettingsType-TempString.h diff --git a/Source/Project64-core/Settings/SettingType/stdafx.h b/Source/Project64-core/Settings/SettingType/stdafx.h new file mode 100644 index 000000000..8b696d0b1 --- /dev/null +++ b/Source/Project64-core/Settings/SettingType/stdafx.h @@ -0,0 +1 @@ +#include "../stdafx.h" diff --git a/Source/Project64/Settings/Settings.h b/Source/Project64-core/Settings/Settings.h similarity index 100% rename from Source/Project64/Settings/Settings.h rename to Source/Project64-core/Settings/Settings.h diff --git a/Source/Project64/Settings/SettingsClass.cpp b/Source/Project64-core/Settings/SettingsClass.cpp similarity index 100% rename from Source/Project64/Settings/SettingsClass.cpp rename to Source/Project64-core/Settings/SettingsClass.cpp diff --git a/Source/Project64/Settings/SettingsClass.h b/Source/Project64-core/Settings/SettingsClass.h similarity index 100% rename from Source/Project64/Settings/SettingsClass.h rename to Source/Project64-core/Settings/SettingsClass.h diff --git a/Source/Project64-core/Settings/stdafx.h b/Source/Project64-core/Settings/stdafx.h new file mode 100644 index 000000000..8b696d0b1 --- /dev/null +++ b/Source/Project64-core/Settings/stdafx.h @@ -0,0 +1 @@ +#include "../stdafx.h" diff --git a/Source/Project64/Version.h b/Source/Project64-core/Version.h similarity index 100% rename from Source/Project64/Version.h rename to Source/Project64-core/Version.h diff --git a/Source/Project64-core/stdafx.cpp b/Source/Project64-core/stdafx.cpp new file mode 100644 index 000000000..1577c4e3b --- /dev/null +++ b/Source/Project64-core/stdafx.cpp @@ -0,0 +1 @@ +#include "stdafx.h" \ No newline at end of file diff --git a/Source/Project64-core/stdafx.h b/Source/Project64-core/stdafx.h new file mode 100644 index 000000000..02907c79b --- /dev/null +++ b/Source/Project64-core/stdafx.h @@ -0,0 +1,8 @@ +#include +#include +#include + +#include "Multilanguage.h" +#include "Notification.h" +#include "version.h" +#include "Settings/SettingsClass.h" diff --git a/Source/Project64/N64System.h b/Source/Project64/N64System.h index c690e4a6d..e90a74ced 100644 --- a/Source/Project64/N64System.h +++ b/Source/Project64/N64System.h @@ -16,62 +16,59 @@ #include #include "UserInterface.h" +#include -class CNotification; -#include "N64System/ProfilingClass.h" +#include //General Mips Information -#include "N64System/N64RomClass.h" +#include #include "N64System/RomInformationClass.h" -#include "N64System/SpeedLimitorClass.h" -#include "N64System/Mips/OpCode.h" -#include "N64System/Recompiler/X86ops.h" -#include "N64System/Mips/Mempak.h" -#include "N64System/Mips/Rumblepak.h" -#include "N64System/Mips/FlashRam.h" -#include "N64System/Mips/Sram.h" -#include "N64System/Mips/Eeprom.h" -#include "N64System/Mips/Dma.h" -#include "N64System/Mips/PifRam.h" -#include "N64System/Mips/RegisterClass.h" -#include "N64System/Mips/TranslateVaddr.h" -#include "N64System/Mips/TLBClass.h" -#include "N64System/Mips/MemoryLabelsClass.h" -#include "N64System/Mips/MemoryClass.h" -#include "N64System/Mips/Audio.h" -#include "N64System/Mips/SystemTiming.h" -#include "N64System/Mips/SystemEvents.h" - -//C Core - to be upgrdaded and removed -#include "N64System/C_Core/r4300iCommands.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include //Interpter -#include "N64System/Interpreter/InterpreterOps.h" -#include "N64System/Interpreter/InterpreterOps32.h" -#include "N64System/Interpreter/InterpreterCPU.h" +#include +#include +#include //Recompiler -#include "N64System/Recompiler/RecompilerMemory.h" -#include "N64System/Recompiler/RegInfo.h" -#include "N64System/Recompiler/LoopAnalysis.h" -#include "N64System/Recompiler/RecompilerOps.h" -#include "N64System/Mips/MemoryVirtualMem.h" //needs to inherit Recompiler ops -#include "N64System/Recompiler/ExitInfo.h" -#include "N64System/Recompiler/JumpInfo.h" -#include "N64System/Recompiler/CodeSection.h" -#include "N64System/Recompiler/CodeBlock.h" -#include "N64System/Recompiler/SectionInfo.h" -#include "N64System/Recompiler/FunctionInfo.h" -#include "N64System/Recompiler/FunctionMapClass.h" -#include "N64System/Recompiler/RecompilerClass.h" -#include "N64System/Recompiler/x86CodeLog.h" +#include +#include +#include +#include +#include //needs to inherit Recompiler ops +#include +#include +#include +#include +#include +#include +#include +#include +#include //cheats -#include "N64System/CheatClass.h" +#include //Debugger #include "N64System/Debugger/Debugger.h" //Main Files -#include "N64System/N64Class.h" -#include "N64System/SystemGlobals.h" +#include +#include diff --git a/Source/Project64/Plugins/PluginList.cpp b/Source/Project64/Plugins/PluginList.cpp index 044392688..3e032aaeb 100644 --- a/Source/Project64/Plugins/PluginList.cpp +++ b/Source/Project64/Plugins/PluginList.cpp @@ -11,7 +11,7 @@ #include "stdafx.h" #include #include "PluginList.h" -#include +#include CPluginList::CPluginList(bool bAutoFill /* = true */) : m_PluginDir(g_Settings->LoadStringVal(Directory_Plugin), "") diff --git a/Source/Project64/Plugins/PluginList.h b/Source/Project64/Plugins/PluginList.h index 04a566351..2a58014ac 100644 --- a/Source/Project64/Plugins/PluginList.h +++ b/Source/Project64/Plugins/PluginList.h @@ -10,7 +10,7 @@ ****************************************************************************/ #pragma once -#include +#include class CPluginList { diff --git a/Source/Project64/Project64.vcproj b/Source/Project64/Project64.vcproj index 156a4fd53..18d34429e 100644 --- a/Source/Project64/Project64.vcproj +++ b/Source/Project64/Project64.vcproj @@ -145,14 +145,6 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > - - - - @@ -180,118 +172,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -424,10 +308,6 @@ - - @@ -436,230 +316,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -739,10 +391,6 @@ RelativePath=".\UserInterface.h" > - - @@ -750,130 +398,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -998,10 +526,6 @@ - - @@ -1010,270 +534,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - @@ -157,16 +82,8 @@ - - - - - - - - @@ -174,117 +91,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -300,6 +136,9 @@ {b4a4b994-9111-42b1-93c2-6f1ca8bc4421} false + + {00c7b43a-ded7-4df0-b072-9a5783ef866d} + diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters index 0a2c4cd48..36894b0f4 100644 --- a/Source/Project64/Project64.vcxproj.filters +++ b/Source/Project64/Project64.vcxproj.filters @@ -8,9 +8,6 @@ {60e2fd87-7b6b-4147-82fe-e12516efe43c} - - {305f064d-be0e-418e-a93e-7de72242550e} - {7b81a6a8-b20b-464e-8184-864886bb00fd} @@ -26,27 +23,9 @@ {94e87bf5-3b11-4f61-8a4a-333690ecf588} - - {4d3c9ef9-7903-4112-8356-1e7ab2112c20} - - - {2b25c9d1-e1ec-46b6-988a-034edc1fc184} - - - {28ecfeb8-9360-4619-ae95-6f67d66f848d} - - - {9a830b90-21d4-429d-b211-26ab691d6474} - - - {b5142b69-6b3b-4221-a3cb-2c6c0a35e1d7} - {242ae4a5-b150-44e6-b31c-027acd6d38b0} - - {0b08dc3f-d3a6-453b-98ab-169c510f34a5} - {1e3eb4f7-a0b1-4d09-9e50-b5c699f24050} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe @@ -55,12 +34,6 @@ {bc88015e-37f7-4320-8aa4-d5043d17a386} h;hpp;hxx;hm;inl - - {80441979-1696-4aca-8652-199a9db22d06} - - - {024d5b64-27a9-466b-9388-5c08c5eb5a47} - {54e8f51f-d81d-4f8f-b4f1-76584c1b29a5} @@ -76,125 +49,14 @@ {6cfab019-2f8d-4e09-be41-1df513b5a680} - - {34662870-e7f3-4ab8-8788-a659bf32f764} - - - {4db18f2d-3c89-4a86-adf7-46731ca35087} - {c4249d55-df70-4453-b017-b548514ad094} - - {a3157468-d5a6-4167-b28f-9de5719ec1e9} - - - {d87d7401-c716-40f7-a51b-2d9803936b23} - - - {93ec15cf-1fb2-4095-ae07-95128a67d3df} - - - {21f6da31-289d-4d03-80bb-b77fe60355d7} - - - Source Files - Source Files - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files\Settings Files\Setting Types Files - - - Source Files - - - Source Files\User Interface Source - - - Source Files\User Interface Source - - - Source Files\User Interface Source - - - Source Files\User Interface Source - - - Source Files\User Interface Source - - - Source Files\User Interface Source - - - Source Files\User Interface Source - - - Source Files\User Interface Source - - - Source Files\User Interface Source - - - Source Files\User Interface Source - Source Files\User Interface Source\WTL Controls Source @@ -234,6 +96,39 @@ Source Files\User Interface Source\Settings Source + + Source Files\Plugin Source + + + Source Files + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + + + Source Files\User Interface Source + Source Files\User Interface Source\Debugger Source @@ -249,440 +144,29 @@ Source Files\User Interface Source\Debugger Source - - Source Files\Settings Files - - - Source Files\Settings Files - Source Files\Settings Files - - Source Files\Settings Files - - - Source Files\Settings Files - Source Files\Settings Files - - Source Files\Settings Files - - - Source Files\Settings Files - - - Source Files\Plugin Source - - - Source Files\Plugin Source - - - Source Files\Plugin Source - - - Source Files\Plugin Source - - - Source Files\Plugin Source - - - Source Files\Plugin Source - - - Source Files\Plugin Source - - - Source Files\N64 System Source - - - Source Files\N64 System Source - - - Source Files\N64 System Source - - - Source Files\N64 System Source - - - Source Files\N64 System Source - - Source Files\N64 System Source - - - Source Files\N64 System Source - - - Source Files\N64 System Source - - - Source Files\N64 System Source\C Core Source - - - Source Files\N64 System Source\Interpreter Files - - - Source Files\N64 System Source\Interpreter Files - - - Source Files\N64 System Source\Interpreter Files - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Mips Source - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\N64 System Source\Recompiler Files - - - Source Files\Multilanguage Source + Source Files\User Interface Source Source Files\Multilanguage Source - - Source Files\3rd Party Source - - - Source Files - - - Header Files - - - Header Files\Settings Headers - - - Header Files\Settings Headers - - - Header Files\Settings Headers - - - Header Files\Settings Headers - - - Header Files\Settings Headers - - - Header Files\Settings Headers - - - Header Files\Settings Headers - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\Settings Headers\Setting Types Header - - - Header Files\User Interface Headers - - - Header Files\User Interface Headers - - - Header Files\User Interface Headers - - - Header Files\User Interface Headers - - - Header Files\User Interface Headers - - - Header Files\User Interface Headers - - - Header Files\User Interface Headers - - - Header Files\User Interface Headers - - - Header Files\User Interface Headers\Settings Header - - - Header Files\User Interface Headers\Settings Header - - - Header Files\User Interface Headers\Settings Header - - - Header Files\User Interface Headers\Settings Header - - - Header Files\User Interface Headers\Settings Header - - - Header Files\User Interface Headers\Settings Header - - - Header Files\User Interface Headers\Settings Header - - - Header Files\User Interface Headers\Settings Header - - - Header Files\User Interface Headers\Settings Header - - - Header Files\User Interface Headers\Settings Header - - - Header Files\User Interface Headers\Settings Header - - - Header Files\User Interface Headers\WTL Controls Headers - - - Header Files\User Interface Headers\WTL Controls Headers - - - Header Files\User Interface Headers\WTL Controls Headers - - - Header Files\User Interface Headers\WTL Controls Headers - - - Header Files\User Interface Headers\WTL Controls Headers - - - Header Files\Plugin Headers - - - Header Files\Plugin Headers - - - Header Files\Plugin Headers - - - Header Files\Plugin Headers - - - Header Files\Plugin Headers - - - Header Files\Plugin Headers - - - Header Files\Plugin Headers - - - Header Files\User Interface Headers - - - Header Files\Settings Headers - - - Header Files\User Interface Headers - - - Header Files\Settings Headers - Resource Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\3rd Party Headers - - - Header Files\3rd Party Headers - - - Header Files\Multilanguage Headers - Header Files\Multilanguage Headers - - Header Files\N64 System Headers - - - Header Files\N64 System Headers - - - Header Files\N64 System Headers - - - Header Files\N64 System Headers - - - Header Files\N64 System Headers - Header Files\N64 System Headers - - Header Files\N64 System Headers - - - Header Files\N64 System Headers - - - Header Files\N64 System Headers - - - Header Files\N64 System Headers\C Core Headers - Header Files\N64 System Headers\Debugger Headers @@ -704,110 +188,95 @@ Header Files\N64 System Headers\Debugger Headers - - Header Files\N64 System Headers\Debugger Headers + + Header Files\User Interface Headers - - Header Files\N64 System Headers\Interpreter Headers + + Header Files\User Interface Headers - - Header Files\N64 System Headers\Interpreter Headers + + Header Files\User Interface Headers - - Header Files\N64 System Headers\Interpreter Headers + + Header Files\User Interface Headers - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\WTL Controls Headers - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\WTL Controls Headers - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\WTL Controls Headers - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\WTL Controls Headers - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\WTL Controls Headers - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\Settings Header - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\Settings Header - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\Settings Header - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\Settings Header - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\Settings Header - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\Settings Header - - Header Files\N64 System Headers\Mips Headers + + Header Files\User Interface Headers\Settings Header - - Header Files\N64 System Headers\Recompiler Headers + + Header Files\User Interface Headers\Settings Header - - Header Files\N64 System Headers\Recompiler Headers + + Header Files\User Interface Headers\Settings Header - - Header Files\N64 System Headers\Recompiler Headers + + Header Files\User Interface Headers\Settings Header - - Header Files\N64 System Headers\Recompiler Headers + + Header Files\User Interface Headers\Settings Header - - Header Files\N64 System Headers\Recompiler Headers + + Header Files - - Header Files\N64 System Headers\Recompiler Headers + + Header Files - - Header Files\N64 System Headers\Recompiler Headers + + Header Files - - Header Files\N64 System Headers\Recompiler Headers + + Header Files - - Header Files\N64 System Headers\Recompiler Headers - - - Header Files\N64 System Headers\Recompiler Headers - - - Header Files\N64 System Headers\Recompiler Headers - - - Header Files\N64 System Headers\Recompiler Headers - - - Header Files\N64 System Headers\Recompiler Headers - - - Header Files\N64 System Headers\Recompiler Headers + + Header Files diff --git a/Source/Project64/UserInterface.h b/Source/Project64/UserInterface.h index 6504e988d..e50f4e398 100644 --- a/Source/Project64/UserInterface.h +++ b/Source/Project64/UserInterface.h @@ -13,8 +13,8 @@ #pragma warning(disable:4786) #include "Support.h" -#include -#include +#include +#include typedef unsigned char BYTE; typedef unsigned short WORD; @@ -57,7 +57,7 @@ class CN64System; #include "UserInterface/MenuClass.h" #include "UserInterface/MainMenuClass.h" #include "UserInterface/NotificationClass.h" -#include "UserInterface/FramePerSecondClass.h" +#include #include "UserInterface/resource.h" #include "UserInterface/SettingsConfig.h" #include "UserInterface/CheatClassUI.h" diff --git a/Source/Project64/UserInterface/CheatClassUI.cpp b/Source/Project64/UserInterface/CheatClassUI.cpp index 64869d3ee..2ce2b9585 100644 --- a/Source/Project64/UserInterface/CheatClassUI.cpp +++ b/Source/Project64/UserInterface/CheatClassUI.cpp @@ -9,8 +9,8 @@ * * ****************************************************************************/ #include "stdafx.h" -#include -#include +#include +#include extern CCheatsUI * g_cheatUI = NULL; diff --git a/Source/Project64/UserInterface/GuiClass.cpp b/Source/Project64/UserInterface/GuiClass.cpp index 2d5beab52..addbfb161 100644 --- a/Source/Project64/UserInterface/GuiClass.cpp +++ b/Source/Project64/UserInterface/GuiClass.cpp @@ -11,7 +11,7 @@ #include "stdafx.h" #include -#include "Settings/SettingType/SettingsType-Application.h" +#include void EnterLogOptions(HWND hwndOwner); diff --git a/Source/Project64/UserInterface/GuiClass.h b/Source/Project64/UserInterface/GuiClass.h index 8afb15735..2172c5522 100644 --- a/Source/Project64/UserInterface/GuiClass.h +++ b/Source/Project64/UserInterface/GuiClass.h @@ -11,8 +11,8 @@ #pragma once #include "../Settings/GuiSettings.h" -#include -#include +#include +#include class CGfxPlugin; //Plugin that controls the rendering class CAudioPlugin; //Plugin for audio, need the hwnd diff --git a/Source/Project64/UserInterface/LoggingUI.cpp b/Source/Project64/UserInterface/LoggingUI.cpp index 7278c3114..fc2f25151 100644 --- a/Source/Project64/UserInterface/LoggingUI.cpp +++ b/Source/Project64/UserInterface/LoggingUI.cpp @@ -9,8 +9,8 @@ * * ****************************************************************************/ #include "stdafx.h" -#include -#include +#include +#include #include LRESULT CALLBACK LogGeneralProc(HWND, UINT, WPARAM, LPARAM); diff --git a/Source/Project64/UserInterface/NotificationClass.cpp b/Source/Project64/UserInterface/NotificationClass.cpp index b018433d7..833e682e7 100644 --- a/Source/Project64/UserInterface/NotificationClass.cpp +++ b/Source/Project64/UserInterface/NotificationClass.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include -CNotification & Notify(void) +CNotificationImp & Notify(void) { - static CNotification g_Notify; + static CNotificationImp g_Notify; return g_Notify; } -CNotification::CNotification() : +CNotificationImp::CNotificationImp() : m_hWnd(NULL), m_gfxPlugin(NULL), m_NextMsg(0) @@ -15,17 +15,17 @@ m_NextMsg(0) _tzset(); } -void CNotification::AppInitDone(void) +void CNotificationImp::AppInitDone(void) { CNotificationSettings::RegisterNotifications(); } -void CNotification::SetMainWindow(CMainGui * Gui) +void CNotificationImp::SetMainWindow(CMainGui * Gui) { m_hWnd = Gui; } -void CNotification::WindowMode(void) const +void CNotificationImp::WindowMode(void) const { static bool InsideFunc = false; if (InsideFunc) @@ -48,12 +48,12 @@ void CNotification::WindowMode(void) const InsideFunc = false; } -void CNotification::DisplayError(LanguageStringID StringID) const +void CNotificationImp::DisplayError(LanguageStringID StringID) const { DisplayError(g_Lang->GetString(StringID).c_str()); } -void CNotification::DisplayError(const wchar_t * Message) const +void CNotificationImp::DisplayError(const wchar_t * Message) const { if (this == NULL) { return; } @@ -70,12 +70,12 @@ void CNotification::DisplayError(const wchar_t * Message) const MessageBoxW(Parent, Message, GS(MSG_MSGBOX_TITLE), MB_OK | MB_ICONERROR | MB_SETFOREGROUND); } -void CNotification::DisplayMessage(int DisplayTime, LanguageStringID StringID) const +void CNotificationImp::DisplayMessage(int DisplayTime, LanguageStringID StringID) const { DisplayMessage(DisplayTime, g_Lang->GetString(StringID).c_str()); } -void CNotification::DisplayMessage(int DisplayTime, const wchar_t * Message) const +void CNotificationImp::DisplayMessage(int DisplayTime, const wchar_t * Message) const { if (!m_hWnd) { return; } @@ -113,24 +113,40 @@ void CNotification::DisplayMessage(int DisplayTime, const wchar_t * Message) con } } -void CNotification::DisplayMessage2(const wchar_t * Message) const +void CNotificationImp::DisplayMessage2(const wchar_t * Message) const { if (!m_hWnd) { return; } m_hWnd->SetStatusText(1, Message); } -void CNotification::SetGfxPlugin(CGfxPlugin * Plugin) +bool CNotificationImp::AskYesNoQuestion(const wchar_t * Question) const +{ + if (this == NULL) { return false; } + + WriteTrace(TraceError, stdstr().FromUTF16(Question).c_str()); + WindowMode(); + + HWND Parent = NULL; + if (m_hWnd) + { + Parent = reinterpret_cast(m_hWnd->GetWindowHandle()); + } + int result = MessageBoxW(Parent, Question, GS(MSG_MSGBOX_TITLE), MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2 | MB_SETFOREGROUND); + return result == IDYES; +} + +void CNotificationImp::SetGfxPlugin(CGfxPlugin * Plugin) { m_gfxPlugin = Plugin; } -void CNotification::FatalError(LanguageStringID StringID) const +void CNotificationImp::FatalError(LanguageStringID StringID) const { FatalError(g_Lang->GetString(StringID).c_str()); } -void CNotification::FatalError(const wchar_t * Message) const +void CNotificationImp::FatalError(const wchar_t * Message) const { WindowMode(); @@ -140,7 +156,7 @@ void CNotification::FatalError(const wchar_t * Message) const ExitThread(0); } -void CNotification::AddRecentDir(const char * RomDir) +void CNotificationImp::AddRecentDir(const char * RomDir) { //Validate the passed string if (HIWORD(RomDir) == NULL) { return; } @@ -182,7 +198,7 @@ void CNotification::AddRecentDir(const char * RomDir) } } -void CNotification::RefreshMenu(void) +void CNotificationImp::RefreshMenu(void) { if (m_hWnd == NULL) { return; } @@ -193,13 +209,13 @@ void CNotification::RefreshMenu(void) #endif } -void CNotification::HideRomBrowser(void) +void CNotificationImp::HideRomBrowser(void) { if (m_hWnd == NULL) { return; } m_hWnd->HideRomList(); } -void CNotification::ShowRomBrowser(void) +void CNotificationImp::ShowRomBrowser(void) { if (m_hWnd == NULL) { return; } if (g_Settings->LoadDword(RomBrowser_Enabled)) @@ -210,7 +226,7 @@ void CNotification::ShowRomBrowser(void) } } -void CNotification::BringToTop(void) +void CNotificationImp::BringToTop(void) { if (m_hWnd == NULL) { return; } @@ -221,20 +237,20 @@ void CNotification::BringToTop(void) #endif } -void CNotification::ChangeFullScreen(void) const +void CNotificationImp::ChangeFullScreen(void) const { if (m_hWnd == NULL) { return; } SendMessage((HWND)(m_hWnd->GetWindowHandle()), WM_COMMAND, MAKELPARAM(ID_OPTIONS_FULLSCREEN2, false), 0); } -bool CNotification::ProcessGuiMessages(void) const +bool CNotificationImp::ProcessGuiMessages(void) const { if (m_hWnd == NULL) { return false; } return m_hWnd->ProcessGuiMessages(); } -void CNotification::BreakPoint(const wchar_t * FileName, const int LineNumber) +void CNotificationImp::BreakPoint(const wchar_t * FileName, int LineNumber) { if (g_Settings->LoadBool(Debugger_Enabled)) { diff --git a/Source/Project64/UserInterface/NotificationClass.h b/Source/Project64/UserInterface/NotificationClass.h index c187fba40..7efe7dc10 100644 --- a/Source/Project64/UserInterface/NotificationClass.h +++ b/Source/Project64/UserInterface/NotificationClass.h @@ -11,14 +11,16 @@ #pragma once #include "../Settings/NotificationSettings.h" +#include class CSettings; -class CNotification : +class CNotificationImp : + public CNotification, CNotificationSettings { public: - CNotification(void); + CNotificationImp(void); void AppInitDone(void); @@ -37,7 +39,11 @@ public: virtual void DisplayMessage(int DisplayTime, LanguageStringID StringID) const; virtual void DisplayMessage2(const wchar_t * Message) const; - virtual void BreakPoint(const wchar_t * FileName, const int LineNumber); + + // Ask a Yes/No Question to the user, yes = true, no = false + virtual bool AskYesNoQuestion(const wchar_t * Question) const; + + virtual void BreakPoint(const wchar_t * FileName, int LineNumber); void SetWindowCaption(const wchar_t * Caption); @@ -55,8 +61,8 @@ public: void SetGfxPlugin(CGfxPlugin * Plugin); private: - CNotification(const CNotification&); // Disable copy constructor - CNotification& operator=(const CNotification&); // Disable assignment + CNotificationImp(const CNotificationImp&); // Disable copy constructor + CNotificationImp& operator=(const CNotificationImp&); // Disable assignment CMainGui * m_hWnd; CGfxPlugin * m_gfxPlugin; @@ -64,4 +70,4 @@ private: mutable time_t m_NextMsg; }; -CNotification & Notify(void); +CNotificationImp & Notify(void); diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.h b/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.h index dbee5f95f..a43137994 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.h +++ b/Source/Project64/UserInterface/Settings/SettingsPage-Game-General.h @@ -11,7 +11,7 @@ #pragma once #include "../WTLControls/ModifiedCheckBox.h" -#include +#include class CGameGeneralPage : public CSettingsPageImpl, diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h index 771bb5d15..ba1c42622 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h +++ b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h @@ -10,7 +10,8 @@ ****************************************************************************/ #pragma once -#include +#include +#include class CGamePluginPage : public CSettingsPageImpl, diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Plugin.h b/Source/Project64/UserInterface/Settings/SettingsPage-Plugin.h index 5714ae5f6..cc4a211f5 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-Plugin.h +++ b/Source/Project64/UserInterface/Settings/SettingsPage-Plugin.h @@ -10,7 +10,7 @@ ****************************************************************************/ #pragma once -#include +#include class COptionPluginPage : public CSettingsPageImpl, diff --git a/Source/Project64/UserInterface/SettingsConfig.cpp b/Source/Project64/UserInterface/SettingsConfig.cpp index f06634d43..8f2ce3e75 100644 --- a/Source/Project64/UserInterface/SettingsConfig.cpp +++ b/Source/Project64/UserInterface/SettingsConfig.cpp @@ -3,7 +3,7 @@ #ifdef WINDOWS_UI #include "SettingsConfig.h" #include "Settings/SettingsPage.h" -#include "Settings/SettingType/SettingsType-Application.h" +#include CSettingConfig::CSettingConfig(bool bJustGameSetting /* = false */) : m_CurrentPage(NULL), diff --git a/Source/Project64/UserInterface/UIResources.rc b/Source/Project64/UserInterface/UIResources.rc index ec9d23e1a..02f492fd2 100644 --- a/Source/Project64/UserInterface/UIResources.rc +++ b/Source/Project64/UserInterface/UIResources.rc @@ -2,7 +2,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "../Version.h" +#include "../../Project64-core/Version.h" #define APSTUDIO_READONLY_SYMBOLS diff --git a/Source/Project64/main.cpp b/Source/Project64/main.cpp index c6ac7ec51..e8437bc3b 100644 --- a/Source/Project64/main.cpp +++ b/Source/Project64/main.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include +#include #include "Multilanguage\LanguageSelector.h" int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /*lpszArgs*/, int /*nWinMode*/) diff --git a/Source/Project64/stdafx.h b/Source/Project64/stdafx.h index f4ceb0f2f..65e762d72 100644 --- a/Source/Project64/stdafx.h +++ b/Source/Project64/stdafx.h @@ -20,15 +20,15 @@ #include #include #include -#include "Multilanguage.h" +#include #include "UserInterface.h" #include "N64System.h" -#include "Plugin.h" +#include #include "Support.h" -#include "Version.h" +#include #include #include #include -#include "3rdParty/Zip.h" -#include "3rdParty/7zip.h" +#include +#include diff --git a/Source/RSP/Interpreter Ops.c b/Source/RSP/Interpreter Ops.c index 135569b39..4a05406ac 100644 --- a/Source/RSP/Interpreter Ops.c +++ b/Source/RSP/Interpreter Ops.c @@ -46,12 +46,12 @@ * * It also is possible to emulate the RSP divide op-codes using a hardware- * accurate LUT instead of any floating-point functions, so that works, too. - */ -#ifndef _MCW_RC -#define _MCW_RC 0x00000300 -#endif -#ifndef _RC_CHOP -#define _RC_CHOP 0x00000300 + */ +#ifndef _MCW_RC +#define _MCW_RC 0x00000300 +#endif +#ifndef _RC_CHOP +#define _RC_CHOP 0x00000300 #endif extern UWORD32 Recp, RecpResult, SQroot, SQrootResult;