Merge pull request #6251 from bobjrsenior/more-registers-on-register-window

DolphinWX: Add TB and GQRs to Register Window
This commit is contained in:
Leo Lam 2017-12-15 20:46:27 +01:00 committed by GitHub
commit 28244546bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,6 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cinttypes>
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/grid.h> #include <wx/grid.h>
#include <wx/menu.h> #include <wx/menu.h>
@ -301,6 +302,9 @@ wxString CRegTable::GetValue(int row, int col)
if (row < 16) if (row < 16)
return wxString::Format("IBAT%01d", row - 8); return wxString::Format("IBAT%01d", row - 8);
if (row == 16)
return wxString::Format("TB");
break; break;
} }
case 6: case 6:
@ -324,6 +328,11 @@ wxString CRegTable::GetValue(int row, int col)
<< 32 | << 32 |
PowerPC::ppcState.spr[SPR_IBAT4L + (row - 16) * 2]); PowerPC::ppcState.spr[SPR_IBAT4L + (row - 16) * 2]);
if (row == 16)
return wxString::Format("%016" PRIx64, static_cast<u64>(PowerPC::ppcState.spr[SPR_TU])
<< 32 |
PowerPC::ppcState.spr[SPR_TL]);
break; break;
} }
case 7: case 7:
@ -331,6 +340,9 @@ wxString CRegTable::GetValue(int row, int col)
if (row < 16) if (row < 16)
return wxString::Format("SR%02d", row); return wxString::Format("SR%02d", row);
if (row < 24)
return wxString::Format("GQR%01d", row - 16);
break; break;
} }
case 8: case 8:
@ -338,6 +350,9 @@ wxString CRegTable::GetValue(int row, int col)
if (row < 16) if (row < 16)
return wxString::Format("%08x", PowerPC::ppcState.sr[row]); return wxString::Format("%08x", PowerPC::ppcState.sr[row]);
if (row < 24)
return wxString::Format("%08x", PowerPC::ppcState.spr[SPR_GQR0 + (row - 16)]);
break; break;
} }
default: default: