ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve Memory Viewer: There are bugs in text representation. 

Char display now only displays printable ascii characters. Anything non-printable is printed as '.' as is standard.
Additionally, displayed lines are properly delineated with newlines so that we don't wrap on spaces.
This commit is contained in:
Michael Yu 2014-05-19 14:56:58 -07:00
parent 0d0df4b491
commit 4c02c20d84
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rpcs3/Gui/MemoryViewer.cpp
View File

@ -191,20 +191,26 @@ void MemoryViewerPanel::ShowMemory()
t_mem_addr_str += wxString::Format("%08x ", addr); t_mem_addr_str += wxString::Format("%08x ", addr);
} }
for(u32 addr = m_addr; addr != m_addr + m_rowcount * m_colcount; addr++) for (int row = 0; row < m_rowcount; row++)
{ {
if (Memory.IsGoodAddr(addr)) for (int col = 0; col < m_colcount; col++)
{ {
const u8 rmem = Memory.Read8(addr); u32 addr = m_addr + row * m_colcount + col;
t_mem_hex_str += wxString::Format("%02x ", rmem);
const wxString c_rmem = wxString::Format("%c", rmem); if (Memory.IsGoodAddr(addr))
t_mem_ascii_str += c_rmem.IsEmpty() ? "." : c_rmem; {
} const u8 rmem = Memory.Read8(addr);
else t_mem_hex_str += wxString::Format("%02x ", rmem);
{ const bool isPrintable = rmem >= 32 && rmem <= 126;
t_mem_hex_str += "?? "; t_mem_ascii_str += isPrintable ? std::string(1, rmem) : ".";
t_mem_ascii_str += "?"; }
else
{
t_mem_hex_str += "?? ";
t_mem_ascii_str += "?";
}
} }
t_mem_ascii_str += "\r\n";
} }
t_mem_addr->SetValue(t_mem_addr_str); t_mem_addr->SetValue(t_mem_addr_str);