diff options
| author | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:50:35 +0300 |
|---|---|---|
| committer | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:50:35 +0300 |
| commit | 748be565b8df535ef558e74b38cd0f4d615f8a21 (patch) | |
| tree | b151efee0a87e99125f2401325a9bddecf84fc73 /Source/Core/DolphinWX/Debugger/MemoryView.cpp | |
| parent | cf17fccdd3093a1b8476b10183b1c4bde36da74d (diff) | |
| parent | ce493b897d6d3735c930a8465cc0c26bbe5feb86 (diff) | |
Merge remote-tracking branch 'dolphin-emu/master' into gameinis
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/MemoryView.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/MemoryView.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index b5ecfa339b..812c1a8eda 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -43,7 +43,6 @@ enum CMemoryView::CMemoryView(DebugInterface* debuginterface, wxWindow* parent) : wxControl(parent, wxID_ANY) - , curAddress(debuginterface->GetPC()) , debugger(debuginterface) , align(debuginterface->GetInstructionSize(0)) , rowHeight(13) @@ -51,6 +50,8 @@ CMemoryView::CMemoryView(DebugInterface* debuginterface, wxWindow* parent) , oldSelection(0) , selecting(false) , memory(0) + , curAddress(debuginterface->GetPC()) + , dataType(MemoryDataType::U8) , viewAsType(VIEWAS_FP) { Bind(wxEVT_PAINT, &CMemoryView::OnPaint, this); @@ -364,21 +365,21 @@ void CMemoryView::OnPaint(wxPaintEvent& event) { switch (dataType) { - case 0: + case MemoryDataType::U8: dis += StringFromFormat(" %02X %02X %02X %02X", ((word & 0xff000000) >> 24) & 0xFF, ((word & 0xff0000) >> 16) & 0xFF, ((word & 0xff00) >> 8) & 0xFF, word & 0xff); break; - case 1: + case MemoryDataType::U16: dis += StringFromFormat(" %02X%02X %02X%02X", ((word & 0xff000000) >> 24) & 0xFF, ((word & 0xff0000) >> 16) & 0xFF, ((word & 0xff00) >> 8) & 0xFF, word & 0xff); break; - case 2: + case MemoryDataType::U32: dis += StringFromFormat(" %02X%02X%02X%02X", ((word & 0xff000000) >> 24) & 0xFF, ((word & 0xff0000) >> 16) & 0xFF, |