piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Common/DebugInterface: Use u32 instead of unsigned int consistently

Browse Source 
Previously u32 was being used for part of the interface and unsigned int
was being used for other parts. This makes the interface fully consistent by
using only one type.

We opt for u32 here given they communicate the same thing (for platforms
we care about where int is 32-bit), while also being less to read.
This commit is contained in:
Lioncash
2019-07-08 17:53:47 -04:00
parent b1b9c6aa1e
commit 457bff92c1
5 changed files with 74 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp
View File

@ -138,13 +138,13 @@ void DSPDebugInterface::ClearPatches()
m_patches.ClearPatches();
}
std::string DSPDebugInterface::Disassemble(unsigned int address)
std::string DSPDebugInterface::Disassemble(u32 address)
{
// we'll treat addresses as line numbers.
return Symbols::GetLineText(address);
}
std::string DSPDebugInterface::GetRawMemoryString(int memory, unsigned int address)
std::string DSPDebugInterface::GetRawMemoryString(int memory, u32 address)
{
if (DSPCore_GetState() == State::Stopped)
return "";
@ -177,12 +177,12 @@ std::string DSPDebugInterface::GetRawMemoryString(int memory, unsigned int addre
return "";
}
unsigned int DSPDebugInterface::ReadMemory(unsigned int address)
u32 DSPDebugInterface::ReadMemory(u32 address)
{
return 0;
}
unsigned int DSPDebugInterface::ReadInstruction(unsigned int address)
u32 DSPDebugInterface::ReadInstruction(u32 address)
{
return 0;
}
@ -192,7 +192,7 @@ bool DSPDebugInterface::IsAlive()
return true;
}
bool DSPDebugInterface::IsBreakpoint(unsigned int address)
bool DSPDebugInterface::IsBreakpoint(u32 address)
{
int real_addr = Symbols::Line2Addr(address);
if (real_addr >= 0)
@ -201,7 +201,7 @@ bool DSPDebugInterface::IsBreakpoint(unsigned int address)
return false;
}
void DSPDebugInterface::SetBreakpoint(unsigned int address)
void DSPDebugInterface::SetBreakpoint(u32 address)
{
int real_addr = Symbols::Line2Addr(address);
@ -211,7 +211,7 @@ void DSPDebugInterface::SetBreakpoint(unsigned int address)
}
}
void DSPDebugInterface::ClearBreakpoint(unsigned int address)
void DSPDebugInterface::ClearBreakpoint(u32 address)
{
int real_addr = Symbols::Line2Addr(address);
@ -226,7 +226,7 @@ void DSPDebugInterface::ClearAllBreakpoints()
g_dsp_breakpoints.Clear();
}
void DSPDebugInterface::ToggleBreakpoint(unsigned int address)
void DSPDebugInterface::ToggleBreakpoint(u32 address)
{
int real_addr = Symbols::Line2Addr(address);
if (real_addr >= 0)
@ -238,7 +238,7 @@ void DSPDebugInterface::ToggleBreakpoint(unsigned int address)
}
}
bool DSPDebugInterface::IsMemCheck(unsigned int address, size_t size)
bool DSPDebugInterface::IsMemCheck(u32 address, size_t size)
{
return false;
}
@ -248,7 +248,7 @@ void DSPDebugInterface::ClearAllMemChecks()
PanicAlert("MemCheck functionality not supported in DSP module.");
}
void DSPDebugInterface::ToggleMemCheck(unsigned int address, bool read, bool write, bool log)
void DSPDebugInterface::ToggleMemCheck(u32 address, bool read, bool write, bool log)
{
PanicAlert("MemCheck functionality not supported in DSP module.");
}
@ -256,7 +256,7 @@ void DSPDebugInterface::ToggleMemCheck(unsigned int address, bool read, bool wri
// =======================================================
// Separate the blocks with colors.
// -------------
int DSPDebugInterface::GetColor(unsigned int address)
int DSPDebugInterface::GetColor(u32 address)
{
static const int colors[6] = {
0xd0FFFF, // light cyan
@ -287,17 +287,17 @@ int DSPDebugInterface::GetColor(unsigned int address)
}
// =============
std::string DSPDebugInterface::GetDescription(unsigned int address)
std::string DSPDebugInterface::GetDescription(u32 address)
{
return ""; // g_symbolDB.GetDescription(address);
}
unsigned int DSPDebugInterface::GetPC()
u32 DSPDebugInterface::GetPC()
{
return Symbols::Addr2Line(DSP::g_dsp.pc);
}
void DSPDebugInterface::SetPC(unsigned int address)
void DSPDebugInterface::SetPC(u32 address)
{
int new_pc = Symbols::Line2Addr(address);
if (new_pc > 0)

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

@ -51,27 +51,26 @@ public:
bool HasEnabledPatch(u32 address) const override;
void ClearPatches() override;
std::string Disassemble(unsigned int address) override;
std::string GetRawMemoryString(int memory, unsigned int address) override;
std::string Disassemble(u32 address) override;
std::string GetRawMemoryString(int memory, u32 address) override;
int GetInstructionSize(int instruction) override { return 1; }
bool IsAlive() override;
bool IsBreakpoint(unsigned int address) override;
void SetBreakpoint(unsigned int address) override;
void ClearBreakpoint(unsigned int address) override;
bool IsBreakpoint(u32 address) override;
void SetBreakpoint(u32 address) override;
void ClearBreakpoint(u32 address) override;
void ClearAllBreakpoints() override;
void ToggleBreakpoint(unsigned int address) override;
void ToggleBreakpoint(u32 address) override;
void ClearAllMemChecks() override;
bool IsMemCheck(unsigned int address, size_t size) override;
void ToggleMemCheck(unsigned int address, bool read = true, bool write = true,
bool log = true) override;
unsigned int ReadMemory(unsigned int address) override;
unsigned int ReadInstruction(unsigned int address) override;
unsigned int GetPC() override;
void SetPC(unsigned int address) override;
bool IsMemCheck(u32 address, size_t size) override;
void ToggleMemCheck(u32 address, bool read = true, bool write = true, bool log = true) override;
u32 ReadMemory(u32 address) override;
u32 ReadInstruction(u32 address) override;
u32 GetPC() override;
void SetPC(u32 address) override;
void Step() override {}
void RunToBreakpoint() override;
int GetColor(unsigned int address) override;
std::string GetDescription(unsigned int address) override;
int GetColor(u32 address) override;
std::string GetDescription(u32 address) override;
void Clear() override;