Merge pull request #7240 from lioncash/namespace

Common/DebugInterface: Namespace code under the Common namespace
This commit is contained in:
Pierre Bourdon
2018-08-27 04:49:26 +02:00
committed by GitHub
6 changed files with 12 additions and 5 deletions

View File

@ -13,6 +13,8 @@
#include "Common/Debug/MemoryPatches.h" #include "Common/Debug/MemoryPatches.h"
#include "Common/Debug/Watches.h" #include "Common/Debug/Watches.h"
namespace Common
{
class DebugInterface class DebugInterface
{ {
protected: protected:
@ -75,3 +77,4 @@ public:
virtual std::string GetDescription(unsigned int /*address*/) = 0; virtual std::string GetDescription(unsigned int /*address*/) = 0;
virtual void Clear() = 0; virtual void Clear() = 0;
}; };
} // namespace Common

View File

@ -17,7 +17,7 @@ private:
// wrapper between disasm control and Dolphin debugger // wrapper between disasm control and Dolphin debugger
class PPCDebugInterface final : public DebugInterface class PPCDebugInterface final : public Common::DebugInterface
{ {
public: public:
PPCDebugInterface() {} PPCDebugInterface() {}

View File

@ -20,7 +20,7 @@ private:
void Patch(std::size_t index) override; void Patch(std::size_t index) override;
}; };
class DSPDebugInterface final : public DebugInterface class DSPDebugInterface final : public Common::DebugInterface
{ {
public: public:
DSPDebugInterface() {} DSPDebugInterface() {}

View File

@ -226,7 +226,7 @@ bool MemChecks::OverlapsMemcheck(u32 address, u32 length) const
}); });
} }
bool TMemCheck::Action(DebugInterface* debug_interface, u32 value, u32 addr, bool write, bool TMemCheck::Action(Common::DebugInterface* debug_interface, u32 value, u32 addr, bool write,
size_t size, u32 pc) size_t size, u32 pc)
{ {
if ((write && is_break_on_write) || (!write && is_break_on_read)) if ((write && is_break_on_write) || (!write && is_break_on_read))

View File

@ -10,7 +10,10 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
namespace Common
{
class DebugInterface; class DebugInterface;
}
struct TBreakPoint struct TBreakPoint
{ {
@ -35,7 +38,8 @@ struct TMemCheck
u32 num_hits = 0; u32 num_hits = 0;
// returns whether to break // returns whether to break
bool Action(DebugInterface* dbg_interface, u32 value, u32 addr, bool write, size_t size, u32 pc); bool Action(Common::DebugInterface* dbg_interface, u32 value, u32 addr, bool write, size_t size,
u32 pc);
}; };
// Code breakpoints. // Code breakpoints.

View File

@ -39,7 +39,7 @@ public:
void LogFunctionCall(u32 addr); void LogFunctionCall(u32 addr);
private: private:
DebugInterface* debugger; Common::DebugInterface* debugger;
}; };
extern PPCSymbolDB g_symbolDB; extern PPCSymbolDB g_symbolDB;