diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-03-23 18:32:11 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-03-23 18:32:11 +1300 |
| commit | 36eb806e4a85443cb7462a7f6cf17ac96ff5d3ff (patch) | |
| tree | ee3ecc21c1f41338b8d29cee9d13b2ea27169e1f /Source/Core | |
| parent | c7335dc48f1f6673595b453c887ba8b067c48512 (diff) | |
| parent | 9ed562d7de1e8c4022c0dd961f471a7cbaae2de7 (diff) | |
Merge pull request #192 from lioncash/final
Mark the PPCDebugInterface and DSPDebugInterface as final.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Debugger/PPCDebugInterface.h | 50 | ||||
| -rw-r--r-- | Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h | 44 |
2 files changed, 47 insertions, 47 deletions
diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.h b/Source/Core/Core/Debugger/PPCDebugInterface.h index 46af904cf8..ba362694f1 100644 --- a/Source/Core/Core/Debugger/PPCDebugInterface.h +++ b/Source/Core/Core/Debugger/PPCDebugInterface.h @@ -10,36 +10,36 @@ //wrapper between disasm control and Dolphin debugger -class PPCDebugInterface : public DebugInterface +class PPCDebugInterface final : public DebugInterface { public: PPCDebugInterface(){} - virtual void Disassemble(unsigned int address, char *dest, int max_size) final override; - virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final override; - virtual int GetInstructionSize(int /*instruction*/) final override {return 4;} - virtual bool IsAlive() final override; - virtual bool IsBreakpoint(unsigned int address) final override; - virtual void SetBreakpoint(unsigned int address) final override; - virtual void ClearBreakpoint(unsigned int address) final override; - virtual void ClearAllBreakpoints() final override; - virtual void ToggleBreakpoint(unsigned int address) final override; - virtual void ClearAllMemChecks() final override; - virtual bool IsMemCheck(unsigned int address) final override; - virtual void ToggleMemCheck(unsigned int address) final override; - virtual unsigned int ReadMemory(unsigned int address) final override; + virtual void Disassemble(unsigned int address, char *dest, int max_size) override; + virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override; + virtual int GetInstructionSize(int /*instruction*/) override {return 4;} + virtual bool IsAlive() override; + virtual bool IsBreakpoint(unsigned int address) override; + virtual void SetBreakpoint(unsigned int address) override; + virtual void ClearBreakpoint(unsigned int address) override; + virtual void ClearAllBreakpoints() override; + virtual void ToggleBreakpoint(unsigned int address) override; + virtual void ClearAllMemChecks() override; + virtual bool IsMemCheck(unsigned int address) override; + virtual void ToggleMemCheck(unsigned int address) override; + virtual unsigned int ReadMemory(unsigned int address) override; enum { EXTRAMEM_ARAM = 1, }; - virtual unsigned int ReadExtraMemory(int memory, unsigned int address) final override; - virtual unsigned int ReadInstruction(unsigned int address) final override; - virtual unsigned int GetPC() final override; - virtual void SetPC(unsigned int address) final override; - virtual void Step() final override {} - virtual void BreakNow() final override; - virtual void RunToBreakpoint() final override; - virtual void InsertBLR(unsigned int address, unsigned int value) final override; - virtual int GetColor(unsigned int address) final override; - virtual std::string GetDescription(unsigned int address) final override; - virtual void ShowJitResults(u32 address) final override; + virtual unsigned int ReadExtraMemory(int memory, unsigned int address) override; + virtual unsigned int ReadInstruction(unsigned int address) override; + virtual unsigned int GetPC() override; + virtual void SetPC(unsigned int address) override; + virtual void Step() override {} + virtual void BreakNow() override; + virtual void RunToBreakpoint() override; + virtual void InsertBLR(unsigned int address, unsigned int value) override; + virtual int GetColor(unsigned int address) override; + virtual std::string GetDescription(unsigned int address) override; + virtual void ShowJitResults(u32 address) override; }; diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h index 41c0200abc..f4a2494481 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h +++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h @@ -10,29 +10,29 @@ #include "Common/Common.h" #include "Common/DebugInterface.h" -class DSPDebugInterface : public DebugInterface +class DSPDebugInterface final : public DebugInterface { public: DSPDebugInterface(){} - virtual void Disassemble(unsigned int address, char *dest, int max_size) final override; - virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final override; - virtual int GetInstructionSize(int instruction) final override {return 1;} - virtual bool IsAlive() final override; - virtual bool IsBreakpoint(unsigned int address) final override; - virtual void SetBreakpoint(unsigned int address) final override; - virtual void ClearBreakpoint(unsigned int address) final override; - virtual void ClearAllBreakpoints() final override; - virtual void ToggleBreakpoint(unsigned int address) final override; - virtual void ClearAllMemChecks() final override; - virtual bool IsMemCheck(unsigned int address) final override; - virtual void ToggleMemCheck(unsigned int address) final override; - virtual unsigned int ReadMemory(unsigned int address) final override; - virtual unsigned int ReadInstruction(unsigned int address) final override; - virtual unsigned int GetPC() final override; - virtual void SetPC(unsigned int address) final override; - virtual void Step() final override {} - virtual void RunToBreakpoint() final override; - virtual void InsertBLR(unsigned int address, unsigned int value) final override; - virtual int GetColor(unsigned int address) final override; - virtual std::string GetDescription(unsigned int address) final override; + virtual void Disassemble(unsigned int address, char *dest, int max_size) override; + virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override; + virtual int GetInstructionSize(int instruction) override { return 1; } + virtual bool IsAlive() override; + virtual bool IsBreakpoint(unsigned int address) override; + virtual void SetBreakpoint(unsigned int address) override; + virtual void ClearBreakpoint(unsigned int address) override; + virtual void ClearAllBreakpoints() override; + virtual void ToggleBreakpoint(unsigned int address) override; + virtual void ClearAllMemChecks() override; + virtual bool IsMemCheck(unsigned int address) override; + virtual void ToggleMemCheck(unsigned int address) override; + virtual unsigned int ReadMemory(unsigned int address) override; + virtual unsigned int ReadInstruction(unsigned int address) override; + virtual unsigned int GetPC() override; + virtual void SetPC(unsigned int address) override; + virtual void Step() override {} + virtual void RunToBreakpoint() override; + virtual void InsertBLR(unsigned int address, unsigned int value) override; + virtual int GetColor(unsigned int address) override; + virtual std::string GetDescription(unsigned int address) override; }; |
