Skip to content

Commit

Permalink
Merge pull request #128 from lioncash/normalize-debug-interface-func-…
Browse files Browse the repository at this point in the history 
…names

Change the DebugInterface, PPCDebugInterface, and DSPDebugInterface to use CamelCase function names.
  • Loading branch information
@delroth
delroth committed Mar 3, 2014
2 parents 9ef627f + 279a8c0 commit 91676ad
Show file tree
Hide file tree
Showing 9 changed files with 157 additions and 153 deletions.
14 changes: 9 additions & 5 deletions Source/Core/Common/BreakPoints.cpp
View file
Expand Up @@ -17,6 +17,7 @@ bool BreakPoints::IsAddressBreakPoint(u32 _iAddress)
for (const TBreakPoint& bp : m_BreakPoints)
if (bp.iAddress == _iAddress)
return true;

return false;
}

Expand All @@ -25,6 +26,7 @@ bool BreakPoints::IsTempBreakPoint(u32 _iAddress)
for (const TBreakPoint& bp : m_BreakPoints)
if (bp.iAddress == _iAddress && bp.bTemporary)
return true;

return false;
}

Expand Down Expand Up @@ -176,27 +178,29 @@ TMemCheck *MemChecks::GetMemCheck(u32 address)
return &(bp);
}
else if (bp.StartAddress == address)
{
return &(bp);
}
}

// none found
return 0;
}

void TMemCheck::Action(DebugInterface *debug_interface, u32 iValue, u32 addr,
bool write, int size, u32 pc)
void TMemCheck::Action(DebugInterface *debug_interface, u32 iValue, u32 addr, bool write, int size, u32 pc)
{
if ((write && OnWrite) || (!write && OnRead))
{
if (Log)
{
INFO_LOG(MEMMAP, "CHK %08x (%s) %s%i %0*x at %08x (%s)",
pc, debug_interface->getDescription(pc).c_str(),
pc, debug_interface->GetDescription(pc).c_str(),
write ? "Write" : "Read", size*8, size*2, iValue, addr,
debug_interface->getDescription(addr).c_str()
debug_interface->GetDescription(addr).c_str()
);
}

if (Break)
debug_interface->breakNow();
debug_interface->BreakNow();
}
}
48 changes: 24 additions & 24 deletions Source/Core/Common/DebugInterface.h
View file
Expand Up @@ -9,28 +9,28 @@ class DebugInterface
virtual ~DebugInterface() {}

public:
virtual void disasm(unsigned int /*address*/, char *dest, int /*max_size*/) {strcpy(dest, "NODEBUGGER");}
virtual void getRawMemoryString(int /*memory*/, unsigned int /*address*/, char *dest, int /*max_size*/) {strcpy(dest, "NODEBUGGER");}
virtual int getInstructionSize(int /*instruction*/) {return 1;}
virtual bool isAlive() {return true;}
virtual bool isBreakpoint(unsigned int /*address*/) {return false;}
virtual void setBreakpoint(unsigned int /*address*/){}
virtual void clearBreakpoint(unsigned int /*address*/){}
virtual void clearAllBreakpoints() {}
virtual void toggleBreakpoint(unsigned int /*address*/){}
virtual bool isMemCheck(unsigned int /*address*/) {return false;}
virtual void toggleMemCheck(unsigned int /*address*/){}
virtual unsigned int readMemory(unsigned int /*address*/){return 0;}
virtual void writeExtraMemory(int /*memory*/, unsigned int /*value*/, unsigned int /*address*/) {}
virtual unsigned int readExtraMemory(int /*memory*/, unsigned int /*address*/){return 0;}
virtual unsigned int readInstruction(unsigned int /*address*/){return 0;}
virtual unsigned int getPC() {return 0;}
virtual void setPC(unsigned int /*address*/) {}
virtual void step() {}
virtual void runToBreakpoint() {}
virtual void breakNow() {}
virtual void insertBLR(unsigned int /*address*/, unsigned int /*value*/) {}
virtual void showJitResults(unsigned int /*address*/) {};
virtual int getColor(unsigned int /*address*/){return 0xFFFFFFFF;}
virtual std::string getDescription(unsigned int /*address*/) = 0;
virtual void Disassemble(unsigned int /*address*/, char *dest, int /*max_size*/) {strcpy(dest, "NODEBUGGER");}
virtual void GetRawMemoryString(int /*memory*/, unsigned int /*address*/, char *dest, int /*max_size*/) {strcpy(dest, "NODEBUGGER");}
virtual int GetInstructionSize(int /*instruction*/) {return 1;}
virtual bool IsAlive() {return true;}
virtual bool IsBreakpoint(unsigned int /*address*/) {return false;}
virtual void SetBreakpoint(unsigned int /*address*/){}
virtual void ClearBreakpoint(unsigned int /*address*/){}
virtual void ClearAllBreakpoints() {}
virtual void ToggleBreakpoint(unsigned int /*address*/){}
virtual bool IsMemCheck(unsigned int /*address*/) {return false;}
virtual void ToggleMemCheck(unsigned int /*address*/){}
virtual unsigned int ReadMemory(unsigned int /*address*/){return 0;}
virtual void WriteExtraMemory(int /*memory*/, unsigned int /*value*/, unsigned int /*address*/) {}
virtual unsigned int ReadExtraMemory(int /*memory*/, unsigned int /*address*/){return 0;}
virtual unsigned int ReadInstruction(unsigned int /*address*/){return 0;}
virtual unsigned int GetPC() {return 0;}
virtual void SetPC(unsigned int /*address*/) {}
virtual void Step() {}
virtual void RunToBreakpoint() {}
virtual void BreakNow() {}
virtual void InsertBLR(unsigned int /*address*/, unsigned int /*value*/) {}
virtual void ShowJitResults(unsigned int /*address*/) {};
virtual int GetColor(unsigned int /*address*/){return 0xFFFFFFFF;}
virtual std::string GetDescription(unsigned int /*address*/) = 0;
};
44 changes: 22 additions & 22 deletions Source/Core/Core/Debugger/PPCDebugInterface.cpp
View file
Expand Up @@ -15,7 +15,7 @@
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/JitCommon/JitBase.h"

void PPCDebugInterface::disasm(unsigned int address, char *dest, int max_size)
void PPCDebugInterface::Disassemble(unsigned int address, char *dest, int max_size)
{
// Memory::ReadUnchecked_U32 seemed to crash on shutdown
if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) return;
Expand Down Expand Up @@ -43,13 +43,13 @@ void PPCDebugInterface::disasm(unsigned int address, char *dest, int max_size)
}
}

void PPCDebugInterface::getRawMemoryString(int memory, unsigned int address, char *dest, int max_size)
void PPCDebugInterface::GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size)
{
if (Core::GetState() != Core::CORE_UNINITIALIZED)
{
if (memory || Memory::IsRAMAddress(address, true, true))
{
snprintf(dest, max_size, "%08X%s", readExtraMemory(memory, address), memory ? " (ARAM)" : "");
snprintf(dest, max_size, "%08X%s", ReadExtraMemory(memory, address), memory ? " (ARAM)" : "");
}
else
{
Expand All @@ -62,12 +62,12 @@ void PPCDebugInterface::getRawMemoryString(int memory, unsigned int address, cha
}
}

unsigned int PPCDebugInterface::readMemory(unsigned int address)
unsigned int PPCDebugInterface::ReadMemory(unsigned int address)
{
return Memory::ReadUnchecked_U32(address);
}

unsigned int PPCDebugInterface::readExtraMemory(int memory, unsigned int address)
unsigned int PPCDebugInterface::ReadExtraMemory(int memory, unsigned int address)
{
switch (memory)
{
Expand All @@ -83,48 +83,48 @@ unsigned int PPCDebugInterface::readExtraMemory(int memory, unsigned int address
}
}

unsigned int PPCDebugInterface::readInstruction(unsigned int address)
unsigned int PPCDebugInterface::ReadInstruction(unsigned int address)
{
return Memory::Read_Instruction(address);
}

bool PPCDebugInterface::isAlive()
bool PPCDebugInterface::IsAlive()
{
return Core::GetState() != Core::CORE_UNINITIALIZED;
}

bool PPCDebugInterface::isBreakpoint(unsigned int address)
bool PPCDebugInterface::IsBreakpoint(unsigned int address)
{
return PowerPC::breakpoints.IsAddressBreakPoint(address);
}

void PPCDebugInterface::setBreakpoint(unsigned int address)
void PPCDebugInterface::SetBreakpoint(unsigned int address)
{
PowerPC::breakpoints.Add(address);
}

void PPCDebugInterface::clearBreakpoint(unsigned int address)
void PPCDebugInterface::ClearBreakpoint(unsigned int address)
{
PowerPC::breakpoints.Remove(address);
}

void PPCDebugInterface::clearAllBreakpoints() {}
void PPCDebugInterface::ClearAllBreakpoints() {}

void PPCDebugInterface::toggleBreakpoint(unsigned int address)
void PPCDebugInterface::ToggleBreakpoint(unsigned int address)
{
if (PowerPC::breakpoints.IsAddressBreakPoint(address))
PowerPC::breakpoints.Remove(address);
else
PowerPC::breakpoints.Add(address);
}

bool PPCDebugInterface::isMemCheck(unsigned int address)
bool PPCDebugInterface::IsMemCheck(unsigned int address)
{
return (Memory::AreMemoryBreakpointsActivated()
&& PowerPC::memchecks.GetMemCheck(address));
}

void PPCDebugInterface::toggleMemCheck(unsigned int address)
void PPCDebugInterface::ToggleMemCheck(unsigned int address)
{
if (Memory::AreMemoryBreakpointsActivated()
&& !PowerPC::memchecks.GetMemCheck(address))
Expand All @@ -145,12 +145,12 @@ void PPCDebugInterface::toggleMemCheck(unsigned int address)
PowerPC::memchecks.Remove(address);
}

void PPCDebugInterface::insertBLR(unsigned int address, unsigned int value)
void PPCDebugInterface::InsertBLR(unsigned int address, unsigned int value)
{
Memory::Write_U32(value, address);
}

void PPCDebugInterface::breakNow()
void PPCDebugInterface::BreakNow()
{
CCPU::Break();
}
Expand All @@ -159,7 +159,7 @@ void PPCDebugInterface::breakNow()
// =======================================================
// Separate the blocks with colors.
// -------------
int PPCDebugInterface::getColor(unsigned int address)
int PPCDebugInterface::GetColor(unsigned int address)
{
if (!Memory::IsRAMAddress(address, true, true))
return 0xeeeeee;
Expand All @@ -182,27 +182,27 @@ int PPCDebugInterface::getColor(unsigned int address)
// =============


std::string PPCDebugInterface::getDescription(unsigned int address)
std::string PPCDebugInterface::GetDescription(unsigned int address)
{
return g_symbolDB.GetDescription(address);
}

unsigned int PPCDebugInterface::getPC()
unsigned int PPCDebugInterface::GetPC()
{
return PowerPC::ppcState.pc;
}

void PPCDebugInterface::setPC(unsigned int address)
void PPCDebugInterface::SetPC(unsigned int address)
{
PowerPC::ppcState.pc = address;
}

void PPCDebugInterface::showJitResults(unsigned int address)
void PPCDebugInterface::ShowJitResults(unsigned int address)
{
Host_ShowJitResults(address);
}

void PPCDebugInterface::runToBreakpoint()
void PPCDebugInterface::RunToBreakpoint()
{

}
46 changes: 23 additions & 23 deletions Source/Core/Core/Debugger/PPCDebugInterface.h
View file
Expand Up @@ -14,31 +14,31 @@ class PPCDebugInterface : public DebugInterface
{
public:
PPCDebugInterface(){}
virtual void disasm(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 bool isMemCheck(unsigned int address) override;
virtual void toggleMemCheck(unsigned int address) override;
virtual unsigned int readMemory(unsigned int address) 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 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) 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;
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;
};

0 comments on commit 91676ad

Please sign in to comment.