jprdonnelly/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-03-01 17:02:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Common/DebugInterface: Make return value of GetColor() a u32

Browse Source 
At its only usage point, its return value is stored into a u32, and the
default implementation returns 0xFFFFFFFF (-1), which would be an
unsigned integer. Given all of the bits are used to determine a color,
it makes slightly more sense to treat this as an unsigned value as
opposed to a signed one.
This commit is contained in:
Lioncash
2019-07-08 18:13:27 -04:00
parent a9a9b193bb
commit d4d485b692
6 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/Core/Debugger/PPCDebugInterface.cpp
View File

@@ -4,6 +4,7 @@
#include "Core/Debugger/PPCDebugInterface.h"
#include <array>
#include <cstddef>
#include <string>
@@ -300,13 +301,20 @@ void PPCDebugInterface::ToggleMemCheck(u32 address, bool read, bool write, bool
// =======================================================
// Separate the blocks with colors.
// -------------
int PPCDebugInterface::GetColor(u32 address)
u32 PPCDebugInterface::GetColor(u32 address)
{
if (!IsAlive())
return 0xFFFFFF;
if (!PowerPC::HostIsRAMAddress(address))
return 0xeeeeee;
static const int colors[6] = {
Common::Symbol* symbol = g_symbolDB.GetSymbolFromAddr(address);
if (!symbol)
return 0xFFFFFF;
if (symbol->type != Common::Symbol::Type::Function)
return 0xEEEEFF;
static constexpr std::array<u32, 6> colors{
0xd0FFFF, // light cyan
0xFFd0d0, // light red
0xd8d8FF, // light blue
@@ -314,12 +322,7 @@ int PPCDebugInterface::GetColor(u32 address)
0xd0FFd0, // light green
0xFFFFd0, // light yellow
};
Common::Symbol* symbol = g_symbolDB.GetSymbolFromAddr(address);
if (!symbol)
return 0xFFFFFF;
if (symbol->type != Common::Symbol::Type::Function)
return 0xEEEEFF;
return colors[symbol->index % 6];
return colors[symbol->index % colors.size()];
}
// =============