From 41df38cb7c6418cca73906140b76d37573f2ab93 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 12 Jun 2023 10:27:37 -0400 Subject: [PATCH] Common: Move DebugInterface.h into Core The base DebugInterface now depends on the Core's CPUThreadGuard, and utilities in Common shouldn't be depending on Core facilities. So, we can move this into the core library instead. --- Source/Core/Common/CMakeLists.txt | 1 - Source/Core/Core/CMakeLists.txt | 1 + .../Debugger}/DebugInterface.h | 56 +++++++++---------- Source/Core/Core/Debugger/PPCDebugInterface.h | 4 +- Source/Core/Core/PowerPC/BreakPoints.cpp | 4 +- Source/Core/Core/PowerPC/BreakPoints.h | 4 +- Source/Core/Core/PowerPC/PPCSymbolDB.cpp | 1 + Source/Core/Core/PowerPC/PPCSymbolDB.h | 9 +-- Source/Core/DolphinLib.props | 2 +- 9 files changed, 37 insertions(+), 45 deletions(-) rename Source/Core/{Common => Core/Debugger}/DebugInterface.h (55%) diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index dfee159a7c..d3a756e6e2 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -36,7 +36,6 @@ add_library(common Debug/Threads.h Debug/Watches.cpp Debug/Watches.h - DebugInterface.h DynamicLibrary.cpp DynamicLibrary.h ENet.cpp diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index a8345f91fc..f6fb444118 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -61,6 +61,7 @@ add_library(core CoreTiming.h Debugger/CodeTrace.cpp Debugger/CodeTrace.h + Debugger/DebugInterface.h Debugger/Debugger_SymbolMap.cpp Debugger/Debugger_SymbolMap.h Debugger/Dump.cpp diff --git a/Source/Core/Common/DebugInterface.h b/Source/Core/Core/Debugger/DebugInterface.h similarity index 55% rename from Source/Core/Common/DebugInterface.h rename to Source/Core/Core/Debugger/DebugInterface.h index da6c2dba82..1e2814e822 100644 --- a/Source/Core/Common/DebugInterface.h +++ b/Source/Core/Core/Debugger/DebugInterface.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include #include @@ -19,10 +20,7 @@ struct Watch; namespace Core { class CPUThreadGuard; -} // namespace Core -namespace Common -{ class DebugInterface { protected: @@ -31,8 +29,8 @@ protected: public: // Watches virtual std::size_t SetWatch(u32 address, std::string name = "") = 0; - virtual const Debug::Watch& GetWatch(std::size_t index) const = 0; - virtual const std::vector& GetWatches() const = 0; + virtual const Common::Debug::Watch& GetWatch(std::size_t index) const = 0; + virtual const std::vector& GetWatches() const = 0; virtual void UnsetWatch(u32 address) = 0; virtual void UpdateWatch(std::size_t index, u32 address, std::string name) = 0; virtual void UpdateWatchAddress(std::size_t index, u32 address) = 0; @@ -47,28 +45,27 @@ public: virtual void ClearWatches() = 0; // Memory Patches - virtual void SetPatch(const Core::CPUThreadGuard& guard, u32 address, u32 value) = 0; - virtual void SetPatch(const Core::CPUThreadGuard& guard, u32 address, std::vector value) = 0; - virtual void SetFramePatch(const Core::CPUThreadGuard& guard, u32 address, u32 value) = 0; - virtual void SetFramePatch(const Core::CPUThreadGuard& guard, u32 address, - std::vector value) = 0; - virtual const std::vector& GetPatches() const = 0; - virtual void UnsetPatch(const Core::CPUThreadGuard& guard, u32 address) = 0; - virtual void EnablePatch(const Core::CPUThreadGuard& guard, std::size_t index) = 0; - virtual void DisablePatch(const Core::CPUThreadGuard& guard, std::size_t index) = 0; + virtual void SetPatch(const CPUThreadGuard& guard, u32 address, u32 value) = 0; + virtual void SetPatch(const CPUThreadGuard& guard, u32 address, std::vector value) = 0; + virtual void SetFramePatch(const CPUThreadGuard& guard, u32 address, u32 value) = 0; + virtual void SetFramePatch(const CPUThreadGuard& guard, u32 address, std::vector value) = 0; + virtual const std::vector& GetPatches() const = 0; + virtual void UnsetPatch(const CPUThreadGuard& guard, u32 address) = 0; + virtual void EnablePatch(const CPUThreadGuard& guard, std::size_t index) = 0; + virtual void DisablePatch(const CPUThreadGuard& guard, std::size_t index) = 0; virtual bool HasEnabledPatch(u32 address) const = 0; - virtual void RemovePatch(const Core::CPUThreadGuard& guard, std::size_t index) = 0; - virtual void ClearPatches(const Core::CPUThreadGuard& guard) = 0; - virtual void ApplyExistingPatch(const Core::CPUThreadGuard& guard, std::size_t index) = 0; + virtual void RemovePatch(const CPUThreadGuard& guard, std::size_t index) = 0; + virtual void ClearPatches(const CPUThreadGuard& guard) = 0; + virtual void ApplyExistingPatch(const CPUThreadGuard& guard, std::size_t index) = 0; // Threads - virtual Debug::Threads GetThreads(const Core::CPUThreadGuard& guard) const = 0; + virtual Common::Debug::Threads GetThreads(const CPUThreadGuard& guard) const = 0; - virtual std::string Disassemble(const Core::CPUThreadGuard* /*guard*/, u32 /*address*/) const + virtual std::string Disassemble(const CPUThreadGuard* /*guard*/, u32 /*address*/) const { return "NODEBUGGER"; } - virtual std::string GetRawMemoryString(const Core::CPUThreadGuard& /*guard*/, int /*memory*/, + virtual std::string GetRawMemoryString(const CPUThreadGuard& /*guard*/, int /*memory*/, u32 /*address*/) const { return "NODEBUGGER"; @@ -82,20 +79,17 @@ public: virtual void ClearAllMemChecks() {} virtual bool IsMemCheck(u32 /*address*/, size_t /*size*/) const { return false; } virtual void ToggleMemCheck(u32 /*address*/, bool /*read*/, bool /*write*/, bool /*log*/) {} - virtual u32 ReadMemory(const Core::CPUThreadGuard& /*guard*/, u32 /*address*/) const { return 0; } - virtual void WriteExtraMemory(const Core::CPUThreadGuard& /*guard*/, int /*memory*/, - u32 /*value*/, u32 /*address*/) + virtual u32 ReadMemory(const CPUThreadGuard& /*guard*/, u32 /*address*/) const { return 0; } + virtual void WriteExtraMemory(const CPUThreadGuard& /*guard*/, int /*memory*/, u32 /*value*/, + u32 /*address*/) { } - virtual u32 ReadExtraMemory(const Core::CPUThreadGuard& /*guard*/, int /*memory*/, + virtual u32 ReadExtraMemory(const CPUThreadGuard& /*guard*/, int /*memory*/, u32 /*address*/) const { return 0; } - virtual u32 ReadInstruction(const Core::CPUThreadGuard& /*guard*/, u32 /*address*/) const - { - return 0; - } + virtual u32 ReadInstruction(const CPUThreadGuard& /*guard*/, u32 /*address*/) const { return 0; } virtual std::optional GetMemoryAddressFromInstruction(const std::string& /*instruction*/) const { @@ -105,11 +99,11 @@ public: virtual void SetPC(u32 /*address*/) {} virtual void Step() {} virtual void RunToBreakpoint() {} - virtual u32 GetColor(const Core::CPUThreadGuard* /*guard*/, u32 /*address*/) const + virtual u32 GetColor(const CPUThreadGuard* /*guard*/, u32 /*address*/) const { return 0xFFFFFFFF; } virtual std::string GetDescription(u32 /*address*/) const = 0; - virtual void Clear(const Core::CPUThreadGuard& guard) = 0; + virtual void Clear(const CPUThreadGuard& guard) = 0; }; -} // namespace Common +} // namespace Core diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.h b/Source/Core/Core/Debugger/PPCDebugInterface.h index 9be57200b9..ca12de23f8 100644 --- a/Source/Core/Core/Debugger/PPCDebugInterface.h +++ b/Source/Core/Core/Debugger/PPCDebugInterface.h @@ -9,7 +9,7 @@ #include "Common/Debug/MemoryPatches.h" #include "Common/Debug/Watches.h" -#include "Common/DebugInterface.h" +#include "Core/Debugger/DebugInterface.h" #include "Core/NetworkCaptureLogger.h" namespace Core @@ -33,7 +33,7 @@ private: // wrapper between disasm control and Dolphin debugger -class PPCDebugInterface final : public Common::DebugInterface +class PPCDebugInterface final : public Core::DebugInterface { public: explicit PPCDebugInterface(Core::System& system); diff --git a/Source/Core/Core/PowerPC/BreakPoints.cpp b/Source/Core/Core/PowerPC/BreakPoints.cpp index c4555c7569..2d62dd569c 100644 --- a/Source/Core/Core/PowerPC/BreakPoints.cpp +++ b/Source/Core/Core/PowerPC/BreakPoints.cpp @@ -10,9 +10,9 @@ #include #include "Common/CommonTypes.h" -#include "Common/DebugInterface.h" #include "Common/Logging/Log.h" #include "Core/Core.h" +#include "Core/Debugger/DebugInterface.h" #include "Core/PowerPC/Expression.h" #include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/MMU.h" @@ -365,7 +365,7 @@ bool MemChecks::OverlapsMemcheck(u32 address, u32 length) const }); } -bool TMemCheck::Action(Core::System& system, Common::DebugInterface* debug_interface, u64 value, +bool TMemCheck::Action(Core::System& system, Core::DebugInterface* debug_interface, u64 value, u32 addr, bool write, size_t size, u32 pc) { if (!is_enabled) diff --git a/Source/Core/Core/PowerPC/BreakPoints.h b/Source/Core/Core/PowerPC/BreakPoints.h index 5494ee73e3..40d0499868 100644 --- a/Source/Core/Core/PowerPC/BreakPoints.h +++ b/Source/Core/Core/PowerPC/BreakPoints.h @@ -11,7 +11,7 @@ #include "Common/CommonTypes.h" #include "Core/PowerPC/Expression.h" -namespace Common +namespace Core { class DebugInterface; } @@ -49,7 +49,7 @@ struct TMemCheck std::optional condition; // returns whether to break - bool Action(Core::System& system, Common::DebugInterface* debug_interface, u64 value, u32 addr, + bool Action(Core::System& system, Core::DebugInterface* debug_interface, u64 value, u32 addr, bool write, size_t size, u32 pc); }; diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp index 7b96c29fad..1efcff8e09 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp @@ -19,6 +19,7 @@ #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/Core.h" +#include "Core/Debugger/DebugInterface.h" #include "Core/PowerPC/MMU.h" #include "Core/PowerPC/PPCAnalyst.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.h b/Source/Core/Core/PowerPC/PPCSymbolDB.h index 2bf56d2de5..d5e2f3de8f 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.h +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.h @@ -3,19 +3,16 @@ #pragma once -#include #include -#include #include "Common/CommonTypes.h" #include "Common/SymbolDB.h" -#include "Core/Debugger/PPCDebugInterface.h" - namespace Core { class CPUThreadGuard; -} +class DebugInterface; +} // namespace Core // This has functionality overlapping Debugger_Symbolmap. Should merge that stuff in here later. class PPCSymbolDB : public Common::SymbolDB @@ -44,7 +41,7 @@ public: void LogFunctionCall(u32 addr); private: - Common::DebugInterface* debugger; + Core::DebugInterface* debugger; }; extern PPCSymbolDB g_symbolDB; diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props index ec9ac2065a..5549e775f3 100644 --- a/Source/Core/DolphinLib.props +++ b/Source/Core/DolphinLib.props @@ -39,7 +39,6 @@ - @@ -191,6 +190,7 @@ +