diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-13 00:58:37 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-13 00:58:37 -0500 |
| commit | 605bbf5ca833399c1a6aad2a3b0e21cb4c910d11 (patch) | |
| tree | 53acc60e471e39f234af37ac56c4ce39029eb60b /Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp | |
| parent | 2444fdbbdd4310f0e012b661d258b20a4eaf4800 (diff) | |
| parent | 48927c17d252223ffdaa5cfb34aa850eb6ee6ee1 (diff) | |
Merge remote-tracking branch 'origin/master' into Android-trash
Diffstat (limited to 'Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp index 0c414cb522..b7faf63251 100644 --- a/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp @@ -31,8 +31,10 @@ static const char *special_reg_names[] = { "PC", "LR", "CTR", "CR", "FPSCR", "MSR", "SRR0", "SRR1", "Exceptions", "Int Mask", "Int Cause", }; -static u32 GetSpecialRegValue(int reg) { - switch (reg) { +static u32 GetSpecialRegValue(int reg) +{ + switch (reg) + { case 0: return PowerPC::ppcState.pc; case 1: return PowerPC::ppcState.spr[SPR_LR]; case 2: return PowerPC::ppcState.spr[SPR_CTR]; @@ -50,8 +52,10 @@ static u32 GetSpecialRegValue(int reg) { wxString CRegTable::GetValue(int row, int col) { - if (row < 32) { - switch (col) { + if (row < 32) + { + switch (col) + { case 0: return StrToWxStr(GetGPRName(row)); case 1: return wxString::Format(wxT("%08x"), GPR(row)); case 2: return StrToWxStr(GetFPRName(row)); @@ -59,20 +63,26 @@ wxString CRegTable::GetValue(int row, int col) case 4: return wxString::Format(wxT("%016llx"), riPS1(row)); default: return wxEmptyString; } - } else { - if (row - 32 < NUM_SPECIALS) { - switch (col) { + } + else + { + if (row - 32 < NUM_SPECIALS) + { + switch (col) + { case 0: return StrToWxStr(special_reg_names[row - 32]); case 1: return wxString::Format(wxT("%08x"), GetSpecialRegValue(row - 32)); default: return wxEmptyString; - } + } } } - return wxEmptyString; + return wxEmptyString; } -static void SetSpecialRegValue(int reg, u32 value) { - switch (reg) { +static void SetSpecialRegValue(int reg, u32 value) +{ + switch (reg) + { case 0: PowerPC::ppcState.pc = value; break; case 1: PowerPC::ppcState.spr[SPR_LR] = value; break; case 2: PowerPC::ppcState.spr[SPR_CTR] = value; break; @@ -94,15 +104,19 @@ void CRegTable::SetValue(int row, int col, const wxString& strNewVal) u32 newVal = 0; if (TryParse(WxStrToStr(strNewVal), &newVal)) { - if (row < 32) { + if (row < 32) + { if (col == 1) GPR(row) = newVal; else if (col == 3) riPS0(row) = newVal; else if (col == 4) riPS1(row) = newVal; - } else { - if ((row - 32 < NUM_SPECIALS) && (col == 1)) { + } + else + { + if ((row - 32 < NUM_SPECIALS) && (col == 1)) + { SetSpecialRegValue(row - 32, newVal); } } @@ -135,7 +149,8 @@ wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind) attr->SetBackgroundColour(wxColour(wxT("#FFFFFF"))); //wxWHITE attr->SetFont(DebuggerFont); - switch (col) { + switch (col) + { case 1: attr->SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER); break; @@ -149,11 +164,13 @@ wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind) } bool red = false; - switch (col) { + switch (col) + { case 1: red = row < 32 ? m_CachedRegHasChanged[row] : m_CachedSpecialRegHasChanged[row-32]; break; case 3: case 4: red = row < 32 ? m_CachedFRegHasChanged[row][col-3] : false; break; } + attr->SetTextColour(red ? wxColor(wxT("#FF0000")) : wxColor(wxT("#000000"))); attr->IncRef(); return attr; |
