diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2016-10-02 20:57:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-02 20:57:59 -0700 |
| commit | 07f672f81bbafae50bcab94bf56b4f22dc4ef232 (patch) | |
| tree | cb55e49666a99af41a281cc042a6626500dfdee3 /Source | |
| parent | c62bfeba0723c9d651cd58d73ad8fb5852dcb8fb (diff) | |
| parent | 13048afd08403e05e9e6303c83633126430b84f5 (diff) | |
Merge pull request #4187 from sepalani/debug_ascii_symbol
MemoryView: Symbols shown in ASCII view
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/MemoryView.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index 485b131584..1bd64c8d9c 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -17,6 +17,7 @@ #include "Common/CommonTypes.h" #include "Common/DebugInterface.h" #include "Common/StringUtil.h" +#include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" #include "DolphinWX/Debugger/CodeWindow.h" #include "DolphinWX/Debugger/DebuggerUIUtil.h" @@ -335,7 +336,11 @@ void CMemoryView::OnPaint(wxPaintEvent& event) word = ' '; } - dis = StringFromFormat("%c%c%c%c", a[0], a[1], a[2], a[3]); + Symbol* sym = g_symbolDB.GetSymbolFromAddr(mem_data); + if (sym == nullptr) + dis = StringFromFormat("%c%c%c%c", a[0], a[1], a[2], a[3]); + else + dis = StringFromFormat("# -> %s", sym->name.c_str()); } else if (viewAsType == VIEWAS_HEX) { |