The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 07:21:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4543 from lioncash/cycles

Browse Source 
Common: Move BreakPoints into Core
This commit is contained in:
Matthew Parlane 2017-01-10 23:37:49 +13:00 committed by GitHub
commit a807db1751
14 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/CMakeLists.txt
View File

@ -1,5 +1,4 @@
set(SRCS Analytics.cpp set(SRCS Analytics.cpp
BreakPoints.cpp
CDUtils.cpp CDUtils.cpp
ColorUtil.cpp ColorUtil.cpp
ENetUtil.cpp ENetUtil.cpp

2
Source/Core/Common/Common.vcxproj
View File

@ -44,7 +44,6 @@
<ClInclude Include="BitField.h" /> <ClInclude Include="BitField.h" />
<ClInclude Include="BitSet.h" /> <ClInclude Include="BitSet.h" />
<ClInclude Include="BlockingLoop.h" /> <ClInclude Include="BlockingLoop.h" />
<ClInclude Include="BreakPoints.h" />
<ClInclude Include="CDUtils.h" /> <ClInclude Include="CDUtils.h" />
<ClInclude Include="ChunkFile.h" /> <ClInclude Include="ChunkFile.h" />
<ClInclude Include="CodeBlock.h" /> <ClInclude Include="CodeBlock.h" />
@ -146,7 +145,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Analytics.cpp" /> <ClCompile Include="Analytics.cpp" />
<ClCompile Include="BreakPoints.cpp" />
<ClCompile Include="CDUtils.cpp" /> <ClCompile Include="CDUtils.cpp" />
<ClCompile Include="ColorUtil.cpp" /> <ClCompile Include="ColorUtil.cpp" />
<ClCompile Include="ENetUtil.cpp" /> <ClCompile Include="ENetUtil.cpp" />

2
Source/Core/Common/Common.vcxproj.filters
View File

@ -25,7 +25,6 @@
<ClInclude Include="BitField.h" /> <ClInclude Include="BitField.h" />
<ClInclude Include="BitSet.h" /> <ClInclude Include="BitSet.h" />
<ClInclude Include="BlockingLoop.h" /> <ClInclude Include="BlockingLoop.h" />
<ClInclude Include="BreakPoints.h" />
<ClInclude Include="CDUtils.h" /> <ClInclude Include="CDUtils.h" />
<ClInclude Include="ChunkFile.h" /> <ClInclude Include="ChunkFile.h" />
<ClInclude Include="CodeBlock.h" /> <ClInclude Include="CodeBlock.h" />
@ -229,7 +228,6 @@
<ClInclude Include="Semaphore.h" /> <ClInclude Include="Semaphore.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="BreakPoints.cpp" />
<ClCompile Include="CDUtils.cpp" /> <ClCompile Include="CDUtils.cpp" />
<ClCompile Include="ColorUtil.cpp" /> <ClCompile Include="ColorUtil.cpp" />
<ClCompile Include="ENetUtil.cpp" /> <ClCompile Include="ENetUtil.cpp" />

1
Source/Core/Core/CMakeLists.txt
View File

@ -156,6 +156,7 @@ set(SRCS ActionReplay.cpp
IPC_HLE/WII_IPC_HLE_WiiMote.cpp IPC_HLE/WII_IPC_HLE_WiiMote.cpp
IPC_HLE/WiiMote_HID_Attr.cpp IPC_HLE/WiiMote_HID_Attr.cpp
IPC_HLE/WiiNetConfig.cpp IPC_HLE/WiiNetConfig.cpp
PowerPC/BreakPoints.cpp
PowerPC/MMU.cpp PowerPC/MMU.cpp
PowerPC/PowerPC.cpp PowerPC/PowerPC.cpp
PowerPC/PPCAnalyst.cpp PowerPC/PPCAnalyst.cpp

2
Source/Core/Core/Core.vcxproj
View File

@ -204,6 +204,7 @@
<ClCompile Include="NetPlayClient.cpp" /> <ClCompile Include="NetPlayClient.cpp" />
<ClCompile Include="NetPlayServer.cpp" /> <ClCompile Include="NetPlayServer.cpp" />
<ClCompile Include="PatchEngine.cpp" /> <ClCompile Include="PatchEngine.cpp" />
<ClCompile Include="PowerPC\BreakPoints.cpp" />
<ClCompile Include="PowerPC\CachedInterpreter\CachedInterpreter.cpp" /> <ClCompile Include="PowerPC\CachedInterpreter\CachedInterpreter.cpp" />
<ClCompile Include="PowerPC\CachedInterpreter\InterpreterBlockCache.cpp" /> <ClCompile Include="PowerPC\CachedInterpreter\InterpreterBlockCache.cpp" />
<ClCompile Include="PowerPC\Interpreter\Interpreter.cpp" /> <ClCompile Include="PowerPC\Interpreter\Interpreter.cpp" />
@ -423,6 +424,7 @@
<ClInclude Include="NetPlayProto.h" /> <ClInclude Include="NetPlayProto.h" />
<ClInclude Include="NetPlayServer.h" /> <ClInclude Include="NetPlayServer.h" />
<ClInclude Include="PatchEngine.h" /> <ClInclude Include="PatchEngine.h" />
<ClInclude Include="PowerPC\BreakPoints.h" />
<ClInclude Include="PowerPC\CPUCoreBase.h" /> <ClInclude Include="PowerPC\CPUCoreBase.h" />
<ClInclude Include="PowerPC\Gekko.h" /> <ClInclude Include="PowerPC\Gekko.h" />
<ClInclude Include="PowerPC\CachedInterpreter\CachedInterpreter.h" /> <ClInclude Include="PowerPC\CachedInterpreter\CachedInterpreter.h" />

6
Source/Core/Core/Core.vcxproj.filters
View File

@ -276,6 +276,9 @@
<ClCompile Include="HLE\HLE_OS.cpp"> <ClCompile Include="HLE\HLE_OS.cpp">
<Filter>HLE</Filter> <Filter>HLE</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="PowerPC\BreakPoints.cpp">
<Filter>PowerPC</Filter>
</ClCompile>
<ClCompile Include="PowerPC\CachedInterpreter\CachedInterpreter.cpp"> <ClCompile Include="PowerPC\CachedInterpreter\CachedInterpreter.cpp">
<Filter>PowerPC\Cached Interpreter</Filter> <Filter>PowerPC\Cached Interpreter</Filter>
</ClCompile> </ClCompile>
@ -1235,6 +1238,9 @@
<ClInclude Include="HW\Wiimote.h"> <ClInclude Include="HW\Wiimote.h">
<Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter> <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="PowerPC\BreakPoints.h">
<Filter>PowerPC</Filter>
</ClInclude>
<ClInclude Include="PowerPC\CPUCoreBase.h"> <ClInclude Include="PowerPC\CPUCoreBase.h">
<Filter>PowerPC</Filter> <Filter>PowerPC</Filter>
</ClInclude> </ClInclude>

3
Source/Core/Common/BreakPoints.cpp → Source/Core/Core/PowerPC/BreakPoints.cpp
View File

@ -2,11 +2,12 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/PowerPC/BreakPoints.h"
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <vector> #include <vector>
#include "Common/BreakPoints.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/DebugInterface.h" #include "Common/DebugInterface.h"
#include "Core/PowerPC/JitCommon/JitBase.h" #include "Core/PowerPC/JitCommon/JitBase.h"

0
Source/Core/Common/BreakPoints.h → Source/Core/Core/PowerPC/BreakPoints.h
View File

2
Source/Core/Core/PowerPC/PowerPC.h
View File

@ -8,10 +8,10 @@
#include <cstddef> #include <cstddef>
#include <tuple> #include <tuple>
#include "Common/BreakPoints.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/Debugger/PPCDebugInterface.h" #include "Core/Debugger/PPCDebugInterface.h"
#include "Core/PowerPC/BreakPoints.h"
#include "Core/PowerPC/Gekko.h" #include "Core/PowerPC/Gekko.h"
#include "Core/PowerPC/PPCCache.h" #include "Core/PowerPC/PPCCache.h"

5
Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp
View File

@ -2,17 +2,18 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "DolphinWX/Debugger/BreakpointDlg.h"
#include <string> #include <string>
#include <wx/dialog.h> #include <wx/dialog.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include "Common/BreakPoints.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/PowerPC/BreakPoints.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "DolphinWX/Debugger/BreakpointDlg.h"
#include "DolphinWX/Debugger/BreakpointWindow.h" #include "DolphinWX/Debugger/BreakpointWindow.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"

5
Source/Core/DolphinWX/Debugger/BreakpointView.cpp
View File

@ -2,17 +2,18 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "DolphinWX/Debugger/BreakpointView.h"
#include <cstddef> #include <cstddef>
#include <cstdio> #include <cstdio>
#include <wx/listctrl.h> #include <wx/listctrl.h>
#include "Common/BreakPoints.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/PowerPC/BreakPoints.h"
#include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "DolphinWX/Debugger/BreakpointView.h"
#include "DolphinWX/Debugger/DebuggerUIUtil.h" #include "DolphinWX/Debugger/DebuggerUIUtil.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"

5
Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "DolphinWX/Debugger/BreakpointWindow.h"
#include <array> #include <array>
// clang-format off // clang-format off
@ -12,16 +14,15 @@
#include <wx/panel.h> #include <wx/panel.h>
// clang-format on // clang-format on
#include "Common/BreakPoints.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/IniFile.h" #include "Common/IniFile.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/PowerPC/BreakPoints.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "DolphinWX/Debugger/BreakpointDlg.h" #include "DolphinWX/Debugger/BreakpointDlg.h"
#include "DolphinWX/Debugger/BreakpointView.h" #include "DolphinWX/Debugger/BreakpointView.h"
#include "DolphinWX/Debugger/BreakpointWindow.h"
#include "DolphinWX/Debugger/CodeWindow.h" #include "DolphinWX/Debugger/CodeWindow.h"
#include "DolphinWX/Debugger/MemoryCheckDlg.h" #include "DolphinWX/Debugger/MemoryCheckDlg.h"
#include "DolphinWX/AuiToolBar.h" #include "DolphinWX/AuiToolBar.h"

5
Source/Core/DolphinWX/Debugger/CodeWindow.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "DolphinWX/Debugger/CodeWindow.h"
#include <array> #include <array>
#include <chrono> #include <chrono>
#include <cstdio> #include <cstdio>
@ -23,7 +25,6 @@
#include <wx/aui/dockart.h> #include <wx/aui/dockart.h>
// clang-format on // clang-format on
#include "Common/BreakPoints.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/SymbolDB.h" #include "Common/SymbolDB.h"
@ -34,6 +35,7 @@
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"
#include "Core/Host.h" #include "Core/Host.h"
#include "Core/PowerPC/BreakPoints.h"
#include "Core/PowerPC/Gekko.h" #include "Core/PowerPC/Gekko.h"
#include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/JitInterface.h"
#include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PPCSymbolDB.h"
@ -41,7 +43,6 @@
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "DolphinWX/Debugger/BreakpointWindow.h" #include "DolphinWX/Debugger/BreakpointWindow.h"
#include "DolphinWX/Debugger/CodeView.h" #include "DolphinWX/Debugger/CodeView.h"
#include "DolphinWX/Debugger/CodeWindow.h"
#include "DolphinWX/Debugger/DebuggerUIUtil.h" #include "DolphinWX/Debugger/DebuggerUIUtil.h"
#include "DolphinWX/Debugger/JitWindow.h" #include "DolphinWX/Debugger/JitWindow.h"
#include "DolphinWX/Debugger/MemoryWindow.h" #include "DolphinWX/Debugger/MemoryWindow.h"

5
Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp
View File

@ -2,18 +2,19 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "DolphinWX/Debugger/MemoryCheckDlg.h"
#include <string> #include <string>
#include <wx/radiobut.h> #include <wx/radiobut.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include "Common/BreakPoints.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/PowerPC/BreakPoints.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "DolphinWX/Debugger/BreakpointWindow.h" #include "DolphinWX/Debugger/BreakpointWindow.h"
#include "DolphinWX/Debugger/MemoryCheckDlg.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
MemoryCheckDlg::MemoryCheckDlg(wxWindow* parent) MemoryCheckDlg::MemoryCheckDlg(wxWindow* parent)