ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mark functions in the PPCDebugInterface and DSPDebugInterface as final. 

The way they currently were, they would allow for a class to inherit and override these interfaces functions. However, this doesn't make sense conceptually.
This commit is contained in:
Lioncash 2014-03-05 21:54:34 -05:00
parent 610a6f9b23
commit aa82680be7
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Source/Core/Core/Debugger/PPCDebugInterface.h
View File

@ -14,32 +14,32 @@ class PPCDebugInterface : public DebugInterface
{ {
public: public:
PPCDebugInterface(){} PPCDebugInterface(){}
virtual void Disassemble(unsigned int address, char *dest, int max_size) override; virtual void Disassemble(unsigned int address, char *dest, int max_size) final;
virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override; virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final;
virtual int GetInstructionSize(int /*instruction*/) override {return 4;} virtual int GetInstructionSize(int /*instruction*/) final {return 4;}
virtual bool IsAlive() override; virtual bool IsAlive() final;
virtual bool IsBreakpoint(unsigned int address) override; virtual bool IsBreakpoint(unsigned int address) final;
virtual void SetBreakpoint(unsigned int address) override; virtual void SetBreakpoint(unsigned int address) final;
virtual void ClearBreakpoint(unsigned int address) override; virtual void ClearBreakpoint(unsigned int address) final;
virtual void ClearAllBreakpoints() override; virtual void ClearAllBreakpoints() final;
virtual void ToggleBreakpoint(unsigned int address) override; virtual void ToggleBreakpoint(unsigned int address) final;
virtual void ClearAllMemChecks() override; virtual void ClearAllMemChecks() final;
virtual bool IsMemCheck(unsigned int address) override; virtual bool IsMemCheck(unsigned int address) final;
virtual void ToggleMemCheck(unsigned int address) override; virtual void ToggleMemCheck(unsigned int address) final;
virtual unsigned int ReadMemory(unsigned int address) override; virtual unsigned int ReadMemory(unsigned int address) final;
enum { enum {
EXTRAMEM_ARAM = 1, EXTRAMEM_ARAM = 1,
}; };
virtual unsigned int ReadExtraMemory(int memory, unsigned int address) override; virtual unsigned int ReadExtraMemory(int memory, unsigned int address) final;
virtual unsigned int ReadInstruction(unsigned int address) override; virtual unsigned int ReadInstruction(unsigned int address) final;
virtual unsigned int GetPC() override; virtual unsigned int GetPC() final;
virtual void SetPC(unsigned int address) override; virtual void SetPC(unsigned int address) final;
virtual void Step() override {} virtual void Step() final {}
virtual void BreakNow() override; virtual void BreakNow() final;
virtual void RunToBreakpoint() override; virtual void RunToBreakpoint() final;
virtual void InsertBLR(unsigned int address, unsigned int value) override; virtual void InsertBLR(unsigned int address, unsigned int value) final;
virtual int GetColor(unsigned int address) override; virtual int GetColor(unsigned int address) final;
virtual std::string GetDescription(unsigned int address) override; virtual std::string GetDescription(unsigned int address) final;
virtual void ShowJitResults(u32 address) override; virtual void ShowJitResults(u32 address) final;
}; };

42
Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
View File

@ -14,25 +14,25 @@ class DSPDebugInterface : public DebugInterface
{ {
public: public:
DSPDebugInterface(){} DSPDebugInterface(){}
virtual void Disassemble(unsigned int address, char *dest, int max_size); virtual void Disassemble(unsigned int address, char *dest, int max_size) final;
virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size); virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final;
virtual int GetInstructionSize(int instruction) {return 1;} virtual int GetInstructionSize(int instruction) final {return 1;}
virtual bool IsAlive(); virtual bool IsAlive() final;
virtual bool IsBreakpoint(unsigned int address); virtual bool IsBreakpoint(unsigned int address) final;
virtual void SetBreakpoint(unsigned int address); virtual void SetBreakpoint(unsigned int address) final;
virtual void ClearBreakpoint(unsigned int address); virtual void ClearBreakpoint(unsigned int address) final;
virtual void ClearAllBreakpoints(); virtual void ClearAllBreakpoints() final;
virtual void ToggleBreakpoint(unsigned int address); virtual void ToggleBreakpoint(unsigned int address) final;
virtual void ClearAllMemChecks(); virtual void ClearAllMemChecks() final;
virtual bool IsMemCheck(unsigned int address); virtual bool IsMemCheck(unsigned int address) final;
virtual void ToggleMemCheck(unsigned int address); virtual void ToggleMemCheck(unsigned int address) final;
virtual unsigned int ReadMemory(unsigned int address); virtual unsigned int ReadMemory(unsigned int address) final;
virtual unsigned int ReadInstruction(unsigned int address); virtual unsigned int ReadInstruction(unsigned int address) final;
virtual unsigned int GetPC(); virtual unsigned int GetPC() final;
virtual void SetPC(unsigned int address); virtual void SetPC(unsigned int address) final;
virtual void Step() {} virtual void Step() final {}
virtual void RunToBreakpoint(); virtual void RunToBreakpoint() final;
virtual void InsertBLR(unsigned int address, unsigned int value); virtual void InsertBLR(unsigned int address, unsigned int value) final;
virtual int GetColor(unsigned int address); virtual int GetColor(unsigned int address) final;
virtual std::string GetDescription(unsigned int address); virtual std::string GetDescription(unsigned int address) final;
}; };